From af55bd0a328aa05f3ffb53a57a37306d1372a478 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 4 Sep 2018 01:53:30 +0200 Subject: [wip] Random fixes to various tests that are failing, especially against Java7. --- .../resource/after-delombok/BuilderSingularToBuilderWithNull.java | 2 +- test/transform/resource/after-delombok/BuilderWithToBuilder.java | 2 +- test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java index 1f472438..b0563858 100644 --- a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java +++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java @@ -58,6 +58,6 @@ class BuilderSingularToBuilderWithNull { } @java.lang.SuppressWarnings("all") public BuilderSingularToBuilderWithNullBuilder toBuilder() { - return new BuilderSingularToBuilderWithNullBuilder().elems(this.elems == null ? java.util.Collections.emptyList() : this.elems); + return new BuilderSingularToBuilderWithNullBuilder().elems(this.elems == null ? java.util.Collections.emptyList() : this.elems); } } diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java index b644a16f..8615a40b 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java +++ b/test/transform/resource/after-delombok/BuilderWithToBuilder.java @@ -86,7 +86,7 @@ class BuilderWithToBuilder { } @java.lang.SuppressWarnings("all") public BuilderWithToBuilderBuilder toBuilder() { - return new BuilderWithToBuilderBuilder().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars == null ? java.util.Collections.emptyList() : this.bars); + return new BuilderWithToBuilderBuilder().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars == null ? java.util.Collections.emptyList() : this.bars); } } class ConstructorWithToBuilder { diff --git a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java index 7265e17a..7feff6e9 100644 --- a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java +++ b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java @@ -52,6 +52,6 @@ import lombok.Singular; return new BuilderSingularToBuilderWithNullBuilder(); } public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder toBuilder() { - return new BuilderSingularToBuilderWithNullBuilder().elems(((this.elems == null) ? java.util.Collections.emptyList() : this.elems)); + return new BuilderSingularToBuilderWithNullBuilder().elems(((this.elems == null) ? java.util.Collections.emptyList() : this.elems)); } } -- cgit From a39ef3ba0cae1fd6038c4407ec7e66f9bf0f5ea2 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 4 Sep 2018 01:53:07 +0200 Subject: [issue #1851] Lombok needs to generate type-use annotations when copying over types from, say, a field, to getter/setter/constructor/builder/wither/etc. --- .../resource/after-delombok/TypeUseAnnotations.java | 14 ++++++++++++++ test/transform/resource/after-ecj/TypeUseAnnotations.java | 15 +++++++++++++++ test/transform/resource/before/TypeUseAnnotations.java | 11 +++++++++++ 3 files changed, 40 insertions(+) create mode 100644 test/transform/resource/after-delombok/TypeUseAnnotations.java create mode 100644 test/transform/resource/after-ecj/TypeUseAnnotations.java create mode 100644 test/transform/resource/before/TypeUseAnnotations.java (limited to 'test') diff --git a/test/transform/resource/after-delombok/TypeUseAnnotations.java b/test/transform/resource/after-delombok/TypeUseAnnotations.java new file mode 100644 index 00000000..1e1536bf --- /dev/null +++ b/test/transform/resource/after-delombok/TypeUseAnnotations.java @@ -0,0 +1,14 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { + int x(); +} +class TypeUseAnnotations { + List<@TA(x = 5) String> foo; + @java.lang.SuppressWarnings("all") + public List<@TA(x = 5) String> getFoo() { + return this.foo; + } +} diff --git a/test/transform/resource/after-ecj/TypeUseAnnotations.java b/test/transform/resource/after-ecj/TypeUseAnnotations.java new file mode 100644 index 00000000..156643b9 --- /dev/null +++ b/test/transform/resource/after-ecj/TypeUseAnnotations.java @@ -0,0 +1,15 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { + int x(); +} +class TypeUseAnnotations { + @lombok.Getter List<@TA(x = 5) String> foo; + TypeUseAnnotations() { + super(); + } + public @java.lang.SuppressWarnings("all") List<@TA(x = 5) String> getFoo() { + return this.foo; + } +} \ No newline at end of file diff --git a/test/transform/resource/before/TypeUseAnnotations.java b/test/transform/resource/before/TypeUseAnnotations.java new file mode 100644 index 00000000..c09a291d --- /dev/null +++ b/test/transform/resource/before/TypeUseAnnotations.java @@ -0,0 +1,11 @@ +//version 8: +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { + int x(); +} +class TypeUseAnnotations { + @lombok.Getter List<@TA(x=5) String> foo; +} -- cgit From 6a42bccb9730b7072b1219a03642074ab96fbe61 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 10 Sep 2018 22:24:06 +0200 Subject: toBuilder() with singular should force the typeargs on the Collections.emptyList call. --- test/transform/resource/after-ecj/BuilderWithToBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilder.java b/test/transform/resource/after-ecj/BuilderWithToBuilder.java index b9cc27dd..a8935107 100644 --- a/test/transform/resource/after-ecj/BuilderWithToBuilder.java +++ b/test/transform/resource/after-ecj/BuilderWithToBuilder.java @@ -74,7 +74,7 @@ import lombok.Builder; return new BuilderWithToBuilderBuilder(); } public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder toBuilder() { - return new BuilderWithToBuilderBuilder().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(((this.bars == null) ? java.util.Collections.emptyList() : this.bars)); + return new BuilderWithToBuilderBuilder().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(((this.bars == null) ? java.util.Collections.emptyList() : this.bars)); } } @lombok.experimental.Accessors(prefix = "m") class ConstructorWithToBuilder { -- cgit