Merge branch 'master' into extensionmethod

Conflicts:
	build.xml

23 files changed, 248 insertions, 9 deletions

diff --git a/test/transform/resource/before/BuilderConstructorJavadoc.java b/test/transform/resource/before/BuilderConstructorJavadoc.java
new file mode 100644
index 00000000..ebbd473f
--- /dev/null
+++ b/test/transform/resource/before/BuilderConstructorJavadoc.java
@@ -0,0 +1,35 @@
+import java.util.List;
+
+class BuilderConstructorJavadoc<T> {
+	/**
+	 * This is a comment
+	 * 
+	 * @param basic tag is moved to the setter
+	 * @param multiline a param comment
+	 *        can be on multiple lines and can use 
+	 *        {@code @code} or <code>tags</code>
+	 * @param predef don't copy this one
+	 * @param predefWithJavadoc don't copy this one
+	 */
+	@lombok.Builder
+	BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc) {
+		
+	}
+	
+	public static class BuilderConstructorJavadocBuilder<T> {
+		public BuilderConstructorJavadocBuilder<T> predef(final int x) {
+			this.predef = x;
+			return this;
+		}
+
+		/**
+		 * This javadoc remains untouched.
+		 * @param x 1/100 of the thing
+		 * @return the updated builder
+		 */
+		public BuilderConstructorJavadocBuilder<T> predefWithJavadoc(final int x) {
+			this.predefWithJavadoc = x;
+			return this;
+		}
+	}
+}
diff --git a/test/transform/resource/before/CheckerFrameworkSuperBuilder.java b/test/transform/resource/before/CheckerFrameworkSuperBuilder.java
index 54aefb37..ed9e14cb 100644
--- a/test/transform/resource/before/CheckerFrameworkSuperBuilder.java
+++ b/test/transform/resource/before/CheckerFrameworkSuperBuilder.java
@@ -12,7 +12,7 @@ class CheckerFrameworkSuperBuilder {
 	}
 	
 	@lombok.experimental.SuperBuilder
