code review and fixes for the ‘copyable annotations’ setting concept.

10 files changed, 21 insertions, 100 deletions

diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnosCopy.java b/test/transform/resource/after-ecj/BuilderTypeAnnos.java
index 8dfc8164..1c310f38 100644
--- a/test/transform/resource/after-ecj/BuilderTypeAnnosCopy.java
+++ b/test/transform/resource/after-ecj/BuilderTypeAnnos.java
@@ -1,7 +1,9 @@
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.List;
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TA {
+}
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB {
 }
 @lombok.Builder class BuilderTypeAnnos {
   public static @java.lang.SuppressWarnings("all") class BuilderTypeAnnosBuilder {
@@ -20,7 +22,7 @@ import java.util.List;
       return (("BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo) + ")");
     }
   }
-  private @TA List<@TA String> foo;
+  private @TA @TB List<String> foo;
   @java.lang.SuppressWarnings("all") BuilderTypeAnnos(final @TA List<String> foo) {
     super();
     this.foo = foo;
diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnosNoCopy.java b/test/transform/resource/after-ecj/BuilderTypeAnnosNoCopy.java
deleted file mode 100644
index a2dfcc2f..00000000
--- a/test/transform/resource/after-ecj/BuilderTypeAnnosNoCopy.java
+++ /dev/null
@@ -1,31 +0,0 @@
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.util.List;
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {
-}
-@lombok.Builder class BuilderTypeAnnos {
-  public static @java.lang.SuppressWarnings("all") class BuilderTypeAnnosBuilder {
-    private @java.lang.SuppressWarnings("all") List<String> foo;
-    @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder() {
-      super();
-    }
-    public @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder foo(final List<String> foo) {
-      this.foo = foo;
-      return this;
-    }
-    public @java.lang.SuppressWarnings("all") BuilderTypeAnnos build() {
-      return new BuilderTypeAnnos(foo);
-    }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo) + ")");
-    }
-  }
-  private @TA List<@TA String> foo;
-  @java.lang.SuppressWarnings("all") BuilderTypeAnnos(final List<String> foo) {
-    super();
-    this.foo = foo;
-  }
-  public static @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder builder() {
-    return new BuilderTypeAnnosBuilder();
-  }
-}
diff --git a/test/transform/resource/after-ecj/ConstructorsTypeAnnosCopy.java b/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java
index ad372fc9..3491239f 100644
--- a/test/transform/resource/after-ecj/ConstructorsTypeAnnosCopy.java
+++ b/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java
@@ -1,10 +1,12 @@
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.List;
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TA {
+}
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB {
 }
 @lombok.AllArgsConstructor class ConstructorsTypeAnnos {
-  @TA List<@TA String> foo;
+  @TA @TB List<String> foo;
   public @java.lang.SuppressWarnings("all") ConstructorsTypeAnnos(final @TA List<String> foo) {
     super();
     this.foo = foo;
diff --git a/test/transform/resource/after-ecj/ConstructorsTypeAnnosNoCopy.java b/test/transform/resource/after-ecj/ConstructorsTypeAnnosNoCopy.java
deleted file mode 100644
index ce4b1b3b..00000000
--- a/test/transform/resource/after-ecj/ConstructorsTypeAnnosNoCopy.java
+++ /dev/null
@@ -1,12 +0,0 @@
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.util.List;
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {
-}
-@lombok.AllArgsConstructor class ConstructorsTypeAnnos {
-  @TA List<@TA String> foo;
-  public @java.lang.SuppressWarnings("all") ConstructorsTypeAnnos(final List<String> foo) {
-    super();
-    this.foo = foo;
-  }
-}
diff --git a/test/transform/resource/after-ecj/GetterTypeAnnosCopy.java b/test/transform/resource/after-ecj/GetterTypeAnnos.java
index 1b4f03c5..9ffc7f1c 100644
--- a/test/transform/resource/after-ecj/GetterTypeAnnosCopy.java
+++ b/test/transform/resource/after-ecj/GetterTypeAnnos.java
@@ -2,10 +2,12 @@ import lombok.Getter;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.List;
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TA {
+}
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB {
 }
 class GetterTypeAnnos {
-  @Getter @TA List<@TA String> foo;
+  @Getter @TA @TB List<String> foo;
   GetterTypeAnnos() {
     super();
   }
diff --git a/test/transform/resource/after-ecj/GetterTypeAnnosNoCopy.java b/test/transform/resource/after-ecj/GetterTypeAnnosNoCopy.java
deleted file mode 100644
index a43d3215..00000000
--- a/test/transform/resource/after-ecj/GetterTypeAnnosNoCopy.java
+++ /dev/null
@@ -1,15 +0,0 @@
-import lombok.Getter;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.util.List;
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {
-}
-class GetterTypeAnnos {
-  @Getter @TA List<@TA String> foo;
-  GetterTypeAnnos() {
-    super();
-  }
-  public @java.lang.SuppressWarnings("all") List<String> getFoo() {
-    return this.foo;
-  }
-}
diff --git a/test/transform/resource/after-ecj/SetterTypeAnnosCopy.java b/test/transform/resource/after-ecj/SetterTypeAnnos.java
index ef290cbf..860694ea 100644
--- a/test/transform/resource/after-ecj/SetterTypeAnnosCopy.java
+++ b/test/transform/resource/after-ecj/SetterTypeAnnos.java
@@ -2,10 +2,12 @@ import lombok.Setter;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.List;
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TA {
+}
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB {
 }
 class SetterTypeAnnos {
-  @Setter @TA List<@TA String> foo;
+  @Setter @TA @TB List<String> foo;
   SetterTypeAnnos() {
     super();
   }
diff --git a/test/transform/resource/after-ecj/SetterTypeAnnosNoCopy.java b/test/transform/resource/after-ecj/SetterTypeAnnosNoCopy.java
deleted file mode 100644
index 17e27782..00000000
--- a/test/transform/resource/after-ecj/SetterTypeAnnosNoCopy.java
+++ /dev/null
@@ -1,15 +0,0 @@
-import lombok.Setter;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.util.List;
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {
-}
-class SetterTypeAnnos {
-  @Setter @TA List<@TA String> foo;
-  SetterTypeAnnos() {
-    super();
-  }
-  public @java.lang.SuppressWarnings("all") void setFoo(final List<String> foo) {
-    this.foo = foo;
-  }
-}
diff --git a/test/transform/resource/after-ecj/WitherTypeAnnosCopy.java b/test/transform/resource/after-ecj/WitherTypeAnnos.java
index b4f3c687..e41d9e13 100644
--- a/test/transform/resource/after-ecj/WitherTypeAnnosCopy.java
+++ b/test/transform/resource/after-ecj/WitherTypeAnnos.java
@@ -2,11 +2,13 @@ import lombok.experimental.Wither;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.List;
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TA {
+}
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB {
 }
 class WitherTypeAnnos {
-  final @Wither @TA List<@TA String> foo;
-  WitherTypeAnnos(@TA List<@TA String> foo) {
+  final @Wither @TA @TB List<String> foo;
+  WitherTypeAnnos(@TA @TB List<String> foo) {
     super();
     this.foo = foo;
   }
diff --git a/test/transform/resource/after-ecj/WitherTypeAnnosNoCopy.java b/test/transform/resource/after-ecj/WitherTypeAnnosNoCopy.java
deleted file mode 100644
index 4f0b0710..00000000
--- a/test/transform/resource/after-ecj/WitherTypeAnnosNoCopy.java
+++ /dev/null
@@ -1,16 +0,0 @@
-import lombok.experimental.Wither;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.util.List;
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {
-}
-class WitherTypeAnnos {
-  final @Wither @TA List<@TA String> foo;
-  WitherTypeAnnos(@TA List<@TA String> foo) {
-    super();
-    this.foo = foo;
-  }
-  public @java.lang.SuppressWarnings("all") WitherTypeAnnos withFoo(final List<String> foo) {
-    return ((this.foo == foo) ? this : new WitherTypeAnnos(foo));
-  }
-}