Merge ../lombok-branch-master into nullness-annotations

123 files changed, 1811 insertions, 16 deletions

diff --git a/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java b/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java
new file mode 100644
index 00000000..27fab509
--- /dev/null
+++ b/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java
@@ -0,0 +1,22 @@
+public class AccessorsInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private String string;
+
+			@java.lang.SuppressWarnings("all")
+			public String string() {
+				return this.string;
+			}
+
+			/**
+			 * @return {@code this}.
+			 */
+			@java.lang.SuppressWarnings("all")
+			public Inner string(final String string) {
+				this.string = string;
+				return this;
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/BuilderInAnonymousClass.java b/test/transform/resource/after-delombok/BuilderInAnonymousClass.java
new file mode 100644
index 00000000..4810a0a8
--- /dev/null
+++ b/test/transform/resource/after-delombok/BuilderInAnonymousClass.java
@@ -0,0 +1,8 @@
+public class BuilderInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private String string;
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/BuilderNestedInEnum.java b/test/transform/resource/after-delombok/BuilderNestedInEnum.java
new file mode 100644
index 00000000..26dc2a06
--- /dev/null
+++ b/test/transform/resource/after-delombok/BuilderNestedInEnum.java
@@ -0,0 +1,70 @@
+class BuilderNestedInEnum {
+	public enum TestEnum {
+		FOO, BAR;
+		public static final class TestBuilder {
+			private final String field;
+			@java.lang.SuppressWarnings("all")
+			TestBuilder(final String field) {
+				this.field = field;
+			}
+			@java.lang.SuppressWarnings("all")
+			public static class TestBuilderBuilder {
+				@java.lang.SuppressWarnings("all")
+				private String field;
+				@java.lang.SuppressWarnings("all")
+				TestBuilderBuilder() {
+				}
+				/**
+				 * @return {@code this}.
+				 */
+				@java.lang.SuppressWarnings("all")
+				public BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) {
+					this.field = field;
+					return this;
+				}
+				@java.lang.SuppressWarnings("all")
+				public BuilderNestedInEnum.TestEnum.TestBuilder build() {
+					return new BuilderNestedInEnum.TestEnum.TestBuilder(this.field);
+				}
+				@java.lang.Override
+				@java.lang.SuppressWarnings("all")
+				public java.lang.String toString() {
+					return "BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(field=" + this.field + ")";
+				}
+			}
+			@java.lang.SuppressWarnings("all")
+			public static BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() {
+				return new BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder();
+			}
+			@java.lang.SuppressWarnings("all")
+			public String getField() {
+				return this.field;
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public boolean equals(final java.lang.Object o) {
+				if (o == this) return true;
+				if (!(o instanceof BuilderNestedInEnum.TestEnum.TestBuilder)) return false;
+				final BuilderNestedInEnum.TestEnum.TestBuilder other = (BuilderNestedInEnum.TestEnum.TestBuilder) o;
+				final java.lang.Object this$field = this.getField();
+				final java.lang.Object other$field = other.getField();
+				if (this$field == null ? other$field != null : !this$field.equals(other$field)) return false;
+				return true;
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public int hashCode() {
+				final int PRIME = 59;
+				int result = 1;
+				final java.lang.Object $field = this.getField();
+				result = result * PRIME + ($field == null ? 43 : $field.hashCode());
+				return result;
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "BuilderNestedInEnum.TestEnum.TestBuilder(field=" + this.getField() + ")";
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..4a21f2c3
--- /dev/null
+++ b/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,106 @@
+class BuilderWithJavaBeansSpecCapitalization {
+	java.util.List<String> a;
+	java.util.List<String> aField;
+	String bField;
+	@java.lang.SuppressWarnings("all")
+	BuilderWithJavaBeansSpecCapitalization(final java.util.List<String> a, final java.util.List<String> aField, final String bField) {
+		this.a = a;
+		this.aField = aField;
+		this.bField = bField;
+	}
+	@java.lang.SuppressWarnings("all")
+	public static class BuilderWithJavaBeansSpecCapitalizationBuilder {
+		@java.lang.SuppressWarnings("all")
+		private java.util.ArrayList<String> a;
+		@java.lang.SuppressWarnings("all")
+		private java.util.ArrayList<String> aField;
+		@java.lang.SuppressWarnings("all")
+		private String bField;
+		@java.lang.SuppressWarnings("all")
+		BuilderWithJavaBeansSpecCapitalizationBuilder() {
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setZ(final String z) {
+			if (this.a == null) this.a = new java.util.ArrayList<String>();
+			this.a.add(z);
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setA(final java.util.Collection<? extends String> a) {
+			if (a == null) {
+				throw new java.lang.NullPointerException("a cannot be null");
+			}
+			if (this.a == null) this.a = new java.util.ArrayList<String>();
+			this.a.addAll(a);
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearA() {
+			if (this.a != null) this.a.clear();
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setyField(final String yField) {
+			if (this.aField == null) this.aField = new java.util.ArrayList<String>();
+			this.aField.add(yField);
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setaField(final java.util.Collection<? extends String> aField) {
+			if (aField == null) {
+				throw new java.lang.NullPointerException("aField cannot be null");
+			}
+			if (this.aField == null) this.aField = new java.util.ArrayList<String>();
+			this.aField.addAll(aField);
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearaField() {
+			if (this.aField != null) this.aField.clear();
+			return this;
+		}
+		/**
+		 * @return {@code this}.
+		 */
+		@java.lang.SuppressWarnings("all")
+		public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setbField(final String bField) {
+			this.bField = bField;
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderWithJavaBeansSpecCapitalization build() {
+			java.util.List<String> a;
+			switch (this.a == null ? 0 : this.a.size()) {
+			case 0: 
+				a = java.util.Collections.emptyList();
+				break;
+			case 1: 
+				a = java.util.Collections.singletonList(this.a.get(0));
+				break;
+			default: 
+				a = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.a));
+			}
+			java.util.List<String> aField;
+			switch (this.aField == null ? 0 : this.aField.size()) {
+			case 0: 
+				aField = java.util.Collections.emptyList();
+				break;
+			case 1: 
+				aField = java.util.Collections.singletonList(this.aField.get(0));
+				break;
+			default: 
+				aField = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.aField));
+			}
+			return new BuilderWithJavaBeansSpecCapitalization(a, aField, this.bField);
+		}
+		@java.lang.Override
+		@java.lang.SuppressWarnings("all")
+		public java.lang.String toString() {
+			return "BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder(a=" + this.a + ", aField=" + this.aField + ", bField=" + this.bField + ")";
+		}
+	}
+	@java.lang.SuppressWarnings("all")
+	public static BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder builder() {
+		return new BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder();
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java b/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java
new file mode 100644
index 00000000..7483718f
--- /dev/null
+++ b/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java
@@ -0,0 +1,34 @@
+//version 8:
+import lombok.NonNull;
+
+public class ConstructorsInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private String string;
+			@NonNull
+			private String string2;
+
+			@java.lang.SuppressWarnings("all")
+			public Inner(final String string, @NonNull final String string2) {
+				if (string2 == null) {
+					throw new java.lang.NullPointerException("string2 is marked non-null but is null");
+				}
+				this.string = string;
+				this.string2 = string2;
+			}
+
+			@java.lang.SuppressWarnings("all")
+			public Inner(@NonNull final String string2) {
+				if (string2 == null) {
+					throw new java.lang.NullPointerException("string2 is marked non-null but is null");
+				}
+				this.string2 = string2;
+			}
+
+			@java.lang.SuppressWarnings("all")
+			public Inner() {
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/DataInAnonymousClass.java b/test/transform/resource/after-delombok/DataInAnonymousClass.java
new file mode 100644
index 00000000..788d7be5
--- /dev/null
+++ b/test/transform/resource/after-delombok/DataInAnonymousClass.java
@@ -0,0 +1,56 @@
+public class DataInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private String string;
+
+			@java.lang.SuppressWarnings("all")
+			public Inner() {
+			}
+
+			@java.lang.SuppressWarnings("all")
+			public String getString() {
+				return this.string;
+			}
+
+			@java.lang.SuppressWarnings("all")
+			public void setString(final String string) {
+				this.string = string;
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public boolean equals(final java.lang.Object o) {
+				if (o == this) return true;
+				if (!(o instanceof Inner)) return false;
+				final Inner other = (Inner) o;
+				if (!other.canEqual((java.lang.Object) this)) return false;
+				final java.lang.Object this$string = this.getString();
+				final java.lang.Object other$string = other.getString();
+				if (this$string == null ? other$string != null : !this$string.equals(other$string)) return false;
+				return true;
+			}
+
+			@java.lang.SuppressWarnings("all")
+			protected boolean canEqual(final java.lang.Object other) {
+				return other instanceof Inner;
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public int hashCode() {
+				final int PRIME = 59;
+				int result = 1;
+				final java.lang.Object $string = this.getString();
+				result = result * PRIME + ($string == null ? 43 : $string.hashCode());
+				return result;
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "Inner(string=" + this.getString() + ")";
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java b/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java
new file mode 100644
index 00000000..6f0b5738
--- /dev/null
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java
@@ -0,0 +1,36 @@
+public class EqualsAndHashCodeInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private String string;
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public boolean equals(final java.lang.Object o) {
+				if (o == this) return true;
+				if (!(o instanceof Inner)) return false;
+				final Inner other = (Inner) o;
+				if (!other.canEqual((java.lang.Object) this)) return false;
+				final java.lang.Object this$string = this.string;
+				final java.lang.Object other$string = other.string;
+				if (this$string == null ? other$string != null : !this$string.equals(other$string)) return false;
+				return true;
+			}
+
+			@java.lang.SuppressWarnings("all")
+			protected boolean canEqual(final java.lang.Object other) {
+				return other instanceof Inner;
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public int hashCode() {
+				final int PRIME = 59;
+				int result = 1;
+				final java.lang.Object $string = this.string;
+				result = result * PRIME + ($string == null ? 43 : $string.hashCode());
+				return result;
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/FieldDefaultsViaConfigOnRecord.java b/test/transform/resource/after-delombok/FieldDefaultsViaConfigOnRecord.java
new file mode 100644
index 00000000..1a2ce882
--- /dev/null
+++ b/test/transform/resource/after-delombok/FieldDefaultsViaConfigOnRecord.java
@@ -0,0 +1,3 @@
+// version 14:
+public record FieldDefaultsViaConfigOnRecord(String a, String b) {
+}
diff --git a/test/transform/resource/after-delombok/FieldNameConstantsInAnonymousClass.java b/test/transform/resource/after-delombok/FieldNameConstantsInAnonymousClass.java
new file mode 100644
index 00000000..1f7e7d7a
--- /dev/null
+++ b/test/transform/resource/after-delombok/FieldNameConstantsInAnonymousClass.java
@@ -0,0 +1,8 @@
+public class FieldNameConstantsInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private String string;
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/GetterInAnonymousClass.java b/test/transform/resource/after-delombok/GetterInAnonymousClass.java
new file mode 100644
index 00000000..3c990545
--- /dev/null
+++ b/test/transform/resource/after-delombok/GetterInAnonymousClass.java
@@ -0,0 +1,13 @@
+public class GetterInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private String string;
+
+			@java.lang.SuppressWarnings("all")
+			public String getString() {
+				return this.string;
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java b/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java
new file mode 100644
index 00000000..4476e463
--- /dev/null
+++ b/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java
@@ -0,0 +1,24 @@
+public class GetterLazyInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> string = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+
+			@java.lang.SuppressWarnings({"all", "unchecked"})
+			public String getString() {
+				java.lang.Object value = this.string.get();
+				if (value == null) {
+					synchronized (this.string) {
+						value = this.string.get();
+						if (value == null) {
+							final String actualValue = "test";
+							value = actualValue == null ? this.string : actualValue;
+							this.string.set(value);
+						}
+					}
+				}
+				return (String) (value == this.string ? null : value);
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..51ccfe63
--- /dev/null
+++ b/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,12 @@
+class GetterWithJavaBeansSpecCapitalization {
+	int a;
+	int aField;
+	@java.lang.SuppressWarnings("all")
+	public int getA() {
+		return this.a;
+	}
+	@java.lang.SuppressWarnings("all")
+	public int getaField() {
+		return this.aField;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jInAnonymousClass.java b/test/transform/resource/after-delombok/LoggerSlf4jInAnonymousClass.java
new file mode 100644
index 00000000..1ec25d92
--- /dev/null
+++ b/test/transform/resource/after-delombok/LoggerSlf4jInAnonymousClass.java
@@ -0,0 +1,7 @@
+public class LoggerSlf4jInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/SetterInAnonymousClass.java b/test/transform/resource/after-delombok/SetterInAnonymousClass.java
new file mode 100644
index 00000000..ced2be52
--- /dev/null
+++ b/test/transform/resource/after-delombok/SetterInAnonymousClass.java
@@ -0,0 +1,13 @@
+public class SetterInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private String string;
+
+			@java.lang.SuppressWarnings("all")
+			public void setString(final String string) {
+				this.string = string;
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..de68ee60
--- /dev/null
+++ b/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,12 @@
+class SetterWithJavaBeansSpecCapitalization {
+	int a;
+	int aField;
+	@java.lang.SuppressWarnings("all")
+	public void setA(final int a) {
+		this.a = a;
+	}
+	@java.lang.SuppressWarnings("all")
+	public void setaField(final int aField) {
+		this.aField = aField;
+	}
+}
diff --git a/test/transform/resource/after-delombok/SuperBuilderInAnonymousClass.java b/test/transform/resource/after-delombok/SuperBuilderInAnonymousClass.java
new file mode 100644
index 00000000..cc654919
--- /dev/null
+++ b/test/transform/resource/after-delombok/SuperBuilderInAnonymousClass.java
@@ -0,0 +1,12 @@
+public class SuperBuilderInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class InnerParent {
+			private String string;
+		}
+
+		class InnerChild {
+			private String string;
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java b/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java
new file mode 100644
index 00000000..904487a3
--- /dev/null
+++ b/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java
@@ -0,0 +1,15 @@
+public class SynchronizedInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			@java.lang.SuppressWarnings("all")
+			private final java.lang.Object $lock = new java.lang.Object[0];
+
+			public void foo() {
+				synchronized (this.$lock) {
+					String foo = "bar";
+				}
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/ToStringInAnonymousClass.java b/test/transform/resource/after-delombok/ToStringInAnonymousClass.java
new file mode 100644
index 00000000..aa3651bb
--- /dev/null
+++ b/test/transform/resource/after-delombok/ToStringInAnonymousClass.java
@@ -0,0 +1,14 @@
+public class ToStringInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private String string;
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "Inner(string=" + this.string + ")";
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/UtilityClassInAnonymousClass.java b/test/transform/resource/after-delombok/UtilityClassInAnonymousClass.java
new file mode 100644
index 00000000..3df9b559
--- /dev/null
+++ b/test/transform/resource/after-delombok/UtilityClassInAnonymousClass.java
@@ -0,0 +1,8 @@
+public class UtilityClassInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private String string;
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/ValAnonymousSubclassSelfReference.java b/test/transform/resource/after-delombok/ValAnonymousSubclassSelfReference.java
new file mode 100644
index 00000000..a1176a3c
--- /dev/null
+++ b/test/transform/resource/after-delombok/ValAnonymousSubclassSelfReference.java
@@ -0,0 +1,17 @@
+import java.util.Map;
+import java.util.HashMap;
+
+public class ValAnonymousSubclassSelfReference {
+	public <T> void test(T arg) {
+		T d = arg;
+		Integer[] e = new Integer[1];
+		int[] f = new int[0];
+		java.util.Map<java.lang.String, Integer> g = new HashMap<String, Integer>();
+		Integer h = 0;
+		int i = 0;
+		final int j = 1;
+		final int k = 2;
+		new ValAnonymousSubclassSelfReference() {
+		};
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/ValInvalidParameter.java b/test/transform/resource/after-delombok/ValInvalidParameter.java
new file mode 100644
index 00000000..f3d4229c
--- /dev/null
+++ b/test/transform/resource/after-delombok/ValInvalidParameter.java
@@ -0,0 +1,29 @@
+public class ValInvalidParameter {
+	public void val() {
+		final java.lang.Object a = a(new NonExistingClass());
+		final java.lang.Object b = a(a(new NonExistingClass()));
+		final java.lang.Object c = nonExisitingMethod(b(1));
+		final java.lang.Object d = nonExistingObject.nonExistingMethod();
+		final java.lang.Object e = b(1).nonExistingMethod();
+		final java.lang.Object f = 1 > 2 ? a(new NonExistingClass()) : a(new NonExistingClass());
+		final java.lang.Object g = b2(1);
+		final java.lang.Integer h = b2(a("a"), a(null));
+		final int i = a(a(null));
+	}
+
+	public int a(String param) {
+		return 0;
+	}
+
+	public int a(Integer param) {
+		return 0;
+	}
+
+	public Integer b(int i) {
+		return i;
+	}
+
+	public Integer b2(int i, int j) {
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/ValSwitchExpression.java b/test/transform/resource/after-delombok/ValSwitchExpression.java
index a8fa9b0f..ba26c137 100644
--- a/test/transform/resource/after-delombok/ValSwitchExpression.java
+++ b/test/transform/resource/after-delombok/ValSwitchExpression.java
@@ -1,9 +1,9 @@
 // version 14:
 public class ValSwitchExpression {
 	public void method(int arg) {
-		final int x = switch (arg) {
+		final var x = switch (arg) {
 			default -> {
-				final java.lang.String s = "string";
+				final var s = "string";
 				yield arg;
 			}
 		};
diff --git a/test/transform/resource/after-delombok/ValToNative.java b/test/transform/resource/after-delombok/ValToNative.java
new file mode 100644
index 00000000..64aff9e5
--- /dev/null
+++ b/test/transform/resource/after-delombok/ValToNative.java
@@ -0,0 +1,15 @@
+// version 10:
+import java.io.IOException;
+import java.util.Arrays;
+
+public class ValToNative {
+	private void test() throws IOException {
+		final var intField = 1;
+		for (final var s : Arrays.asList("1")) {
+			final var s2 = s;
+		}
+		try (var in = getClass().getResourceAsStream("ValToNative.class")) {
+			final var j = in.read();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/ValueInAnonymousClass.java b/test/transform/resource/after-delombok/ValueInAnonymousClass.java
new file mode 100644
index 00000000..5bab4093
--- /dev/null
+++ b/test/transform/resource/after-delombok/ValueInAnonymousClass.java
@@ -0,0 +1,46 @@
+public class ValueInAnonymousClass {
+	Object annonymous = new Object() {
+
+		final class Inner {
+			private final String string;
+
+			@java.lang.SuppressWarnings("all")
+			public Inner(final String string) {
+				this.string = string;
+			}
+
+			@java.lang.SuppressWarnings("all")
+			public String getString() {
+				return this.string;
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public boolean equals(final java.lang.Object o) {
+				if (o == this) return true;
+				if (!(o instanceof Inner)) return false;
+				final Inner other = (Inner) o;
+				final java.lang.Object this$string = this.getString();
+				final java.lang.Object other$string = other.getString();
+				if (this$string == null ? other$string != null : !this$string.equals(other$string)) return false;
+				return true;
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public int hashCode() {
+				final int PRIME = 59;
+				int result = 1;
+				final java.lang.Object $string = this.getString();
+				result = result * PRIME + ($string == null ? 43 : $string.hashCode());
+				return result;
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "Inner(string=" + this.getString() + ")";
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..543481e8
--- /dev/null
+++ b/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,33 @@
+final class ValueWithJavaBeansSpecCapitalization {
+	private final int aField;
+	@java.lang.SuppressWarnings("all")
+	public ValueWithJavaBeansSpecCapitalization(final int aField) {
+		this.aField = aField;
+	}
+	@java.lang.SuppressWarnings("all")
+	public int getaField() {
+		return this.aField;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public boolean equals(final java.lang.Object o) {
+		if (o == this) return true;
+		if (!(o instanceof ValueWithJavaBeansSpecCapitalization)) return false;
+		final ValueWithJavaBeansSpecCapitalization other = (ValueWithJavaBeansSpecCapitalization) o;
+		if (this.getaField() != other.getaField()) return false;
+		return true;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public int hashCode() {
+		final int PRIME = 59;
+		int result = 1;
+		result = result * PRIME + this.getaField();
+		return result;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public java.lang.String toString() {
+		return "ValueWithJavaBeansSpecCapitalization(aField=" + this.getaField() + ")";
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/WithByInAnonymousClass.java b/test/transform/resource/after-delombok/WithByInAnonymousClass.java
new file mode 100644
index 00000000..d84955b6
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithByInAnonymousClass.java
@@ -0,0 +1,17 @@
+//version 8:
+public class WithByInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private Inner(String string) {
+			}
+
+			private String string;
+
+			@java.lang.SuppressWarnings("all")
+			public Inner withStringBy(final java.util.function.Function<? super String, ? extends String> transformer) {
+				return new Inner(transformer.apply(this.string));
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/WithInAnonymousClass.java b/test/transform/resource/after-delombok/WithInAnonymousClass.java
new file mode 100644
index 00000000..02490533
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithInAnonymousClass.java
@@ -0,0 +1,19 @@
+public class WithInAnonymousClass {
+	Object annonymous = new Object() {
+
+		class Inner {
+			private Inner(String string) {
+			}
+
+			private String string;
+
+			/**
+			 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+			 */
+			@java.lang.SuppressWarnings("all")
+			public Inner withString(final String string) {
+				return this.string == string ? this : new Inner(string);
+			}
+		}
+	};
+}
diff --git a/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..e3737848
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,12 @@
+class WithWithJavaBeansSpecCapitalization {
+	int aField;
+	WithWithJavaBeansSpecCapitalization(int aField) {
+	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
+	@java.lang.SuppressWarnings("all")
+	public WithWithJavaBeansSpecCapitalization withaField(final int aField) {
+		return this.aField == aField ? this : new WithWithJavaBeansSpecCapitalization(aField);
+	}
+}
diff --git a/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java b/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java
new file mode 100644
index 00000000..34db4f2d
--- /dev/null
+++ b/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java
@@ -0,0 +1,29 @@
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+public class AccessorsInAnonymousClass {
+  Object annonymous = new Object() {
+    @Getter @Setter @Accessors(fluent = true) class Inner {
+      private String string;
+      Inner() {
+        super();
+      }
+      public @java.lang.SuppressWarnings("all") String string() {
+        return this.string;
+      }
+      /**
+       * @return {@code this}.
+       */
+      public @java.lang.SuppressWarnings("all") Inner string(final String string) {
+        this.string = string;
+        return this;
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public AccessorsInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/BuilderInAnonymousClass.java b/test/transform/resource/after-ecj/BuilderInAnonymousClass.java
new file mode 100644
index 00000000..67660822
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderInAnonymousClass.java
@@ -0,0 +1,17 @@
+import lombok.Builder;
+public class BuilderInAnonymousClass {
+  Object annonymous = new Object() {
+    @Builder class Inner {
+      private String string;
+      Inner() {
+        super();
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public BuilderInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/BuilderNestedInEnum.java b/test/transform/resource/after-ecj/BuilderNestedInEnum.java
new file mode 100644
index 00000000..b3fb54f3
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderNestedInEnum.java
@@ -0,0 +1,68 @@
+class BuilderNestedInEnum {
+  public enum TestEnum {
+    public static final @lombok.Builder @lombok.Value class TestBuilder {
+      public static @java.lang.SuppressWarnings("all") class TestBuilderBuilder {
+        private @java.lang.SuppressWarnings("all") String field;
+        @java.lang.SuppressWarnings("all") TestBuilderBuilder() {
+          super();
+        }
+        /**
+         * @return {@code this}.
+         */
+        public @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) {
+          this.field = field;
+          return this;
+        }
+        public @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder build() {
+          return new BuilderNestedInEnum.TestEnum.TestBuilder(this.field);
+        }
+        public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+          return (("BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(field=" + this.field) + ")");
+        }
+      }
+      private final String field;
+      @java.lang.SuppressWarnings("all") TestBuilder(final String field) {
+        super();
+        this.field = field;
+      }
+      public static @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() {
+        return new BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder();
+      }
+      public @java.lang.SuppressWarnings("all") String getField() {
+        return this.field;
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+        if ((o == this))
+            return true;
+        if ((! (o instanceof BuilderNestedInEnum.TestEnum.TestBuilder)))
+            return false;
+        final BuilderNestedInEnum.TestEnum.TestBuilder other = (BuilderNestedInEnum.TestEnum.TestBuilder) o;
+        final java.lang.Object this$field = this.getField();
+        final java.lang.Object other$field = other.getField();
+        if (((this$field == null) ? (other$field != null) : (! this$field.equals(other$field))))
+            return false;
+        return true;
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final java.lang.Object $field = this.getField();
+        result = ((result * PRIME) + (($field == null) ? 43 : $field.hashCode()));
+        return result;
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+        return (("BuilderNestedInEnum.TestEnum.TestBuilder(field=" + this.getField()) + ")");
+      }
+    }
+    FOO(),
+    BAR(),
+    <clinit>() {
+    }
+    public TestEnum() {
+      super();
+    }
+  }
+  BuilderNestedInEnum() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..1107254f
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,99 @@
+@lombok.Builder(setterPrefix = "set") class BuilderWithJavaBeansSpecCapitalization {
+  public static @java.lang.SuppressWarnings("all") class BuilderWithJavaBeansSpecCapitalizationBuilder {
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> a;
+    private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> aField;
+    private @java.lang.SuppressWarnings("all") String bField;
+    @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalizationBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setZ(final String z) {
+      if ((this.a == null))
+          this.a = new java.util.ArrayList<String>();
+      this.a.add(z);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setA(final java.util.Collection<? extends String> a) {
+      if ((a == null))
+          {
+            throw new java.lang.NullPointerException("a cannot be null");
+          }
+      if ((this.a == null))
+          this.a = new java.util.ArrayList<String>();
+      this.a.addAll(a);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearA() {
+      if ((this.a != null))
+          this.a.clear();
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setyField(final String yField) {
+      if ((this.aField == null))
+          this.aField = new java.util.ArrayList<String>();
+      this.aField.add(yField);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setaField(final java.util.Collection<? extends String> aField) {
+      if ((aField == null))
+          {
+            throw new java.lang.NullPointerException("aField cannot be null");
+          }
+      if ((this.aField == null))
+          this.aField = new java.util.ArrayList<String>();
+      this.aField.addAll(aField);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearaField() {
+      if ((this.aField != null))
+          this.aField.clear();
+      return this;
+    }
+    /**
+     * @return {@code this}.
+     */
+    public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setbField(final String bField) {
+      this.bField = bField;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization build() {
+      java.util.List<String> a;
+      switch (((this.a == null) ? 0 : this.a.size())) {
+      case 0 :
+          a = java.util.Collections.emptyList();
+          break;
+      case 1 :
+          a = java.util.Collections.singletonList(this.a.get(0));
+          break;
+      default :
+          a = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.a));
+      }
+      java.util.List<String> aField;
+      switch (((this.aField == null) ? 0 : this.aField.size())) {
+      case 0 :
+          aField = java.util.Collections.emptyList();
+          break;
+      case 1 :
+          aField = java.util.Collections.singletonList(this.aField.get(0));
+          break;
+      default :
+          aField = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.aField));
+      }
+      return new BuilderWithJavaBeansSpecCapitalization(a, aField, this.bField);
+    }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      return (((((("BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder(a=" + this.a) + ", aField=") + this.aField) + ", bField=") + this.bField) + ")");
+    }
+  }
+  @lombok.Singular("z") java.util.List<String> a;
+  @lombok.Singular("yField") java.util.List<String> aField;
+  String bField;
+  @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization(final java.util.List<String> a, final java.util.List<String> aField, final String bField) {
+    super();
+    this.a = a;
+    this.aField = aField;
+    this.bField = bField;
+  }
+  public static @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder builder() {
+    return new BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder();
+  }
+}
diff --git a/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java b/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java
new file mode 100644
index 00000000..545ab04d
--- /dev/null
+++ b/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java
@@ -0,0 +1,38 @@
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+public class ConstructorsInAnonymousClass {
+  Object annonymous = new Object() {
+    @AllArgsConstructor @RequiredArgsConstructor @NoArgsConstructor class Inner {
+      private String string;
+      private @NonNull String string2;
+      public @java.lang.SuppressWarnings("all") Inner(final String string, final @NonNull String string2) {
+        super();
+        if ((string2 == null))
+            {
+              throw new java.lang.NullPointerException("string2 is marked non-null but is null");
+            }
+        this.string = string;
+        this.string2 = string2;
+      }
+      public @java.lang.SuppressWarnings("all") Inner(final @NonNull String string2) {
+        super();
+        if ((string2 == null))
+            {
+              throw new java.lang.NullPointerException("string2 is marked non-null but is null");
+            }
+        this.string2 = string2;
+      }
+      public @java.lang.SuppressWarnings("all") Inner() {
+        super();
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public ConstructorsInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/DataInAnonymousClass.java b/test/transform/resource/after-ecj/DataInAnonymousClass.java
new file mode 100644
index 00000000..c6e22f80
--- /dev/null
+++ b/test/transform/resource/after-ecj/DataInAnonymousClass.java
@@ -0,0 +1,50 @@
+import lombok.Data;
+public class DataInAnonymousClass {
+  Object annonymous = new Object() {
+    @Data class Inner {
+      private String string;
+      public @java.lang.SuppressWarnings("all") String getString() {
+        return this.string;
+      }
+      public @java.lang.SuppressWarnings("all") void setString(final String string) {
+        this.string = string;
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+        if ((o == this))
+            return true;
+        if ((! (o instanceof Inner)))
+            return false;
+        final Inner other = (Inner) o;
+        if ((! other.canEqual((java.lang.Object) this)))
+            return false;
+        final java.lang.Object this$string = this.getString();
+        final java.lang.Object other$string = other.getString();
+        if (((this$string == null) ? (other$string != null) : (! this$string.equals(other$string))))
+            return false;
+        return true;
+      }
+      protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+        return (other instanceof Inner);
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final java.lang.Object $string = this.getString();
+        result = ((result * PRIME) + (($string == null) ? 43 : $string.hashCode()));
+        return result;
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+        return (("Inner(string=" + this.getString()) + ")");
+      }
+      public @java.lang.SuppressWarnings("all") Inner() {
+        super();
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public DataInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java b/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java
new file mode 100644
index 00000000..e66850bb
--- /dev/null
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java
@@ -0,0 +1,41 @@
+import lombok.EqualsAndHashCode;
+public class EqualsAndHashCodeInAnonymousClass {
+  Object annonymous = new Object() {
+    @EqualsAndHashCode class Inner {
+      private String string;
+      Inner() {
+        super();
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+        if ((o == this))
+            return true;
+        if ((! (o instanceof Inner)))
+            return false;
+        final Inner other = (Inner) o;
+        if ((! other.canEqual((java.lang.Object) this)))
+            return false;
+        final java.lang.Object this$string = this.string;
+        final java.lang.Object other$string = other.string;
+        if (((this$string == null) ? (other$string != null) : (! this$string.equals(other$string))))
+            return false;
+        return true;
+      }
+      protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+        return (other instanceof Inner);
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final java.lang.Object $string = this.string;
+        result = ((result * PRIME) + (($string == null) ? 43 : $string.hashCode()));
+        return result;
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public EqualsAndHashCodeInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/FieldDefaultsViaConfigOnRecord.java b/test/transform/resource/after-ecj/FieldDefaultsViaConfigOnRecord.java
new file mode 100644
index 00000000..44ef0d4c
--- /dev/null
+++ b/test/transform/resource/after-ecj/FieldDefaultsViaConfigOnRecord.java
@@ -0,0 +1,10 @@
+// version 14:
+public record FieldDefaultsViaConfigOnRecord(String a, String b) {
+/* Implicit */  private final String a;
+/* Implicit */  private final String b;
+  public FieldDefaultsViaConfigOnRecord(String a, String b) {
+    super();
+    .a = a;
+    .b = b;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/FieldNameConstantsInAnonymousClass.java b/test/transform/resource/after-ecj/FieldNameConstantsInAnonymousClass.java
new file mode 100644
index 00000000..b04bef51
--- /dev/null
+++ b/test/transform/resource/after-ecj/FieldNameConstantsInAnonymousClass.java
@@ -0,0 +1,17 @@
+import lombok.experimental.FieldNameConstants;
+public class FieldNameConstantsInAnonymousClass {
+  Object annonymous = new Object() {
+    @FieldNameConstants class Inner {
+      private String string;
+      Inner() {
+        super();
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public FieldNameConstantsInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/GetterInAnonymousClass.java b/test/transform/resource/after-ecj/GetterInAnonymousClass.java
new file mode 100644
index 00000000..30e6338d
--- /dev/null
+++ b/test/transform/resource/after-ecj/GetterInAnonymousClass.java
@@ -0,0 +1,20 @@
+import lombok.Getter;
+public class GetterInAnonymousClass {
+  Object annonymous = new Object() {
+    @Getter class Inner {
+      private String string;
+      Inner() {
+        super();
+      }
+      public @java.lang.SuppressWarnings("all") String getString() {
+        return this.string;
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public GetterInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java b/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java
new file mode 100644
index 00000000..ab8bc599
--- /dev/null
+++ b/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java
@@ -0,0 +1,34 @@
+import lombok.Getter;
+public class GetterLazyInAnonymousClass {
+  Object annonymous = new Object() {
+    class Inner {
+      private final @Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> string = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+      Inner() {
+        super();
+      }
+      public @java.lang.SuppressWarnings({"all", "unchecked"}) String getString() {
+        java.lang.Object value = this.string.get();
+        if ((value == null))
+            {
+              synchronized (this.string)
+                {
+                  value = this.string.get();
+                  if ((value == null))
+                      {
+                        final String actualValue = "test";
+                        value = ((actualValue == null) ? this.string : actualValue);
+                        this.string.set(value);
+                      }
+                }
+            }
+        return (String) ((value == this.string) ? null : value);
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public GetterLazyInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..745529a0
--- /dev/null
+++ b/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,13 @@
+class GetterWithJavaBeansSpecCapitalization {
+  @lombok.Getter int a;
+  @lombok.Getter int aField;
+  GetterWithJavaBeansSpecCapitalization() {
+    super();
+  }
+  public @java.lang.SuppressWarnings("all") int getA() {
+    return this.a;
+  }
+  public @java.lang.SuppressWarnings("all") int getaField() {
+    return this.aField;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jInAnonymousClass.java b/test/transform/resource/after-ecj/LoggerSlf4jInAnonymousClass.java
new file mode 100644
index 00000000..0c78a288
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerSlf4jInAnonymousClass.java
@@ -0,0 +1,16 @@
+import lombok.extern.slf4j.Slf4j;
+public class LoggerSlf4jInAnonymousClass {
+  Object annonymous = new Object() {
+    @Slf4j class Inner {
+      Inner() {
+        super();
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public LoggerSlf4jInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/SetterInAnonymousClass.java b/test/transform/resource/after-ecj/SetterInAnonymousClass.java
new file mode 100644
index 00000000..fc0bf2d8
--- /dev/null
+++ b/test/transform/resource/after-ecj/SetterInAnonymousClass.java
@@ -0,0 +1,20 @@
+import lombok.Setter;
+public class SetterInAnonymousClass {
+  Object annonymous = new Object() {
+    @Setter class Inner {
+      private String string;
+      Inner() {
+        super();
+      }
+      public @java.lang.SuppressWarnings("all") void setString(final String string) {
+        this.string = string;
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public SetterInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..4e99890a
--- /dev/null
+++ b/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,13 @@
+class SetterWithJavaBeansSpecCapitalization {
+  @lombok.Setter int a;
+  @lombok.Setter int aField;
+  SetterWithJavaBeansSpecCapitalization() {
+    super();
+  }
+  public @java.lang.SuppressWarnings("all") void setA(final int a) {
+    this.a = a;
+  }
+  public @java.lang.SuppressWarnings("all") void setaField(final int aField) {
+    this.aField = aField;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/SuperBuilderInAnonymousClass.java b/test/transform/resource/after-ecj/SuperBuilderInAnonymousClass.java
new file mode 100644
index 00000000..238f42df
--- /dev/null
+++ b/test/transform/resource/after-ecj/SuperBuilderInAnonymousClass.java
@@ -0,0 +1,23 @@
+import lombok.experimental.SuperBuilder;
+public class SuperBuilderInAnonymousClass {
+  Object annonymous = new Object() {
+    @SuperBuilder class InnerParent {
+      private String string;
+      InnerParent() {
+        super();
+      }
+    }
+    @SuperBuilder class InnerChild {
+      private String string;
+      InnerChild() {
+        super();
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public SuperBuilderInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/SynchronizedInAnonymousClass.java b/test/transform/resource/after-ecj/SynchronizedInAnonymousClass.java
new file mode 100644
index 00000000..77013f2f
--- /dev/null
+++ b/test/transform/resource/after-ecj/SynchronizedInAnonymousClass.java
@@ -0,0 +1,23 @@
+import lombok.Synchronized;
+public class SynchronizedInAnonymousClass {
+  Object annonymous = new Object() {
+    class Inner {
+      private final java.lang.Object $lock = new java.lang.Object[0];
+      Inner() {
+        super();
+      }
+      public @Synchronized void foo() {
+        synchronized (this.$lock)
+          {
+            String foo = "bar";
+          }
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public SynchronizedInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/ToStringInAnonymousClass.java b/test/transform/resource/after-ecj/ToStringInAnonymousClass.java
new file mode 100644
index 00000000..02ad2a88
--- /dev/null
+++ b/test/transform/resource/after-ecj/ToStringInAnonymousClass.java
@@ -0,0 +1,20 @@
+import lombok.ToString;
+public class ToStringInAnonymousClass {
+  Object annonymous = new Object() {
+    @ToString class Inner {
+      private String string;
+      Inner() {
+        super();
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+        return (("Inner(string=" + this.string) + ")");
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public ToStringInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/UtilityClassInAnonymousClass.java b/test/transform/resource/after-ecj/UtilityClassInAnonymousClass.java
new file mode 100644
index 00000000..e836636d
--- /dev/null
+++ b/test/transform/resource/after-ecj/UtilityClassInAnonymousClass.java
@@ -0,0 +1,17 @@
+import lombok.experimental.UtilityClass;
+public class UtilityClassInAnonymousClass {
+  Object annonymous = new Object() {
+    @UtilityClass class Inner {
+      private String string;
+      Inner() {
+        super();
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public UtilityClassInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/ValAnonymousSubclassSelfReference.java b/test/transform/resource/after-ecj/ValAnonymousSubclassSelfReference.java
new file mode 100644
index 00000000..12b0f640
--- /dev/null
+++ b/test/transform/resource/after-ecj/ValAnonymousSubclassSelfReference.java
@@ -0,0 +1,23 @@
+import java.util.Map;
+import java.util.HashMap;
+import lombok.val;
+public class ValAnonymousSubclassSelfReference {
+  public ValAnonymousSubclassSelfReference() {
+    super();
+  }
+  public <T>void test(T arg) {
+    T d = arg;
+    Integer[] e = new Integer[1];
+    int[] f = new int[0];
+    java.util.Map<java.lang.String, Integer> g = new HashMap<String, Integer>();
+    Integer h = 0;
+    int i = 0;
+    final @val int j = 1;
+    final @val int k = 2;
+    new ValAnonymousSubclassSelfReference() {
+      x() {
+        super();
+      }
+    };
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValErrors.java b/test/transform/resource/after-ecj/ValErrors.java
index 1bd61f87..19c2facd 100644
--- a/test/transform/resource/after-ecj/ValErrors.java
+++ b/test/transform/resource/after-ecj/ValErrors.java
@@ -4,9 +4,9 @@ public class ValErrors {
     super();
   }
   public void unresolvableExpression() {
-    val c = d;
+    final @val java.lang.Object c = d;
   }
   public void arrayInitializer() {
-    val e = {"foo", "bar"};
+    final @val java.lang.Object e = {"foo", "bar"};
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValInvalidParameter.java b/test/transform/resource/after-ecj/ValInvalidParameter.java
new file mode 100644
index 00000000..14549aa7
--- /dev/null
+++ b/test/transform/resource/after-ecj/ValInvalidParameter.java
@@ -0,0 +1,29 @@
+import lombok.val;
+public class ValInvalidParameter {
+  public ValInvalidParameter() {
+    super();
+  }
+  public void val() {
+    final @val java.lang.Object a = a(new NonExistingClass());
+    final @val java.lang.Object b = a(a(new NonExistingClass()));
+    final @val java.lang.Object c = nonExisitingMethod(b(1));
+    final @val java.lang.Object d = nonExistingObject.nonExistingMethod();
+    final @val java.lang.Object e = b(1).nonExistingMethod();
+    final @val java.lang.Object f = ((1 > 2) ? a(new NonExistingClass()) : a(new NonExistingClass()));
+    final @val java.lang.Object g = b2(1);
+    final @val java.lang.Object h = b2(a("a"), a(null));
+    final @val java.lang.Object i = a(a(null));
+  }
+  public int a(String param) {
+    return 0;
+  }
+  public int a(Integer param) {
+    return 0;
+  }
+  public Integer b(int i) {
+    return i;
+  }
+  public Integer b2(int i, int j) {
+    return i;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValSwitchExpression.java b/test/transform/resource/after-ecj/ValSwitchExpression.java
index 59b503cb..4e848572 100644
--- a/test/transform/resource/after-ecj/ValSwitchExpression.java
+++ b/test/transform/resource/after-ecj/ValSwitchExpression.java
@@ -5,10 +5,10 @@ public class ValSwitchExpression {
     super();
   }
   public void method(int arg) {
-    final @val int x =     switch (arg) {
+    final @val var x =     switch (arg) {
     default ->
         {
-          final @val java.lang.String s = "string";
+          final @val var s = "string";
           yield arg;
         }
     };
diff --git a/test/transform/resource/after-ecj/ValToNative.java b/test/transform/resource/after-ecj/ValToNative.java
new file mode 100644
index 00000000..2c8d721c
--- /dev/null
+++ b/test/transform/resource/after-ecj/ValToNative.java
@@ -0,0 +1,19 @@
+import java.io.IOException;
+import java.util.Arrays;
+import lombok.val;
+public class ValToNative {
+  public ValToNative() {
+    super();
+  }
+  private void test() throws IOException {
+    final @val var intField = 1;
+    for (final @val var s : Arrays.asList("1")) 
+      {
+        final @val var s2 = s;
+      }
+    try (final @val var in = getClass().getResourceAsStream("ValToNative.class"))
+      {
+        final @val var j = in.read();
+      }
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValueInAnonymousClass.java b/test/transform/resource/after-ecj/ValueInAnonymousClass.java
new file mode 100644
index 00000000..49cf8fc2
--- /dev/null
+++ b/test/transform/resource/after-ecj/ValueInAnonymousClass.java
@@ -0,0 +1,43 @@
+import lombok.Value;
+public class ValueInAnonymousClass {
+  Object annonymous = new Object() {
+    final @Value class Inner {
+      private final String string;
+      public @java.lang.SuppressWarnings("all") String getString() {
+        return this.string;
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+        if ((o == this))
+            return true;
+        if ((! (o instanceof Inner)))
+            return false;
+        final Inner other = (Inner) o;
+        final java.lang.Object this$string = this.getString();
+        final java.lang.Object other$string = other.getString();
+        if (((this$string == null) ? (other$string != null) : (! this$string.equals(other$string))))
+            return false;
+        return true;
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final java.lang.Object $string = this.getString();
+        result = ((result * PRIME) + (($string == null) ? 43 : $string.hashCode()));
+        return result;
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+        return (("Inner(string=" + this.getString()) + ")");
+      }
+      public @java.lang.SuppressWarnings("all") Inner(final String string) {
+        super();
+        this.string = string;
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public ValueInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..8117dbb0
--- /dev/null
+++ b/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,29 @@
+final @lombok.Value class ValueWithJavaBeansSpecCapitalization {
+  private final int aField;
+  public @java.lang.SuppressWarnings("all") int getaField() {
+    return this.aField;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((! (o instanceof ValueWithJavaBeansSpecCapitalization)))
+        return false;
+    final ValueWithJavaBeansSpecCapitalization other = (ValueWithJavaBeansSpecCapitalization) o;
+    if ((this.getaField() != other.getaField()))
+        return false;
+    return true;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    final int PRIME = 59;
+    int result = 1;
+    result = ((result * PRIME) + this.getaField());
+    return result;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (("ValueWithJavaBeansSpecCapitalization(aField=" + this.getaField()) + ")");
+  }
+  public @java.lang.SuppressWarnings("all") ValueWithJavaBeansSpecCapitalization(final int aField) {
+    super();
+    this.aField = aField;
+  }
+}
diff --git a/test/transform/resource/after-ecj/WithByInAnonymousClass.java b/test/transform/resource/after-ecj/WithByInAnonymousClass.java
new file mode 100644
index 00000000..1bc3e80c
--- /dev/null
+++ b/test/transform/resource/after-ecj/WithByInAnonymousClass.java
@@ -0,0 +1,20 @@
+import lombok.experimental.WithBy;
+public class WithByInAnonymousClass {
+  Object annonymous = new Object() {
+    @WithBy class Inner {
+      private String string;
+      private Inner(String string) {
+        super();
+      }
+      public @java.lang.SuppressWarnings("all") Inner withStringBy(final java.util.function.Function<? super String, ? extends String> transformer) {
+        return new Inner(transformer.apply(this.string));
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public WithByInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/WithInAnonymousClass.java b/test/transform/resource/after-ecj/WithInAnonymousClass.java
new file mode 100644
index 00000000..fef96022
--- /dev/null
+++ b/test/transform/resource/after-ecj/WithInAnonymousClass.java
@@ -0,0 +1,23 @@
+import lombok.With;
+public class WithInAnonymousClass {
+  Object annonymous = new Object() {
+    @With class Inner {
+      private String string;
+      private Inner(String string) {
+        super();
+      }
+      /**
+       * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+       */
+      public @java.lang.SuppressWarnings("all") Inner withString(final String string) {
+        return ((this.string == string) ? this : new Inner(string));
+      }
+    }
+    x() {
+      super();
+    }
+  };
+  public WithInAnonymousClass() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..fb035da4
--- /dev/null
+++ b/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,12 @@
+@lombok.With class WithWithJavaBeansSpecCapitalization {
+  int aField;
+  WithWithJavaBeansSpecCapitalization(int aField) {
+    super();
+  }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
+  public @java.lang.SuppressWarnings("all") WithWithJavaBeansSpecCapitalization withaField(final int aField) {
+    return ((this.aField == aField) ? this : new WithWithJavaBeansSpecCapitalization(aField));
+  }
+}
diff --git a/test/transform/resource/before/AccessorsInAnonymousClass.java b/test/transform/resource/before/AccessorsInAnonymousClass.java
new file mode 100644
index 00000000..0bbab1d6
--- /dev/null
+++ b/test/transform/resource/before/AccessorsInAnonymousClass.java
@@ -0,0 +1,14 @@
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+public class AccessorsInAnonymousClass {
+	Object annonymous = new Object() {
+		@Getter
+		@Setter
+		@Accessors(fluent = true)
+		class Inner {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/BuilderInAnonymousClass.java b/test/transform/resource/before/BuilderInAnonymousClass.java
new file mode 100644
index 00000000..8291e678
--- /dev/null
+++ b/test/transform/resource/before/BuilderInAnonymousClass.java
@@ -0,0 +1,10 @@
+import lombok.Builder;
+
+public class BuilderInAnonymousClass {
+	Object annonymous = new Object() {
+		@Builder
+		class Inner {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/BuilderNestedInEnum.java b/test/transform/resource/before/BuilderNestedInEnum.java
new file mode 100644
index 00000000..99348002
--- /dev/null
+++ b/test/transform/resource/before/BuilderNestedInEnum.java
@@ -0,0 +1,12 @@
+// issue #3014: Builder check if its on a non-static inner class and errors if it is. But it was erroring here even though it is on a static inner class.
+class BuilderNestedInEnum {
+	public enum TestEnum {
+		FOO, BAR;
+		
+		@lombok.Builder
+		@lombok.Value
+		public static class TestBuilder {
+			String field;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/BuilderWithJavaBeansSpecCapitalization.java b/test/transform/resource/before/BuilderWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..db1fe15f
--- /dev/null
+++ b/test/transform/resource/before/BuilderWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,7 @@
+//CONF: lombok.accessors.capitalization = beanspec
+@lombok.Builder(setterPrefix = "set")
+class BuilderWithJavaBeansSpecCapitalization {
+	@lombok.Singular("z") java.util.List<String> a;
+	@lombok.Singular("yField") java.util.List<String> aField;
+	String bField;
+}
diff --git a/test/transform/resource/before/ConstructorsInAnonymousClass.java b/test/transform/resource/before/ConstructorsInAnonymousClass.java
new file mode 100644
index 00000000..a74a7f11
--- /dev/null
+++ b/test/transform/resource/before/ConstructorsInAnonymousClass.java
@@ -0,0 +1,18 @@
+//version 8:
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+public class ConstructorsInAnonymousClass {
+	Object annonymous = new Object() {
+		@AllArgsConstructor
+		@RequiredArgsConstructor
+		@NoArgsConstructor
+		class Inner {
+			private String string;
+			@NonNull
+			private String string2;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/DataInAnonymousClass.java b/test/transform/resource/before/DataInAnonymousClass.java
new file mode 100644
index 00000000..3de5ac0b
--- /dev/null
+++ b/test/transform/resource/before/DataInAnonymousClass.java
@@ -0,0 +1,10 @@
+import lombok.Data;
+
+public class DataInAnonymousClass {
+	Object annonymous = new Object() {
+		@Data
+		class Inner {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/EqualsAndHashCodeInAnonymousClass.java b/test/transform/resource/before/EqualsAndHashCodeInAnonymousClass.java
new file mode 100644
index 00000000..0f0995b6
--- /dev/null
+++ b/test/transform/resource/before/EqualsAndHashCodeInAnonymousClass.java
@@ -0,0 +1,10 @@
+import lombok.EqualsAndHashCode;
+
+public class EqualsAndHashCodeInAnonymousClass {
+	Object annonymous = new Object() {
+		@EqualsAndHashCode
+		class Inner {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/FieldDefaultsViaConfigOnRecord.java b/test/transform/resource/before/FieldDefaultsViaConfigOnRecord.java
new file mode 100644
index 00000000..e72179e9
--- /dev/null
+++ b/test/transform/resource/before/FieldDefaultsViaConfigOnRecord.java
@@ -0,0 +1,7 @@
+// version 14:
+//CONF: lombok.fieldDefaults.defaultFinal = true
+//CONF: lombok.fieldDefaults.defaultPrivate = true
+//unchanged
+
+public record FieldDefaultsViaConfigOnRecord(String a, String b) {
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/FieldNameConstantsInAnonymousClass.java b/test/transform/resource/before/FieldNameConstantsInAnonymousClass.java
new file mode 100644
index 00000000..86325ce5
--- /dev/null
+++ b/test/transform/resource/before/FieldNameConstantsInAnonymousClass.java
@@ -0,0 +1,10 @@
+import lombok.experimental.FieldNameConstants;
+
+public class FieldNameConstantsInAnonymousClass {
+	Object annonymous = new Object() {
+		@FieldNameConstants
+		class Inner {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/GetterInAnonymousClass.java b/test/transform/resource/before/GetterInAnonymousClass.java
new file mode 100644
index 00000000..e8195021
--- /dev/null
+++ b/test/transform/resource/before/GetterInAnonymousClass.java
@@ -0,0 +1,10 @@
+import lombok.Getter;
+
+public class GetterInAnonymousClass {
+	Object annonymous = new Object() {
+		@Getter
+		class Inner {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/GetterLazyInAnonymousClass.java b/test/transform/resource/before/GetterLazyInAnonymousClass.java
new file mode 100644
index 00000000..e342e636
--- /dev/null
+++ b/test/transform/resource/before/GetterLazyInAnonymousClass.java
@@ -0,0 +1,10 @@
+import lombok.Getter;
+
+public class GetterLazyInAnonymousClass {
+	Object annonymous = new Object() {
+		class Inner {
+			@Getter(lazy = true)
+			private final String string = "test";
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/GetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/before/GetterWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..68f41e3d
--- /dev/null
+++ b/test/transform/resource/before/GetterWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,5 @@
+//CONF: lombok.accessors.capitalization = beanspec
+class GetterWithJavaBeansSpecCapitalization {
+	@lombok.Getter int a;
+	@lombok.Getter int aField;
+}
diff --git a/test/transform/resource/before/LoggerSlf4jInAnonymousClass.java b/test/transform/resource/before/LoggerSlf4jInAnonymousClass.java
new file mode 100644
index 00000000..4839c7aa
--- /dev/null
+++ b/test/transform/resource/before/LoggerSlf4jInAnonymousClass.java
@@ -0,0 +1,9 @@
+import lombok.extern.slf4j.Slf4j;
+
+public class LoggerSlf4jInAnonymousClass {
+	Object annonymous = new Object() {
+		@Slf4j
+		class Inner {
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/MixGetterVal.java b/test/transform/resource/before/MixGetterVal.java
index 3f06b1a8..4568902b 100644
--- a/test/transform/resource/before/MixGetterVal.java
+++ b/test/transform/resource/before/MixGetterVal.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.Getter;
 import lombok.val;
 
diff --git a/test/transform/resource/before/SetterInAnonymousClass.java b/test/transform/resource/before/SetterInAnonymousClass.java
new file mode 100644
index 00000000..1b3c817b
--- /dev/null
+++ b/test/transform/resource/before/SetterInAnonymousClass.java
@@ -0,0 +1,10 @@
+import lombok.Setter;
+
+public class SetterInAnonymousClass {
+	Object annonymous = new Object() {
+		@Setter
+		class Inner {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/SetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/before/SetterWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..b5e34ba7
--- /dev/null
+++ b/test/transform/resource/before/SetterWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,5 @@
+//CONF: lombok.accessors.capitalization = beanspec
+class SetterWithJavaBeansSpecCapitalization {
+	@lombok.Setter int a;
+	@lombok.Setter int aField;
+}
diff --git a/test/transform/resource/before/SuperBuilderInAnonymousClass.java b/test/transform/resource/before/SuperBuilderInAnonymousClass.java
new file mode 100644
index 00000000..bff871aa
--- /dev/null
+++ b/test/transform/resource/before/SuperBuilderInAnonymousClass.java
@@ -0,0 +1,15 @@
+import lombok.experimental.SuperBuilder;
+
+public class SuperBuilderInAnonymousClass {
+	Object annonymous = new Object() {
+		@SuperBuilder
+		class InnerParent {
+			private String string;
+		}
+
+		@SuperBuilder
+		class InnerChild {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/SynchronizedInAnonymousClass.java b/test/transform/resource/before/SynchronizedInAnonymousClass.java
new file mode 100644
index 00000000..11c623ce
--- /dev/null
+++ b/test/transform/resource/before/SynchronizedInAnonymousClass.java
@@ -0,0 +1,12 @@
+import lombok.Synchronized;
+
+public class SynchronizedInAnonymousClass {
+	Object annonymous = new Object() {
+		class Inner {
+			@Synchronized
+			public void foo() {
+				String foo = "bar";
+			}
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ToStringInAnonymousClass.java b/test/transform/resource/before/ToStringInAnonymousClass.java
new file mode 100644
index 00000000..87a7a6c1
--- /dev/null
+++ b/test/transform/resource/before/ToStringInAnonymousClass.java
@@ -0,0 +1,10 @@
+import lombok.ToString;
+
+public class ToStringInAnonymousClass {
+	Object annonymous = new Object() {
+		@ToString
+		class Inner {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/TrickyTypeResolution.java b/test/transform/resource/before/TrickyTypeResolution.java
index 94d97fe0..7f3866ee 100644
--- a/test/transform/resource/before/TrickyTypeResolution.java
+++ b/test/transform/resource/before/TrickyTypeResolution.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.*;
 class TrickyDoNothing {
 	@interface Getter {}
diff --git a/test/transform/resource/before/UtilityClassInAnonymousClass.java b/test/transform/resource/before/UtilityClassInAnonymousClass.java
new file mode 100644
index 00000000..41757502
--- /dev/null
+++ b/test/transform/resource/before/UtilityClassInAnonymousClass.java
@@ -0,0 +1,10 @@
+import lombok.experimental.UtilityClass;
+
+public class UtilityClassInAnonymousClass {
+	Object annonymous = new Object() {
+		@UtilityClass
+		class Inner {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ValAnonymousSubclassSelfReference.java b/test/transform/resource/before/ValAnonymousSubclassSelfReference.java
new file mode 100644
index 00000000..b17c997a
--- /dev/null
+++ b/test/transform/resource/before/ValAnonymousSubclassSelfReference.java
@@ -0,0 +1,22 @@
+// version :9
+// issue 2420: to trigger the problem 2 var/val, at least one normal variable and a anonymous self reference is required
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.val;
+
+public class ValAnonymousSubclassSelfReference {
+	public <T> void test(T arg) {
+		T d = arg;
+		Integer[] e = new Integer[1];
+		int[] f = new int[0];
+		java.util.Map<java.lang.String, Integer> g = new HashMap<String, Integer>();
+		Integer h = 0;  
+		int i = 0;
+		
+		val j = 1;
+		val k = 2;
+
+		new ValAnonymousSubclassSelfReference() { };
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ValAnonymousSubclassWithGenerics.java b/test/transform/resource/before/ValAnonymousSubclassWithGenerics.java
index c0f8157a..a434ba9d 100644
--- a/test/transform/resource/before/ValAnonymousSubclassWithGenerics.java
+++ b/test/transform/resource/before/ValAnonymousSubclassWithGenerics.java
@@ -1,3 +1,4 @@
+// version :9
 // issue 205: val inside anonymous inner classes is a bit tricky in javac, this test ensures we don't break it.
 import java.util.*;
 import lombok.val;
diff --git a/test/transform/resource/before/ValComplex.java b/test/transform/resource/before/ValComplex.java
index e20124a2..f1898cfd 100644
--- a/test/transform/resource/before/ValComplex.java
+++ b/test/transform/resource/before/ValComplex.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.val;
 
 public class ValComplex {
diff --git a/test/transform/resource/before/ValDefault.java b/test/transform/resource/before/ValDefault.java
index 75124c3c..ded4b074 100644
--- a/test/transform/resource/before/ValDefault.java
+++ b/test/transform/resource/before/ValDefault.java
@@ -1,4 +1,4 @@
-// version 8:
+// version 8:9
 interface ValDefault {
 	int size();
 	
diff --git a/test/transform/resource/before/ValDelegateMethodReference.java b/test/transform/resource/before/ValDelegateMethodReference.java
index 3d1f082c..8cfc2c33 100644
--- a/test/transform/resource/before/ValDelegateMethodReference.java
+++ b/test/transform/resource/before/ValDelegateMethodReference.java
@@ -1,4 +1,4 @@
-//version 8:
+//version 8:9
 //platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 import lombok.Getter;
 import lombok.Setter;
diff --git a/test/transform/resource/before/ValErrors.java b/test/transform/resource/before/ValErrors.java
index 87383719..290a1f72 100644
--- a/test/transform/resource/before/ValErrors.java
+++ b/test/transform/resource/before/ValErrors.java
@@ -1,3 +1,4 @@
+// version :9
 // unchanged
 import lombok.val;
 
diff --git a/test/transform/resource/before/ValFinal.java b/test/transform/resource/before/ValFinal.java
index 3c5af366..293c9bce 100644
--- a/test/transform/resource/before/ValFinal.java
+++ b/test/transform/resource/before/ValFinal.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.val;
 public class ValFinal {
 	public void test() {
diff --git a/test/transform/resource/before/ValInBasicFor.java b/test/transform/resource/before/ValInBasicFor.java
index a109bcd3..b137f0d7 100644
--- a/test/transform/resource/before/ValInBasicFor.java
+++ b/test/transform/resource/before/ValInBasicFor.java
@@ -1,3 +1,4 @@
+// version :9
 // unchanged
 import lombok.val;
 
diff --git a/test/transform/resource/before/ValInFor.java b/test/transform/resource/before/ValInFor.java
index 35332b34..f2c50139 100644
--- a/test/transform/resource/before/ValInFor.java
+++ b/test/transform/resource/before/ValInFor.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.val;
 
 public class ValInFor {
diff --git a/test/transform/resource/before/ValInLambda.java b/test/transform/resource/before/ValInLambda.java
index 6750d045..a13c79d2 100644
--- a/test/transform/resource/before/ValInLambda.java
+++ b/test/transform/resource/before/ValInLambda.java
@@ -1,4 +1,4 @@
-// version 8:
+// version 8:9
 
 import java.util.function.Function;
 import java.util.function.Supplier;
diff --git a/test/transform/resource/before/ValInMultiDeclaration.java b/test/transform/resource/before/ValInMultiDeclaration.java
index 1c333ebb..0f4e604b 100644
--- a/test/transform/resource/before/ValInMultiDeclaration.java
+++ b/test/transform/resource/before/ValInMultiDeclaration.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.val;
 public class ValInMultiDeclaration {
 	public void test() {
diff --git a/test/transform/resource/before/ValInTryWithResources.java b/test/transform/resource/before/ValInTryWithResources.java
index a7820062..5c885f79 100644
--- a/test/transform/resource/before/ValInTryWithResources.java
+++ b/test/transform/resource/before/ValInTryWithResources.java
@@ -1,4 +1,4 @@
-//version 7:
+//version 7:9
 import lombok.val;
 import java.io.IOException;
 
diff --git a/test/transform/resource/before/ValInvalidParameter.java b/test/transform/resource/before/ValInvalidParameter.java
new file mode 100644
index 00000000..f4961c4e
--- /dev/null
+++ b/test/transform/resource/before/ValInvalidParameter.java
@@ -0,0 +1,32 @@
+//version :9
+import lombok.val;
+
+public class ValInvalidParameter {
+	public void val() {
+		val a = a(new NonExistingClass());
+		val b = a(a(new NonExistingClass()));
+		val c = nonExisitingMethod(b(1));
+		val d = nonExistingObject.nonExistingMethod();
+		val e = b(1).nonExistingMethod();
+		val f = 1 > 2 ? a(new NonExistingClass()) : a(new NonExistingClass());
+		val g = b2(1);
+		val h = b2(a("a"), a(null));
+		val i = a(a(null));
+	}
+	
+	public int a(String param) {
+		return 0;
+	}
+	
+	public int a(Integer param) {
+		return 0;
+	}
+	
+	public Integer b(int i) {
+		return i;
+	}
+	
+	public Integer b2(int i, int j) {
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ValLambda.java b/test/transform/resource/before/ValLambda.java
index e956bcd3..8f55d222 100644
--- a/test/transform/resource/before/ValLambda.java
+++ b/test/transform/resource/before/ValLambda.java
@@ -1,4 +1,4 @@
-// version 8:
+// version 8:9
 import java.io.Serializable;
 
 class ValLambda {
diff --git a/test/transform/resource/before/ValLessSimple.java b/test/transform/resource/before/ValLessSimple.java
index b81cc22c..1ed738cc 100644
--- a/test/transform/resource/before/ValLessSimple.java
+++ b/test/transform/resource/before/ValLessSimple.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.val;
 
 public class ValLessSimple {
diff --git a/test/transform/resource/before/ValLub.java b/test/transform/resource/before/ValLub.java
index 509a4f8b..e3b55950 100644
--- a/test/transform/resource/before/ValLub.java
+++ b/test/transform/resource/before/ValLub.java
@@ -1,3 +1,4 @@
+// version :9
 class ValLub {
 	public void easyLub() {
 		java.util.Map<String, Number> m = java.util.Collections.emptyMap();
diff --git a/test/transform/resource/before/ValNullInit.java b/test/transform/resource/before/ValNullInit.java
index 649bc0cd..c1610af3 100644
--- a/test/transform/resource/before/ValNullInit.java
+++ b/test/transform/resource/before/ValNullInit.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.val;
 
 class ValNullInit {
diff --git a/test/transform/resource/before/ValOutersWithGenerics.java b/test/transform/resource/before/ValOutersWithGenerics.java
index 1b29d37c..99b71735 100644
--- a/test/transform/resource/before/ValOutersWithGenerics.java
+++ b/test/transform/resource/before/ValOutersWithGenerics.java
@@ -1,3 +1,4 @@
+// version :9
 import java.util.*;
 import lombok.val;
 
diff --git a/test/transform/resource/before/ValRawType.java b/test/transform/resource/before/ValRawType.java
index 3ef8527e..fa47c536 100644
--- a/test/transform/resource/before/ValRawType.java
+++ b/test/transform/resource/before/ValRawType.java
@@ -1,3 +1,4 @@
+// version :9
 import java.util.List;
 import lombok.val;
 
diff --git a/test/transform/resource/before/ValSimple.java b/test/transform/resource/before/ValSimple.java
index 04763be2..5d1911da 100644
--- a/test/transform/resource/before/ValSimple.java
+++ b/test/transform/resource/before/ValSimple.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.val;
 
 public class ValSimple {
diff --git a/test/transform/resource/before/ValToNative.java b/test/transform/resource/before/ValToNative.java
new file mode 100644
index 00000000..3b4e6fa8
--- /dev/null
+++ b/test/transform/resource/before/ValToNative.java
@@ -0,0 +1,19 @@
+// version 10:
+import java.io.IOException;
+import java.util.Arrays;
+
+import lombok.val;
+
+public class ValToNative {
+	private void test() throws IOException {
+		val intField = 1;
+		
+		for (val s : Arrays.asList("1")) {
+			val s2 = s;
+		}
+		
+		try (val in = getClass().getResourceAsStream("ValToNative.class")) {
+			val j = in.read();
+		}
+	}
+}
diff --git a/test/transform/resource/before/ValWeirdTypes.java b/test/transform/resource/before/ValWeirdTypes.java
index f62feca6..710e236b 100644
--- a/test/transform/resource/before/ValWeirdTypes.java
+++ b/test/transform/resource/before/ValWeirdTypes.java
@@ -1,4 +1,4 @@
-// version 8: In java6/7, lub types worked differently, so, the `arraysAsList` method has a slightly different inferred type there.
+// version 8:9 In java6/7, lub types worked differently, so, the `arraysAsList` method has a slightly different inferred type there.
 import java.math.BigDecimal;
 import java.util.*;
 import lombok.val;
diff --git a/test/transform/resource/before/ValWithLabel.java b/test/transform/resource/before/ValWithLabel.java
index f7c3402a..9e15f937 100644
--- a/test/transform/resource/before/ValWithLabel.java
+++ b/test/transform/resource/before/ValWithLabel.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.val;
 
 public class ValWithLabel {
diff --git a/test/transform/resource/before/ValWithLocalClasses.java b/test/transform/resource/before/ValWithLocalClasses.java
index 572a1e7d..0d145aa9 100644
--- a/test/transform/resource/before/ValWithLocalClasses.java
+++ b/test/transform/resource/before/ValWithLocalClasses.java
@@ -1,3 +1,4 @@
+// version :9
 //issue 694: In javac, resolving the RHS (which is what val does) can cause an entire class to be resolved, breaking all usage of val inside that class. This tests that we handle that better.
 class ValWithLocalClasses1 {
 	{
diff --git a/test/transform/resource/before/ValWithSelfRefGenerics.java b/test/transform/resource/before/ValWithSelfRefGenerics.java
index d0532606..fdb30d32 100644
--- a/test/transform/resource/before/ValWithSelfRefGenerics.java
+++ b/test/transform/resource/before/ValWithSelfRefGenerics.java
@@ -1,3 +1,4 @@
+// version :9
 import lombok.val;
 public class ValWithSelfRefGenerics {
 	public void run(Thing<? extends Comparable<?>> thing, Thing<?> thing2, java.util.List<? extends Number> z) {
diff --git a/test/transform/resource/before/ValueInAnonymousClass.java b/test/transform/resource/before/ValueInAnonymousClass.java
new file mode 100644
index 00000000..c0bde2ab
--- /dev/null
+++ b/test/transform/resource/before/ValueInAnonymousClass.java
@@ -0,0 +1,10 @@
+import lombok.Value;
+
+public class ValueInAnonymousClass {
+	Object annonymous = new Object() {
+		@Value
+		class Inner {
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ValueWithJavaBeansSpecCapitalization.java b/test/transform/resource/before/ValueWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..7c001f6e
--- /dev/null
+++ b/test/transform/resource/before/ValueWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,5 @@
+//CONF: lombok.accessors.capitalization = beanspec
+@lombok.Value
+class ValueWithJavaBeansSpecCapitalization {
+	final int aField;
+}
diff --git a/test/transform/resource/before/WithByInAnonymousClass.java b/test/transform/resource/before/WithByInAnonymousClass.java
new file mode 100644
index 00000000..afed6adf
--- /dev/null
+++ b/test/transform/resource/before/WithByInAnonymousClass.java
@@ -0,0 +1,13 @@
+//version 8:
+import lombok.experimental.WithBy;
+
+public class WithByInAnonymousClass {
+	Object annonymous = new Object() {
+		@WithBy
+		class Inner {
+			private Inner(String string) { }
+			
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/WithInAnonymousClass.java b/test/transform/resource/before/WithInAnonymousClass.java
new file mode 100644
index 00000000..daf1bce5
--- /dev/null
+++ b/test/transform/resource/before/WithInAnonymousClass.java
@@ -0,0 +1,12 @@
+import lombok.With;
+
+public class WithInAnonymousClass {
+	Object annonymous = new Object() {
+		@With
+		class Inner {
+			private Inner(String string) { }
+			
+			private String string;
+		}
+	};
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/WithWithJavaBeansSpecCapitalization.java b/test/transform/resource/before/WithWithJavaBeansSpecCapitalization.java
new file mode 100644
index 00000000..ef4a78ad
--- /dev/null
+++ b/test/transform/resource/before/WithWithJavaBeansSpecCapitalization.java
@@ -0,0 +1,8 @@
+//CONF: lombok.accessors.capitalization = beanspec
+@lombok.With
+class WithWithJavaBeansSpecCapitalization {
+	int aField;
+	
+	WithWithJavaBeansSpecCapitalization(int aField) {
+	}
+}
diff --git a/test/transform/resource/messages-delombok/BuilderInAnonymousClass.java.messages b/test/transform/resource/messages-delombok/BuilderInAnonymousClass.java.messages
new file mode 100644
index 00000000..7607e734
--- /dev/null
+++ b/test/transform/resource/messages-delombok/BuilderInAnonymousClass.java.messages
@@ -0,0 +1 @@
+5 @Builder is not supported on non-static nested classes.
diff --git a/test/transform/resource/messages-delombok/FieldNameConstantsInAnonymousClass.java.messages b/test/transform/resource/messages-delombok/FieldNameConstantsInAnonymousClass.java.messages
new file mode 100644
index 00000000..b9d4887f
--- /dev/null
+++ b/test/transform/resource/messages-delombok/FieldNameConstantsInAnonymousClass.java.messages
@@ -0,0 +1 @@
+5 @FieldNameConstants is not supported on non-static nested classes.
diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jInAnonymousClass.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jInAnonymousClass.java.messages
new file mode 100644
index 00000000..d4da9f99
--- /dev/null
+++ b/test/transform/resource/messages-delombok/LoggerSlf4jInAnonymousClass.java.messages
@@ -0,0 +1 @@
+5 @Slf4j is not supported on non-static nested classes.
diff --git a/test/transform/resource/messages-delombok/SuperBuilderInAnonymousClass.java.messages b/test/transform/resource/messages-delombok/SuperBuilderInAnonymousClass.java.messages
new file mode 100644
index 00000000..f0cf3243
--- /dev/null
+++ b/test/transform/resource/messages-delombok/SuperBuilderInAnonymousClass.java.messages
@@ -0,0 +1,2 @@
+5 @SuperBuilder is not supported on non-static nested classes.
+10 @SuperBuilder is not supported on non-static nested classes.
diff --git a/test/transform/resource/messages-delombok/UtilityClassInAnonymousClass.java.messages b/test/transform/resource/messages-delombok/UtilityClassInAnonymousClass.java.messages
new file mode 100644
index 00000000..8884e02d
--- /dev/null
+++ b/test/transform/resource/messages-delombok/UtilityClassInAnonymousClass.java.messages
@@ -0,0 +1 @@
+5 @UtilityClass automatically makes the class static, however, this class cannot be made static.
diff --git a/test/transform/resource/messages-delombok/ValInvalidParameter.java.messages b/test/transform/resource/messages-delombok/ValInvalidParameter.java.messages
new file mode 100644
index 00000000..da0df315
--- /dev/null
+++ b/test/transform/resource/messages-delombok/ValInvalidParameter.java.messages
@@ -0,0 +1 @@
+12 Cannot use 'val' here because initializer expression does not have a representable type: Type cannot be resolved
\ No newline at end of file
diff --git a/test/transform/resource/messages-ecj/BuilderInAnonymousClass.java.messages b/test/transform/resource/messages-ecj/BuilderInAnonymousClass.java.messages
new file mode 100644
index 00000000..7607e734
--- /dev/null
+++ b/test/transform/resource/messages-ecj/BuilderInAnonymousClass.java.messages
@@ -0,0 +1 @@
+5 @Builder is not supported on non-static nested classes.
diff --git a/test/transform/resource/messages-ecj/FieldNameConstantsInAnonymousClass.java.messages b/test/transform/resource/messages-ecj/FieldNameConstantsInAnonymousClass.java.messages
new file mode 100644
index 00000000..b9d4887f
--- /dev/null
+++ b/test/transform/resource/messages-ecj/FieldNameConstantsInAnonymousClass.java.messages
@@ -0,0 +1 @@
+5 @FieldNameConstants is not supported on non-static nested classes.
diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jInAnonymousClass.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jInAnonymousClass.java.messages
new file mode 100644
index 00000000..d4da9f99
--- /dev/null
+++ b/test/transform/resource/messages-ecj/LoggerSlf4jInAnonymousClass.java.messages
@@ -0,0 +1 @@
+5 @Slf4j is not supported on non-static nested classes.
diff --git a/test/transform/resource/messages-ecj/SuperBuilderInAnonymousClass.java.messages b/test/transform/resource/messages-ecj/SuperBuilderInAnonymousClass.java.messages
new file mode 100644
index 00000000..f0cf3243
--- /dev/null
+++ b/test/transform/resource/messages-ecj/SuperBuilderInAnonymousClass.java.messages
@@ -0,0 +1,2 @@
+5 @SuperBuilder is not supported on non-static nested classes.
+10 @SuperBuilder is not supported on non-static nested classes.
diff --git a/test/transform/resource/messages-ecj/UtilityClassInAnonymousClass.java.messages b/test/transform/resource/messages-ecj/UtilityClassInAnonymousClass.java.messages
new file mode 100644
index 00000000..8884e02d
--- /dev/null
+++ b/test/transform/resource/messages-ecj/UtilityClassInAnonymousClass.java.messages
@@ -0,0 +1 @@
+5 @UtilityClass automatically makes the class static, however, this class cannot be made static.
diff --git a/test/transform/resource/messages-ecj/ValErrors.java.messages b/test/transform/resource/messages-ecj/ValErrors.java.messages
index c4c76901..9fcec493 100644
--- a/test/transform/resource/messages-ecj/ValErrors.java.messages
+++ b/test/transform/resource/messages-ecj/ValErrors.java.messages
@@ -1,2 +1,4 @@
-6 d cannot be resolved to a variable
-10 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... })
+7 d cannot be resolved to a variable
+7 d cannot be resolved or is not a field
+11 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... })
+11 Type mismatch: cannot convert from String[] to Object
\ No newline at end of file
diff --git a/test/transform/resource/messages-ecj/ValInBasicFor.java.messages b/test/transform/resource/messages-ecj/ValInBasicFor.java.messages
index b32eabe4..00bc643f 100644
--- a/test/transform/resource/messages-ecj/ValInBasicFor.java.messages
+++ b/test/transform/resource/messages-ecj/ValInBasicFor.java.messages
@@ -1,2 +1,4 @@
-7 'val' is not allowed in old-style for loops
-7 Type mismatch: cannot convert from int to val
+8 'val' is not allowed in old-style for loops
+8 Type mismatch: cannot convert from int to val
+8 Type mismatch: cannot convert from String to val
+8 Type mismatch: cannot convert from double to val
\ No newline at end of file
diff --git a/test/transform/resource/messages-ecj/ValInvalidParameter.java.messages b/test/transform/resource/messages-ecj/ValInvalidParameter.java.messages
new file mode 100644
index 00000000..cbf2d7c4
--- /dev/null
+++ b/test/transform/resource/messages-ecj/ValInvalidParameter.java.messages
@@ -0,0 +1,9 @@
+5 NonExistingClass cannot be resolved to a type
+6 NonExistingClass cannot be resolved to a type
+7 The method nonExisitingMethod(Integer) is undefined for the type ValInvalidParameter
+8 nonExistingObject cannot be resolved
+9 The method nonExistingMethod() is undefined for the type Integer
+10 NonExistingClass cannot be resolved to a type
+11 The method b2(int, int) in the type ValInvalidParameter is not applicable for the arguments (int)
+12 The method a(String) is ambiguous for the type ValInvalidParameter
+13 The method a(String) is ambiguous for the type ValInvalidParameter
\ No newline at end of file
diff --git a/test/transform/resource/messages-idempotent/ValInvalidParameter.java.messages b/test/transform/resource/messages-idempotent/ValInvalidParameter.java.messages
new file mode 100644
index 00000000..539d29cd
--- /dev/null
+++ b/test/transform/resource/messages-idempotent/ValInvalidParameter.java.messages
@@ -0,0 +1,9 @@
+3 cannot find symbol
+4 cannot find symbol
+5 cannot find symbol
+6 cannot find symbol
+7 cannot find symbol
+8 cannot find symbol
+9 method b2 in class ValInvalidParameter cannot be applied to given types;
+10 reference to a is ambiguous
+11 reference to a is ambiguous
\ No newline at end of file