-	public static class Child extends Parent {
+	public static class ZChild extends Parent {
 		@lombok.Builder.Default int a = 1;
 		int b;
 	}
diff --git a/test/transform/resource/before/DelegateAlreadyImplemented.java b/test/transform/resource/before/DelegateAlreadyImplemented.java
new file mode 100644
index 00000000..c43c1949
--- /dev/null
+++ b/test/transform/resource/before/DelegateAlreadyImplemented.java
@@ -0,0 +1,45 @@
+public class DelegateAlreadyImplemented<T> {
+	
+	@lombok.experimental.Delegate
+	private A<Integer, T> a;
+	
+	public void a() {
+	}
+	
+	public void b(java.util.List<String> l) {
+	}
+	
+	public void c(java.util.List<Integer> l, String[] a, Integer... varargs) {
+	}
+	
+	public void d(String[][][][] d) {
+	}
+	
+	public <Y> void e(Y x) {
+	}
+	
+	@SuppressWarnings("unchecked")
+	public void f(T s, java.util.List<T> l, T[] a, T... varargs) {
+	}
+	
+	public void g(Number g) {
+	}
+}
+
+interface A<T, T2> {
+	public void a();
+	
+	public void b(java.util.List<T> l);
+	
+	@SuppressWarnings("unchecked")
+	public void c(java.util.List<T> l, String[] a, T... varargs);
+	
+	public void d(String[][][][] d);
+	
+	public <X> X e(X x);
+	
+	@SuppressWarnings("unchecked")
+	public void f(T2 s, java.util.List<T2> l, T2[] a, T2... varargs);
+	
+	public <G extends Number> void g(G g);
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/DelegateGenerics.java b/test/transform/resource/before/DelegateGenerics.java
new file mode 100644
index 00000000..e89158a9
--- /dev/null
+++ b/test/transform/resource/before/DelegateGenerics.java
@@ -0,0 +1,14 @@
+public class DelegateGenerics<T> {
+	@lombok.experimental.Delegate
+	I1<T> target;
+}
+
+interface I1<T> extends I2<T, Integer, String> {
+}
+interface I2<A, T, I> extends I3<Integer, I, A> {
+}
+interface I3<T, I, A> {
+	public T t(T t);
+	public I i(I a);
+	public A a(A a);
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/DelegateWithVarargs2.java b/test/transform/resource/before/DelegateWithVarargs2.java
new file mode 100644
index 00000000..8a3dbf14
--- /dev/null
+++ b/test/transform/resource/before/DelegateWithVarargs2.java
@@ -0,0 +1,9 @@
+import lombok.experimental.Delegate;
+
+class DelegateWithVarargs2 {
+	@Delegate private DelegateWithVarargs2.B bar;
+
+	public class B {
+		public void varargs(Object[]... keys) {}
+	}
+}
diff --git a/test/transform/resource/before/EqualsAndHashCodeRank.java b/test/transform/resource/before/EqualsAndHashCodeRank.java
new file mode 100644
index 00000000..5dda54f8
--- /dev/null
+++ b/test/transform/resource/before/EqualsAndHashCodeRank.java
@@ -0,0 +1,7 @@
+import lombok.EqualsAndHashCode;
+@EqualsAndHashCode
+public class EqualsAndHashCodeRank {
+	@EqualsAndHashCode.Include int a;
+	@EqualsAndHashCode.Include(rank = 10) int b;
+	@EqualsAndHashCode.Include int c;
+}
diff --git a/test/transform/resource/before/GetterLazyArguments.java b/test/transform/resource/before/GetterLazyArguments.java
new file mode 100644
index 00000000..47dfae55
--- /dev/null
+++ b/test/transform/resource/before/GetterLazyArguments.java
@@ -0,0 +1,21 @@
+// version 8:
+class GetterLazyArguments {
+	static String fun() { return null; }
+	static String stringInt(String arg1, Integer arg2) { return null; }
+	static String stringRunnable(String arg1, Runnable arg2) { return null; }
+	
+	@lombok.Getter(lazy=true)
+	private final String field1 = stringInt(("a"), (1));
+	
+	@lombok.Getter(lazy=true)
+	private final String field2 = stringInt(true ? "a" : "b", true ? 1 : 0);
+	
+	@lombok.Getter(lazy=true)
+	private final String field3 = stringInt(("a"), true ? 1 : 0);
+	
+	@lombok.Getter(lazy=true)
+	private final String field4 = stringRunnable(fun(), () -> { });
+	
+	@lombok.Getter(lazy=true)
+	private final String field5 = stringRunnable(("a"), () -> { });
+}
diff --git a/test/transform/resource/before/JacksonBuilderSingular.java b/test/transform/resource/before/JacksonBuilderSingular.java
new file mode 100644
index 00000000..c179c760
--- /dev/null
+++ b/test/transform/resource/before/JacksonBuilderSingular.java
@@ -0,0 +1,31 @@
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import lombok.Builder;
+import lombok.Singular;
+import lombok.extern.jackson.Jacksonized;
+
+@Jacksonized
+@Builder
+public class JacksonBuilderSingular {
+	@JsonAnySetter
+	@Singular("any")
+	private Map<String, Object> any;
+
+	@JsonProperty("v_a_l_u_e_s")
+	@Singular
+	private List<String> values;
+
+	@JsonAnySetter
+	@Singular("guavaAny")
+	private ImmutableMap<String, Object> guavaAny;
+
+	@JsonProperty("guava_v_a_l_u_e_s")
+	@Singular
+	private ImmutableList<String> guavaValues;
+}
diff --git a/test/transform/resource/before/LoggerCommons.java b/test/transform/resource/before/LoggerCommons.java
index 00419d00..e209c1d0 100644
--- a/test/transform/resource/before/LoggerCommons.java
+++ b/test/transform/resource/before/LoggerCommons.java
@@ -11,3 +11,8 @@ class LoggerCommonsWithImport {
 @CommonsLog(topic="DifferentName")
 class LoggerCommonsWithDifferentName {
 }
+
+@CommonsLog(topic=LoggerCommonsWithStaticField.TOPIC)
+class LoggerCommonsWithStaticField {
+	static final String TOPIC = "StaticField";
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerCustomWithTopicAndName.java b/test/transform/resource/before/LoggerCustomWithTopicAndName.java
index b40ed86a..5b803217 100644
--- a/test/transform/resource/before/LoggerCustomWithTopicAndName.java
+++ b/test/transform/resource/before/LoggerCustomWithTopicAndName.java
@@ -3,6 +3,11 @@
 class LoggerCustomLog {
 }
 
+@lombok.CustomLog(topic=LoggerCustomLogWithStaticField.TOPIC)
+class LoggerCustomLogWithStaticField {
+	static final String TOPIC = "StaticField";
+}
+
 class MyLoggerFactory {
 	static MyLoggerFactory create(String name, String t1, Object o, Class<?> clazz, String t2) {
 		return null;
diff --git a/test/transform/resource/before/LoggerJBossLog.java b/test/transform/resource/before/LoggerJBossLog.java
index fbd88177..f3480867 100644
--- a/test/transform/resource/before/LoggerJBossLog.java
+++ b/test/transform/resource/before/LoggerJBossLog.java
@@ -17,4 +17,9 @@ class LoggerJBossLogOuter {
 
 @JBossLog(topic="DifferentLogger")
 class LoggerJBossLogWithDifferentLoggerName {
+}
+
+@JBossLog(topic=LoggerJBossLogWithStaticField.TOPIC)
+class LoggerJBossLogWithStaticField {
+	static final String TOPIC = "StaticField";
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerJul.java b/test/transform/resource/before/LoggerJul.java
index 006cc344..7b10d015 100644
--- a/test/transform/resource/before/LoggerJul.java
+++ b/test/transform/resource/before/LoggerJul.java
@@ -10,4 +10,9 @@ class LoggerJulWithImport {
 
 @Log(topic="DifferentName")
 class LoggerJulWithDifferentName {
+}
+
+@Log(topic=LoggerJulWithStaticField.TOPIC)
+class LoggerJulWithStaticField {
+	static final String TOPIC = "StaticField";
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerLog4j.java b/test/transform/resource/before/LoggerLog4j.java
index 351049c5..b7086a05 100644
--- a/test/transform/resource/before/LoggerLog4j.java
+++ b/test/transform/resource/before/LoggerLog4j.java
@@ -10,4 +10,9 @@ class LoggerLog4jWithImport {
 
 @Log4j(topic="DifferentName")
 class LoggerLog4jWithDifferentName {
+}
+
+@Log4j(topic=LoggerLog4jWithStaticField.TOPIC)
+class LoggerLog4jWithStaticField {
+	static final String TOPIC = "StaticField";
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerLog4j2.java b/test/transform/resource/before/LoggerLog4j2.java
index c9cf9412..10b3aae5 100644
--- a/test/transform/resource/before/LoggerLog4j2.java
+++ b/test/transform/resource/before/LoggerLog4j2.java
@@ -10,4 +10,9 @@ class LoggerLog4j2WithImport {
 
 @Log4j2(topic="DifferentName")
 class LoggerLog4j2WithDifferentName {
+}
+
+@Log4j2(topic=LoggerLog4j2WithStaticField.TOPIC)
+class LoggerLog4j2WithStaticField {
+	static final String TOPIC = "StaticField";
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerSlf4j.java b/test/transform/resource/before/LoggerSlf4j.java
index 1113a63e..3f8284e8 100644
--- a/test/transform/resource/before/LoggerSlf4j.java
+++ b/test/transform/resource/before/LoggerSlf4j.java
@@ -17,4 +17,18 @@ class LoggerSlf4jOuter {
 
 @Slf4j(topic="DifferentLogger")
 class LoggerSlf4jWithDifferentLoggerName {
+}
+
+@Slf4j(topic=LoggerSlf4jWithStaticField.TOPIC)
+class LoggerSlf4jWithStaticField {
+	static final String TOPIC = "StaticField";
+}
+
+@Slf4j(topic=LoggerSlf4jWithTwoStaticFields.TOPIC + LoggerSlf4jWithTwoStaticFields.TOPIC)
+class LoggerSlf4jWithTwoStaticFields {
+	static final String TOPIC = "StaticField";
+}
+
+@Slf4j(topic="A"+"B")
+class LoggerSlf4jWithTwoLiterals {
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerSlf4jInvalidTopic.java b/test/transform/resource/before/LoggerSlf4jInvalidTopic.java
new file mode 100644
index 00000000..eed02f01
--- /dev/null
+++ b/test/transform/resource/before/LoggerSlf4jInvalidTopic.java
@@ -0,0 +1,5 @@
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j(topic=42)
+class LoggerSlf4jWithIntegerTopic {
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerXSlf4j.java b/test/transform/resource/before/LoggerXSlf4j.java
index a8bcb0c3..f70f2e2d 100644
--- a/test/transform/resource/before/LoggerXSlf4j.java
+++ b/test/transform/resource/before/LoggerXSlf4j.java
@@ -10,4 +10,9 @@ class LoggerXSlf4jWithImport {
 
 @XSlf4j(topic="DifferentName")
 class LoggerXSlf4jWithDifferentName {
+}
+
+@XSlf4j(topic=LoggerXSlf4jWithStaticField.TOPIC)
+class LoggerXSlf4jWithStaticField {
+	static final String TOPIC = "StaticField";
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/SkipSuppressWarnings.java b/test/transform/resource/before/SkipSuppressWarnings.java
new file mode 100644
index 00000000..ed36eeb9
--- /dev/null
+++ b/test/transform/resource/before/SkipSuppressWarnings.java
@@ -0,0 +1,9 @@
+//CONF: lombok.addSuppressWarnings = false
+
+class SkipSuppressWarnings {
+	@lombok.Getter
+	private String field = "";
+	
+	@lombok.Getter(lazy=true)
+	private final String field2 = "";
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/SuperBuilderBasic.java b/test/transform/resource/before/SuperBuilderBasic.java
index f4e8c670..99d7284e 100644
--- a/test/transform/resource/before/SuperBuilderBasic.java
+++ b/test/transform/resource/before/SuperBuilderBasic.java
@@ -8,7 +8,7 @@ public class SuperBuilderBasic {
 	}
 	
 	@lombok.experimental.SuperBuilder
-	public static class Child extends Parent {
+	public static class Child extends SuperBuilderBasic.Parent {
 		double field3;
 	}
 	
diff --git a/test/transform/resource/before/SuperBuilderCustomized.java b/test/transform/resource/before/SuperBuilderCustomized.java
index 77830587..8e641d90 100644
--- a/test/transform/resource/before/SuperBuilderCustomized.java
+++ b/test/transform/resource/before/SuperBuilderCustomized.java
@@ -14,6 +14,16 @@ public class SuperBuilderCustomized {
 			}
 		}
 		int field1;
+		
+		protected Parent(ParentBuilder<?, ?> b) {
+			if (b.field1 == 0)
+				throw new IllegalArgumentException("field1 must be != 0");
+			this.field1 = b.field1;
+		}
+		
+		public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?> builder(int field1) {
+			return new SuperBuilderCustomized.Parent.ParentBuilderImpl().field1(field1);
+		}
 	}
 	
 	@lombok.experimental.SuperBuilder
diff --git a/test/transform/resource/before/TypeUseAnnotations.java b/test/transform/resource/before/TypeUseAnnotations.java
index c09a291d..7175930f 100644
--- a/test/transform/resource/before/TypeUseAnnotations.java
+++ b/test/transform/resource/before/TypeUseAnnotations.java
@@ -8,4 +8,6 @@ import java.util.List;
 }
 class TypeUseAnnotations {
 	@lombok.Getter List<@TA(x=5) String> foo;
+	@lombok.Getter List<TypeUseAnnotations.@TA(x=5) Inner> bar;
+	class Inner { }
 }
diff --git a/test/transform/resource/before/ValLambda.java b/test/transform/resource/before/ValLambda.java
index 5c9c4a43..e956bcd3 100644
--- a/test/transform/resource/before/ValLambda.java
+++ b/test/transform/resource/before/ValLambda.java
@@ -1,4 +1,6 @@
 // version 8:
+import java.io.Serializable;
+
 class ValLambda {
 	
 	static {
@@ -12,8 +14,8 @@ class ValLambda {
 		lombok.val foo = (Runnable)()-> {};
 	}
 	
-	public void easyIntersectionLambda() {
-		lombok.val foo = (Runnable & java.io.Serializable)()-> {};
+	public void intersectionLambda() {
+		lombok.val foo = (Runnable & Serializable)()-> {};
 		lombok.val bar = (java.io.Serializable & Runnable)()-> {};
 	}
 	
diff --git a/test/transform/resource/before/ValLub.java b/test/transform/resource/before/ValLub.java
index c1b41c26..509a4f8b 100644
--- a/test/transform/resource/before/ValLub.java
+++ b/test/transform/resource/before/ValLub.java
@@ -1,21 +1,21 @@
 class ValLub {
 	public void easyLub() {
 		java.util.Map<String, Number> m = java.util.Collections.emptyMap();
-
+		
 		lombok.val foo = (System.currentTimeMillis() > 0) ? m : java.util.Collections.<String, Number>emptyMap();
 	}
-
+	
 	public void sillyLubWithUnboxingThatProducesErrorThatVarIsPrimitive() {
 		Integer i = 20;
 		Double d = 20.0;
-
+		
 		lombok.val thisShouldBePrimitiveDouble = (System.currentTimeMillis() > 0) ? i : d;
 	}
-
+	
 	public void hardLub() {
 		java.util.List<String> list = new java.util.ArrayList<String>();
 		java.util.Set<String> set = new java.util.HashSet<String>();
-
+		
 		lombok.val thisShouldBeCollection = (System.currentTimeMillis() > 0) ? list : set;
 		thisShouldBeCollection.add("");
 		String foo = thisShouldBeCollection.iterator().next();