From 70f77f928ac7a6edf3ef91a41399c9a79561c871 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Thu, 9 Feb 2017 22:45:45 +0100 Subject: [i1014] Only add lombok.Generated if it is explicitly turned on --- test/transform/resource/before/GeneratedGlobalOff.java | 5 ----- test/transform/resource/before/GeneratedGlobalOffJavaxOn.java | 6 ------ test/transform/resource/before/GeneratedGlobalOffLombokOn.java | 6 ------ test/transform/resource/before/GeneratedJavaxOnLombokOn.java | 6 ++++++ test/transform/resource/before/GeneratedLombokOff.java | 5 ----- test/transform/resource/before/GeneratedOff.java | 5 +++++ test/transform/resource/before/GeneratedOffJavaxOn.java | 6 ++++++ test/transform/resource/before/GeneratedOffLombokOn.java | 6 ++++++ 8 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 test/transform/resource/before/GeneratedGlobalOff.java delete mode 100644 test/transform/resource/before/GeneratedGlobalOffJavaxOn.java delete mode 100644 test/transform/resource/before/GeneratedGlobalOffLombokOn.java create mode 100644 test/transform/resource/before/GeneratedJavaxOnLombokOn.java delete mode 100644 test/transform/resource/before/GeneratedLombokOff.java create mode 100644 test/transform/resource/before/GeneratedOff.java create mode 100644 test/transform/resource/before/GeneratedOffJavaxOn.java create mode 100644 test/transform/resource/before/GeneratedOffLombokOn.java (limited to 'test/transform/resource/before') diff --git a/test/transform/resource/before/GeneratedGlobalOff.java b/test/transform/resource/before/GeneratedGlobalOff.java deleted file mode 100644 index 89dcff62..00000000 --- a/test/transform/resource/before/GeneratedGlobalOff.java +++ /dev/null @@ -1,5 +0,0 @@ -//CONF: lombok.addGeneratedAnnotation = false -class GeneratedGlobalOff { - @lombok.Getter - int x; -} diff --git a/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java b/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java deleted file mode 100644 index dc7e9d8a..00000000 --- a/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java +++ /dev/null @@ -1,6 +0,0 @@ -//CONF: lombok.addGeneratedAnnotation = false -//CONF: lombok.addJavaxGeneratedAnnotation = true -class GeneratedGlobalOffJavaxOn { - @lombok.Getter - int x; -} diff --git a/test/transform/resource/before/GeneratedGlobalOffLombokOn.java b/test/transform/resource/before/GeneratedGlobalOffLombokOn.java deleted file mode 100644 index 39e80f7e..00000000 --- a/test/transform/resource/before/GeneratedGlobalOffLombokOn.java +++ /dev/null @@ -1,6 +0,0 @@ -//CONF: lombok.addGeneratedAnnotation = false -//CONF: lombok.addLombokGeneratedAnnotation = true -class GeneratedGlobalOffLombokOn { - @lombok.Getter - int x; -} diff --git a/test/transform/resource/before/GeneratedJavaxOnLombokOn.java b/test/transform/resource/before/GeneratedJavaxOnLombokOn.java new file mode 100644 index 00000000..cee391ad --- /dev/null +++ b/test/transform/resource/before/GeneratedJavaxOnLombokOn.java @@ -0,0 +1,6 @@ +//CONF: lombok.addJavaxGeneratedAnnotation = true +//CONF: lombok.addLombokGeneratedAnnotation = true +class GeneratedJavaxOnLombokOn { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedLombokOff.java b/test/transform/resource/before/GeneratedLombokOff.java deleted file mode 100644 index 53fcc462..00000000 --- a/test/transform/resource/before/GeneratedLombokOff.java +++ /dev/null @@ -1,5 +0,0 @@ -//CONF: lombok.addLombokGeneratedAnnotation = false -class GeneratedLombokOff { - @lombok.Getter - int x; -} diff --git a/test/transform/resource/before/GeneratedOff.java b/test/transform/resource/before/GeneratedOff.java new file mode 100644 index 00000000..7d62991b --- /dev/null +++ b/test/transform/resource/before/GeneratedOff.java @@ -0,0 +1,5 @@ +//CONF: lombok.addGeneratedAnnotation = false +class GeneratedOff { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedOffJavaxOn.java b/test/transform/resource/before/GeneratedOffJavaxOn.java new file mode 100644 index 00000000..a3547913 --- /dev/null +++ b/test/transform/resource/before/GeneratedOffJavaxOn.java @@ -0,0 +1,6 @@ +//CONF: lombok.addGeneratedAnnotation = false +//CONF: lombok.addJavaxGeneratedAnnotation = true +class GeneratedOffJavaxOn { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedOffLombokOn.java b/test/transform/resource/before/GeneratedOffLombokOn.java new file mode 100644 index 00000000..9d122306 --- /dev/null +++ b/test/transform/resource/before/GeneratedOffLombokOn.java @@ -0,0 +1,6 @@ +//CONF: lombok.addGeneratedAnnotation = false +//CONF: lombok.addLombokGeneratedAnnotation = true +class GeneratedOffLombokOn { + @lombok.Getter + int x; +} -- cgit From 2335512c8e134a1f6a7a567948543bf87613544b Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Fri, 10 Feb 2017 00:10:07 +0100 Subject: [i1274] Add outer name to type name for nested types in equals. --- .../resource/before/EqualsAndHashCodeNestedShadow.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 test/transform/resource/before/EqualsAndHashCodeNestedShadow.java (limited to 'test/transform/resource/before') diff --git a/test/transform/resource/before/EqualsAndHashCodeNestedShadow.java b/test/transform/resource/before/EqualsAndHashCodeNestedShadow.java new file mode 100644 index 00000000..2b0c4fa3 --- /dev/null +++ b/test/transform/resource/before/EqualsAndHashCodeNestedShadow.java @@ -0,0 +1,15 @@ +interface EqualsAndHashCodeNestedShadow { + interface Foo { + } + class Bar { + @lombok.EqualsAndHashCode(callSuper=false) + public static class Foo extends Bar implements EqualsAndHashCodeNestedShadow.Foo { + } + } + + class Baz { + @lombok.EqualsAndHashCode(callSuper=false) + public static class Foo extends Bar implements EqualsAndHashCodeNestedShadow.Foo { + } + } +} \ No newline at end of file -- cgit From 74603cd9d355353f5373deb167988c5eaf015346 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Thu, 16 Feb 2017 23:32:17 +0100 Subject: Fixing issue #1298: `@Builder` with recursive generics didn’t work in javac/delombok. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/before/BuilderWithRecursiveGenerics.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 test/transform/resource/before/BuilderWithRecursiveGenerics.java (limited to 'test/transform/resource/before') diff --git a/test/transform/resource/before/BuilderWithRecursiveGenerics.java b/test/transform/resource/before/BuilderWithRecursiveGenerics.java new file mode 100644 index 00000000..041da414 --- /dev/null +++ b/test/transform/resource/before/BuilderWithRecursiveGenerics.java @@ -0,0 +1,13 @@ +//issue #1298 +import java.util.Set; +import lombok.Builder; +import lombok.Value; + +public class BuilderWithRecursiveGenerics { + interface Inter> {} + + @Builder @Value public static class Test, Quz extends Inter> { + Foo foo; + Bar bar; + } +} -- cgit From d05d03743316e45abfd0d00397999d7eb959eb64 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 6 Mar 2017 23:34:23 +0100 Subject: Fixed issue #778: problems with onX if the annotation to be added has named args. --- .../resource/before/GetterOnMethodErrors2.java | 1 + test/transform/resource/before/OnXJava7Style.java | 16 ++++++++++++++++ test/transform/resource/before/OnXJava7StyleOn8.java | 18 ++++++++++++++++++ test/transform/resource/before/OnXJava8Style.java | 16 ++++++++++++++++ test/transform/resource/before/OnXJava8StyleOn7.java | 18 ++++++++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 test/transform/resource/before/OnXJava7Style.java create mode 100644 test/transform/resource/before/OnXJava7StyleOn8.java create mode 100644 test/transform/resource/before/OnXJava8Style.java create mode 100644 test/transform/resource/before/OnXJava8StyleOn7.java (limited to 'test/transform/resource/before') diff --git a/test/transform/resource/before/GetterOnMethodErrors2.java b/test/transform/resource/before/GetterOnMethodErrors2.java index 2fd98c83..08ef13c6 100644 --- a/test/transform/resource/before/GetterOnMethodErrors2.java +++ b/test/transform/resource/before/GetterOnMethodErrors2.java @@ -1,3 +1,4 @@ +//version 8: class GetterOnMethodErrors2 { @lombok.Getter(onMethod=@_A_(@Deprecated)) private int bad1; @lombok.Getter(onMethod=@__(5)) private int bad2; diff --git a/test/transform/resource/before/OnXJava7Style.java b/test/transform/resource/before/OnXJava7Style.java new file mode 100644 index 00000000..6a3c35ff --- /dev/null +++ b/test/transform/resource/before/OnXJava7Style.java @@ -0,0 +1,16 @@ +//version :7 +public class OnXJava7Style { + @interface Foo { + String value() default ""; + } + + @interface Bar { + String stuff() default ""; + } + + @lombok.Getter(onMethod=@__(@Foo)) String a; + @lombok.Setter(onMethod=@__(@Foo())) String b; + @lombok.Setter(onParam=@__(@Foo("a"))) String c; + @lombok.Setter(onParam=@__(@Bar(stuff="b"))) String d; + @lombok.Getter(onMethod=@__({@Foo(value="c"), @Bar(stuff="d")})) String e; +} diff --git a/test/transform/resource/before/OnXJava7StyleOn8.java b/test/transform/resource/before/OnXJava7StyleOn8.java new file mode 100644 index 00000000..582fe6ce --- /dev/null +++ b/test/transform/resource/before/OnXJava7StyleOn8.java @@ -0,0 +1,18 @@ +//platform ecj +//version 8: + +public class OnXJava7StyleOn8 { + @interface Foo { + String value() default ""; + } + + @interface Bar { + String stuff() default ""; + } + + @lombok.Getter(onMethod=@__(@Foo)) String a; + @lombok.Setter(onMethod=@__(@Foo())) String b; + @lombok.Setter(onParam=@__(@Foo("a"))) String c; + @lombok.Setter(onParam=@__(@Bar(stuff="b"))) String d; + @lombok.Getter(onMethod=@__({@Foo(value="c"), @Bar(stuff="d")})) String e; +} diff --git a/test/transform/resource/before/OnXJava8Style.java b/test/transform/resource/before/OnXJava8Style.java new file mode 100644 index 00000000..ffb91727 --- /dev/null +++ b/test/transform/resource/before/OnXJava8Style.java @@ -0,0 +1,16 @@ +//version 8: +public class OnXJava8Style { + @interface Foo { + String value() default ""; + } + + @interface Bar { + String stuff() default ""; + } + + @lombok.Getter(onMethod_=@Foo) String a; + @lombok.Setter(onMethod_=@Foo()) String b; + @lombok.Setter(onParam_=@Foo("a")) String c; + @lombok.Setter(onParam_=@Bar(stuff="b")) String d; + @lombok.Getter(onMethod_={@Foo(value="c"), @Bar(stuff="d")}) String e; +} diff --git a/test/transform/resource/before/OnXJava8StyleOn7.java b/test/transform/resource/before/OnXJava8StyleOn7.java new file mode 100644 index 00000000..c006e468 --- /dev/null +++ b/test/transform/resource/before/OnXJava8StyleOn7.java @@ -0,0 +1,18 @@ +//platform ecj +//version :7 + +public class OnXJava8StyleOn7 { + @interface Foo { + String value() default ""; + } + + @interface Bar { + String stuff() default ""; + } + + @lombok.Getter(onMethod_=@Foo) String a; + @lombok.Setter(onMethod_=@Foo()) String b; + @lombok.Setter(onParam_=@Foo("a")) String c; + @lombok.Setter(onParam_=@Bar(stuff="b")) String d; + @lombok.Getter(onMethod_={@Foo(value="c"), @Bar(stuff="d")}) String e; +} -- cgit From a2c10c70fa8e2c8736464a5c3d445e2ca6e8a296 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 7 Mar 2017 01:10:18 +0100 Subject: removed the suppressConstructorProperties param. --- test/transform/resource/before/ConstructorsConfiguration.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'test/transform/resource/before') diff --git a/test/transform/resource/before/ConstructorsConfiguration.java b/test/transform/resource/before/ConstructorsConfiguration.java index 8fae10fc..4d0e8bd9 100644 --- a/test/transform/resource/before/ConstructorsConfiguration.java +++ b/test/transform/resource/before/ConstructorsConfiguration.java @@ -3,7 +3,3 @@ class ConstructorsConfiguration { int x; } -@lombok.AllArgsConstructor(suppressConstructorProperties=false) -class ConstructorsConfigurationExplicit { - int x; -} -- cgit