From cc8370ab2d7b3ca15023364c99e53735e62e13d7 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot 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-delombok/BuilderTypeAnnos.java | 45 +++++++++++++++++++ .../after-delombok/BuilderTypeAnnosCopy.java | 51 ---------------------- .../after-delombok/BuilderTypeAnnosNoCopy.java | 51 ---------------------- .../after-delombok/ConstructorsTypeAnnos.java | 18 ++++++++ .../after-delombok/ConstructorsTypeAnnosCopy.java | 17 -------- .../ConstructorsTypeAnnosNoCopy.java | 17 -------- .../resource/after-delombok/GetterTypeAnnos.java | 19 ++++++++ .../after-delombok/GetterTypeAnnosCopy.java | 18 -------- .../after-delombok/GetterTypeAnnosNoCopy.java | 17 -------- .../resource/after-delombok/SetterTypeAnnos.java | 18 ++++++++ .../after-delombok/SetterTypeAnnosCopy.java | 17 -------- .../after-delombok/SetterTypeAnnosNoCopy.java | 17 -------- .../resource/after-delombok/WitherTypeAnnos.java | 21 +++++++++ .../after-delombok/WitherTypeAnnosCopy.java | 21 --------- .../after-delombok/WitherTypeAnnosNoCopy.java | 21 --------- 15 files changed, 121 insertions(+), 247 deletions(-) create mode 100644 test/transform/resource/after-delombok/BuilderTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/BuilderTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-delombok/BuilderTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/ConstructorsTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/ConstructorsTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-delombok/ConstructorsTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/GetterTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/GetterTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-delombok/GetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/SetterTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/SetterTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-delombok/SetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/WitherTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/WitherTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-delombok/WitherTypeAnnosNoCopy.java (limited to 'test/transform/resource/after-delombok') diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnos.java b/test/transform/resource/after-delombok/BuilderTypeAnnos.java new file mode 100644 index 00000000..8a31762a --- /dev/null +++ b/test/transform/resource/after-delombok/BuilderTypeAnnos.java @@ -0,0 +1,45 @@ +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 BuilderTypeAnnos { + @TA + @TB + private List foo; + @java.lang.SuppressWarnings("all") + BuilderTypeAnnos(@TA final List foo) { + this.foo = foo; + } + @java.lang.SuppressWarnings("all") + public static class BuilderTypeAnnosBuilder { + @java.lang.SuppressWarnings("all") + private List foo; + @java.lang.SuppressWarnings("all") + BuilderTypeAnnosBuilder() { + } + @java.lang.SuppressWarnings("all") + public BuilderTypeAnnosBuilder foo(@TA final List foo) { + this.foo = foo; + return this; + } + @java.lang.SuppressWarnings("all") + public BuilderTypeAnnos build() { + return new BuilderTypeAnnos(foo); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo + ")"; + } + } + @java.lang.SuppressWarnings("all") + public static BuilderTypeAnnosBuilder builder() { + return new BuilderTypeAnnosBuilder(); + } +} + diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosCopy.java b/test/transform/resource/after-delombok/BuilderTypeAnnosCopy.java deleted file mode 100644 index 8b0ea537..00000000 --- a/test/transform/resource/after-delombok/BuilderTypeAnnosCopy.java +++ /dev/null @@ -1,51 +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 { -} - -class BuilderTypeAnnos { - @TA - private List<@TA String> foo; - - @java.lang.SuppressWarnings("all") - BuilderTypeAnnos(@TA final List<@TA String> foo) { - this.foo = foo; - } - - - @java.lang.SuppressWarnings("all") - public static class BuilderTypeAnnosBuilder { - @java.lang.SuppressWarnings("all") - private List<@TA String> foo; - - @java.lang.SuppressWarnings("all") - BuilderTypeAnnosBuilder() { - } - - @java.lang.SuppressWarnings("all") - public BuilderTypeAnnosBuilder foo(@TA final List<@TA String> foo) { - this.foo = foo; - return this; - } - - @java.lang.SuppressWarnings("all") - public BuilderTypeAnnos build() { - return new BuilderTypeAnnos(foo); - } - - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo + ")"; - } - } - - @java.lang.SuppressWarnings("all") - public static BuilderTypeAnnosBuilder builder() { - return new BuilderTypeAnnosBuilder(); - } -} - diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosNoCopy.java b/test/transform/resource/after-delombok/BuilderTypeAnnosNoCopy.java deleted file mode 100644 index b08e03a3..00000000 --- a/test/transform/resource/after-delombok/BuilderTypeAnnosNoCopy.java +++ /dev/null @@ -1,51 +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 { -} - -class BuilderTypeAnnos { - @TA - private List<@TA String> foo; - - @java.lang.SuppressWarnings("all") - BuilderTypeAnnos(final List<@TA String> foo) { - this.foo = foo; - } - - - @java.lang.SuppressWarnings("all") - public static class BuilderTypeAnnosBuilder { - @java.lang.SuppressWarnings("all") - private List<@TA String> foo; - - @java.lang.SuppressWarnings("all") - BuilderTypeAnnosBuilder() { - } - - @java.lang.SuppressWarnings("all") - public BuilderTypeAnnosBuilder foo(final List<@TA String> foo) { - this.foo = foo; - return this; - } - - @java.lang.SuppressWarnings("all") - public BuilderTypeAnnos build() { - return new BuilderTypeAnnos(foo); - } - - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo + ")"; - } - } - - @java.lang.SuppressWarnings("all") - public static BuilderTypeAnnosBuilder builder() { - return new BuilderTypeAnnosBuilder(); - } -} - diff --git a/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java b/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java new file mode 100644 index 00000000..2d59681c --- /dev/null +++ b/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java @@ -0,0 +1,18 @@ +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 ConstructorsTypeAnnos { + @TA + @TB + List foo; + @java.lang.SuppressWarnings("all") + public ConstructorsTypeAnnos(@TA final List foo) { + this.foo = foo; + } +} diff --git a/test/transform/resource/after-delombok/ConstructorsTypeAnnosCopy.java b/test/transform/resource/after-delombok/ConstructorsTypeAnnosCopy.java deleted file mode 100644 index 28d6ed09..00000000 --- a/test/transform/resource/after-delombok/ConstructorsTypeAnnosCopy.java +++ /dev/null @@ -1,17 +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 { -} - -class ConstructorsTypeAnnos { - @TA - List<@TA String> foo; - - @java.lang.SuppressWarnings("all") - public ConstructorsTypeAnnos(@TA final List<@TA String> foo) { - this.foo = foo; - } -} diff --git a/test/transform/resource/after-delombok/ConstructorsTypeAnnosNoCopy.java b/test/transform/resource/after-delombok/ConstructorsTypeAnnosNoCopy.java deleted file mode 100644 index e27131ef..00000000 --- a/test/transform/resource/after-delombok/ConstructorsTypeAnnosNoCopy.java +++ /dev/null @@ -1,17 +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 { -} - -class ConstructorsTypeAnnos { - @TA - List<@TA String> foo; - - @java.lang.SuppressWarnings("all") - public ConstructorsTypeAnnos(final List<@TA String> foo) { - this.foo = foo; - } -} diff --git a/test/transform/resource/after-delombok/GetterTypeAnnos.java b/test/transform/resource/after-delombok/GetterTypeAnnos.java new file mode 100644 index 00000000..4a22c822 --- /dev/null +++ b/test/transform/resource/after-delombok/GetterTypeAnnos.java @@ -0,0 +1,19 @@ +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 { + @TA + @TB + List foo; + @TA + @java.lang.SuppressWarnings("all") + public List getFoo() { + return this.foo; + } +} diff --git a/test/transform/resource/after-delombok/GetterTypeAnnosCopy.java b/test/transform/resource/after-delombok/GetterTypeAnnosCopy.java deleted file mode 100644 index cde6cbdd..00000000 --- a/test/transform/resource/after-delombok/GetterTypeAnnosCopy.java +++ /dev/null @@ -1,18 +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 { -} - -class GetterTypeAnnos { - @TA - List<@TA String> foo; - - @TA - @java.lang.SuppressWarnings("all") - public List<@TA String> getFoo() { - return this.foo; - } -} diff --git a/test/transform/resource/after-delombok/GetterTypeAnnosNoCopy.java b/test/transform/resource/after-delombok/GetterTypeAnnosNoCopy.java deleted file mode 100644 index 58054de6..00000000 --- a/test/transform/resource/after-delombok/GetterTypeAnnosNoCopy.java +++ /dev/null @@ -1,17 +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 { -} - -class GetterTypeAnnos { - @TA - List<@TA String> foo; - - @java.lang.SuppressWarnings("all") - public List<@TA String> getFoo() { - return this.foo; - } -} diff --git a/test/transform/resource/after-delombok/SetterTypeAnnos.java b/test/transform/resource/after-delombok/SetterTypeAnnos.java new file mode 100644 index 00000000..77ddf9ce --- /dev/null +++ b/test/transform/resource/after-delombok/SetterTypeAnnos.java @@ -0,0 +1,18 @@ +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 { + @TA + @TB + List foo; + @java.lang.SuppressWarnings("all") + public void setFoo(@TA final List foo) { + this.foo = foo; + } +} diff --git a/test/transform/resource/after-delombok/SetterTypeAnnosCopy.java b/test/transform/resource/after-delombok/SetterTypeAnnosCopy.java deleted file mode 100644 index b45c3234..00000000 --- a/test/transform/resource/after-delombok/SetterTypeAnnosCopy.java +++ /dev/null @@ -1,17 +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 { -} - -class SetterTypeAnnos { - @TA - List<@TA String> foo; - - @java.lang.SuppressWarnings("all") - public void setFoo(@TA final List<@TA String> foo) { - this.foo = foo; - } -} diff --git a/test/transform/resource/after-delombok/SetterTypeAnnosNoCopy.java b/test/transform/resource/after-delombok/SetterTypeAnnosNoCopy.java deleted file mode 100644 index e773bd9c..00000000 --- a/test/transform/resource/after-delombok/SetterTypeAnnosNoCopy.java +++ /dev/null @@ -1,17 +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 { -} - -class SetterTypeAnnos { - @TA - List<@TA String> foo; - - @java.lang.SuppressWarnings("all") - public void setFoo(final List<@TA String> foo) { - this.foo = foo; - } -} diff --git a/test/transform/resource/after-delombok/WitherTypeAnnos.java b/test/transform/resource/after-delombok/WitherTypeAnnos.java new file mode 100644 index 00000000..b57438af --- /dev/null +++ b/test/transform/resource/after-delombok/WitherTypeAnnos.java @@ -0,0 +1,21 @@ +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 { + @TA + @TB + final List foo; + WitherTypeAnnos(@TA @TB List foo) { + this.foo = foo; + } + @java.lang.SuppressWarnings("all") + public WitherTypeAnnos withFoo(@TA final List foo) { + return this.foo == foo ? this : new WitherTypeAnnos(foo); + } +} diff --git a/test/transform/resource/after-delombok/WitherTypeAnnosCopy.java b/test/transform/resource/after-delombok/WitherTypeAnnosCopy.java deleted file mode 100644 index 8cbb7e5d..00000000 --- a/test/transform/resource/after-delombok/WitherTypeAnnosCopy.java +++ /dev/null @@ -1,21 +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 { -} - -class WitherTypeAnnos { - @TA - final List<@TA String> foo; - - WitherTypeAnnos(@TA List<@TA String> foo) { - this.foo = foo; - } - - @java.lang.SuppressWarnings("all") - public WitherTypeAnnos withFoo(@TA final List<@TA String> foo) { - return this.foo == foo ? this : new WitherTypeAnnos(foo); - } -} diff --git a/test/transform/resource/after-delombok/WitherTypeAnnosNoCopy.java b/test/transform/resource/after-delombok/WitherTypeAnnosNoCopy.java deleted file mode 100644 index 18c25e04..00000000 --- a/test/transform/resource/after-delombok/WitherTypeAnnosNoCopy.java +++ /dev/null @@ -1,21 +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 { -} - -class WitherTypeAnnos { - @TA - final List<@TA String> foo; - - WitherTypeAnnos(@TA List<@TA String> foo) { - this.foo = foo; - } - - @java.lang.SuppressWarnings("all") - public WitherTypeAnnos withFoo(final List<@TA String> foo) { - return this.foo == foo ? this : new WitherTypeAnnos(foo); - } -} -- cgit