Merge remote-tracking branch 'rzwitserloot/master'

13 files changed, 106 insertions, 12 deletions

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<T, U extends Inter<T, U>> {}
+
+	@Builder @Value public static class Test<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
+		Foo foo;
+		Bar bar;
+	}
+}
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;
-}
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<T> extends Bar implements EqualsAndHashCodeNestedShadow.Foo {
+		}
+	}
+}
\ No newline at end of file
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/GeneratedGlobalOff.java b/test/transform/resource/before/GeneratedOff.java
index 89dcff62..7d62991b 100644
--- a/test/transform/resource/before/GeneratedGlobalOff.java
+++ b/test/transform/resource/before/GeneratedOff.java
@@ -1,5 +1,5 @@
 //CONF: lombok.addGeneratedAnnotation = false
-class GeneratedGlobalOff {
+class GeneratedOff {
 	@lombok.Getter
 	int x;
 }
diff --git a/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java b/test/transform/resource/before/GeneratedOffJavaxOn.java
index dc7e9d8a..a3547913 100644
--- a/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java
+++ b/test/transform/resource/before/GeneratedOffJavaxOn.java
@@ -1,6 +1,6 @@
 //CONF: lombok.addGeneratedAnnotation = false
 //CONF: lombok.addJavaxGeneratedAnnotation = true
-class GeneratedGlobalOffJavaxOn {
+class GeneratedOffJavaxOn {
 	@lombok.Getter
 	int x;
 }
diff --git a/test/transform/resource/before/GeneratedGlobalOffLombokOn.java b/test/transform/resource/before/GeneratedOffLombokOn.java
index 39e80f7e..9d122306 100644
--- a/test/transform/resource/before/GeneratedGlobalOffLombokOn.java
+++ b/test/transform/resource/before/GeneratedOffLombokOn.java
@@ -1,6 +1,6 @@
 //CONF: lombok.addGeneratedAnnotation = false
 //CONF: lombok.addLombokGeneratedAnnotation = true
-class GeneratedGlobalOffLombokOn {
+class GeneratedOffLombokOn {
 	@lombok.Getter
 	int x;
 }
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;
+}