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

29 files changed, 770 insertions, 4 deletions

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));
+  }
+}