From cc8370ab2d7b3ca15023364c99e53735e62e13d7 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Tue, 4 Sep 2018 01:47:59 +0200
Subject: code review and fixes for the ‘copyable annotations’ setting concept.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/after-ecj/BuilderTypeAnnos.java       | 33 ++++++++++++++++++++++
 .../resource/after-ecj/BuilderTypeAnnosCopy.java   | 31 --------------------
 .../resource/after-ecj/BuilderTypeAnnosNoCopy.java | 31 --------------------
 .../resource/after-ecj/ConstructorsTypeAnnos.java  | 14 +++++++++
 .../after-ecj/ConstructorsTypeAnnosCopy.java       | 12 --------
 .../after-ecj/ConstructorsTypeAnnosNoCopy.java     | 12 --------
 .../resource/after-ecj/GetterTypeAnnos.java        | 17 +++++++++++
 .../resource/after-ecj/GetterTypeAnnosCopy.java    | 15 ----------
 .../resource/after-ecj/GetterTypeAnnosNoCopy.java  | 15 ----------
 .../resource/after-ecj/SetterTypeAnnos.java        | 17 +++++++++++
 .../resource/after-ecj/SetterTypeAnnosCopy.java    | 15 ----------
 .../resource/after-ecj/SetterTypeAnnosNoCopy.java  | 15 ----------
 .../resource/after-ecj/WitherTypeAnnos.java        | 18 ++++++++++++
 .../resource/after-ecj/WitherTypeAnnosCopy.java    | 16 -----------
 .../resource/after-ecj/WitherTypeAnnosNoCopy.java  | 16 -----------
 15 files changed, 99 insertions(+), 178 deletions(-)
 create mode 100644 test/transform/resource/after-ecj/BuilderTypeAnnos.java
 delete mode 100644 test/transform/resource/after-ecj/BuilderTypeAnnosCopy.java
 delete mode 100644 test/transform/resource/after-ecj/BuilderTypeAnnosNoCopy.java
 create mode 100644 test/transform/resource/after-ecj/ConstructorsTypeAnnos.java
 delete mode 100644 test/transform/resource/after-ecj/ConstructorsTypeAnnosCopy.java
 delete mode 100644 test/transform/resource/after-ecj/ConstructorsTypeAnnosNoCopy.java
 create mode 100644 test/transform/resource/after-ecj/GetterTypeAnnos.java
 delete mode 100644 test/transform/resource/after-ecj/GetterTypeAnnosCopy.java
 delete mode 100644 test/transform/resource/after-ecj/GetterTypeAnnosNoCopy.java
 create mode 100644 test/transform/resource/after-ecj/SetterTypeAnnos.java
 delete mode 100644 test/transform/resource/after-ecj/SetterTypeAnnosCopy.java
 delete mode 100644 test/transform/resource/after-ecj/SetterTypeAnnosNoCopy.java
 create mode 100644 test/transform/resource/after-ecj/WitherTypeAnnos.java
 delete mode 100644 test/transform/resource/after-ecj/WitherTypeAnnosCopy.java
 delete mode 100644 test/transform/resource/after-ecj/WitherTypeAnnosNoCopy.java

(limited to 'test/transform/resource/after-ecj')

diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnos.java b/test/transform/resource/after-ecj/BuilderTypeAnnos.java
new file mode 100644
index 00000000..1c310f38
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderTypeAnnos.java
@@ -0,0 +1,33 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.List;
+@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 {
+    private @java.lang.SuppressWarnings("all") List<String> foo;
+    @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder foo(final @TA 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 @TB List<String> foo;
+  @java.lang.SuppressWarnings("all") BuilderTypeAnnos(final @TA 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/BuilderTypeAnnosCopy.java b/test/transform/resource/after-ecj/BuilderTypeAnnosCopy.java
deleted file mode 100644
index 8dfc8164..00000000
--- a/test/transform/resource/after-ecj/BuilderTypeAnnosCopy.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 @TA 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 @TA 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/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/ConstructorsTypeAnnos.java b/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java
new file mode 100644
index 00000000..3491239f
--- /dev/null
+++ b/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java
@@ -0,0 +1,14 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.List;
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TA {
+}
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB {
+}
+@lombok.AllArgsConstructor class ConstructorsTypeAnnos {
+  @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/ConstructorsTypeAnnosCopy.java b/test/transform/resource/after-ecj/ConstructorsTypeAnnosCopy.java
deleted file mode 100644
index ad372fc9..00000000
--- a/test/transform/resource/after-ecj/ConstructorsTypeAnnosCopy.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 @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/GetterTypeAnnos.java b/test/transform/resource/after-ecj/GetterTypeAnnos.java
new file mode 100644
index 00000000..9ffc7f1c
--- /dev/null
+++ b/test/transform/resource/after-ecj/GetterTypeAnnos.java
@@ -0,0 +1,17 @@
+import lombok.Getter;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.List;
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TA {
+}
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB {
+}
+class GetterTypeAnnos {
+  @Getter @TA @TB List<String> foo;
+  GetterTypeAnnos() {
+    super();
+  }
+  public @TA @java.lang.SuppressWarnings("all") List<String> getFoo() {
+    return this.foo;
+  }
+}
diff --git a/test/transform/resource/after-ecj/GetterTypeAnnosCopy.java b/test/transform/resource/after-ecj/GetterTypeAnnosCopy.java
deleted file mode 100644
index 1b4f03c5..00000000
--- a/test/transform/resource/after-ecj/GetterTypeAnnosCopy.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 @TA @java.lang.SuppressWarnings("all") List<String> getFoo() {
-    return this.foo;
-  }
-}
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/SetterTypeAnnos.java b/test/transform/resource/after-ecj/SetterTypeAnnos.java
new file mode 100644
index 00000000..860694ea
--- /dev/null
+++ b/test/transform/resource/after-ecj/SetterTypeAnnos.java
@@ -0,0 +1,17 @@
+import lombok.Setter;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.List;
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TA {
+}
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB {
+}
+class SetterTypeAnnos {
+  @Setter @TA @TB List<String> foo;
+  SetterTypeAnnos() {
+    super();
+  }
+  public @java.lang.SuppressWarnings("all") void setFoo(final @TA List<String> foo) {
+    this.foo = foo;
+  }
+}
diff --git a/test/transform/resource/after-ecj/SetterTypeAnnosCopy.java b/test/transform/resource/after-ecj/SetterTypeAnnosCopy.java
deleted file mode 100644
index ef290cbf..00000000
--- a/test/transform/resource/after-ecj/SetterTypeAnnosCopy.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 @TA List<String> foo) {
-    this.foo = foo;
-  }
-}
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/WitherTypeAnnos.java b/test/transform/resource/after-ecj/WitherTypeAnnos.java
new file mode 100644
index 00000000..e41d9e13
--- /dev/null
+++ b/test/transform/resource/after-ecj/WitherTypeAnnos.java
@@ -0,0 +1,18 @@
+import lombok.experimental.Wither;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.List;
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TA {
+}
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB {
+}
+class WitherTypeAnnos {
+  final @Wither @TA @TB List<String> foo;
+  WitherTypeAnnos(@TA @TB List<String> foo) {
+    super();
+    this.foo = foo;
+  }
+  public @java.lang.SuppressWarnings("all") WitherTypeAnnos withFoo(final @TA List<String> foo) {
+    return ((this.foo == foo) ? this : new WitherTypeAnnos(foo));
+  }
+}
diff --git a/test/transform/resource/after-ecj/WitherTypeAnnosCopy.java b/test/transform/resource/after-ecj/WitherTypeAnnosCopy.java
deleted file mode 100644
index b4f3c687..00000000
--- a/test/transform/resource/after-ecj/WitherTypeAnnosCopy.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 @TA List<String> foo) {
-    return ((this.foo == foo) ? this : new WitherTypeAnnos(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));
-  }
-}
-- 
cgit