Merge branch 'master' into jdk8. Also added some major fixes whilst merging.

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	src/utils/lombok/javac/CommentCatcher.java
	src/utils/lombok/javac/Javac.java

16 files changed, 240 insertions, 5 deletions

diff --git a/test/transform/resource/before/BuilderChainAndFluent.java b/test/transform/resource/before/BuilderChainAndFluent.java
new file mode 100644
index 00000000..4d08741b
--- /dev/null
+++ b/test/transform/resource/before/BuilderChainAndFluent.java
@@ -0,0 +1,4 @@
+@lombok.experimental.Builder(fluent = false, chain = false)
+class BuilderChainAndFluent {
+	private final int yes;
+}
diff --git a/test/transform/resource/before/BuilderComplex.java b/test/transform/resource/before/BuilderComplex.java
new file mode 100644
index 00000000..590a2723
--- /dev/null
+++ b/test/transform/resource/before/BuilderComplex.java
@@ -0,0 +1,7 @@
+import java.util.List;
+import lombok.experimental.Builder;
+
+class BuilderComplex {
+	@Builder(buildMethodName = "execute")
+	private static <T extends Number> void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) {}
+}
diff --git a/test/transform/resource/before/BuilderInvalidUse.java b/test/transform/resource/before/BuilderInvalidUse.java
new file mode 100644
index 00000000..07f37d3d
--- /dev/null
+++ b/test/transform/resource/before/BuilderInvalidUse.java
@@ -0,0 +1,18 @@
+@lombok.experimental.Builder
+class BuilderInvalidUse {
+	private int something;
+
+	@lombok.Getter @lombok.Setter @lombok.experimental.FieldDefaults(makeFinal = true) @lombok.experimental.Wither @lombok.Data @lombok.ToString @lombok.EqualsAndHashCode
+	@lombok.AllArgsConstructor
+	public static class BuilderInvalidUseBuilder {
+
+	}
+}
+
+@lombok.experimental.Builder
+class AlsoInvalid {
+	@lombok.Value
+	public static class AlsoInvalidBuilder {
+
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/BuilderSimple.java b/test/transform/resource/before/BuilderSimple.java
new file mode 100644
index 00000000..c749bb6c
--- /dev/null
+++ b/test/transform/resource/before/BuilderSimple.java
@@ -0,0 +1,9 @@
+import java.util.List;
+
+@lombok.experimental.Builder
+class BuilderSimple<T> {
+	private final int noshow = 0;
+	private final int yes;
+	private List<T> also;
+	private int $butNotMe;
+}
diff --git a/test/transform/resource/before/BuilderWithExistingBuilderClass.java b/test/transform/resource/before/BuilderWithExistingBuilderClass.java
new file mode 100644
index 00000000..262e3b85
--- /dev/null
+++ b/test/transform/resource/before/BuilderWithExistingBuilderClass.java
@@ -0,0 +1,15 @@
+import lombok.experimental.Builder;
+
+class BuilderWithExistingBuilderClass<T, K extends Number> {
+	@Builder
+	public static <Z extends Number> BuilderWithExistingBuilderClass<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) {
+		return null;
+	}
+	
+	public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> {
+		private Z arg1;
+		
+		public void arg2(boolean arg) {
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/CommentsInterspersed.java b/test/transform/resource/before/CommentsInterspersed.java
index e7898aaa..23a1060b 100644
--- a/test/transform/resource/before/CommentsInterspersed.java
+++ b/test/transform/resource/before/CommentsInterspersed.java
@@ -1,12 +1,16 @@
 import  /* cmt */   lombok./* cmt2 */Getter   /* cmt3 */   ;
 
 public /*bla */ class CommentsInterspersed {
-	/** javadoc for field */
+	/**
+	 * javadoc for field
+	 */
 	private int x;
 	
 	private /* bla2 */ @Getter String test = "foo"; //$NON-NLS-1$
 	
-	/** Javadoc on method */
+	/**
+	 * Javadoc on method
+	 */
 	public native void gwtTest(); /*-{
 		javascript;
 	}-*/
diff --git a/test/transform/resource/before/DelegateWithDeprecated.java b/test/transform/resource/before/DelegateWithDeprecated.java
index b748c6ec..064e951d 100644
--- a/test/transform/resource/before/DelegateWithDeprecated.java
+++ b/test/transform/resource/before/DelegateWithDeprecated.java
@@ -6,7 +6,9 @@ class DelegateWithDeprecated {
 	private interface Bar {
 		@Deprecated
 		void deprecatedAnnotation();
-		/** @deprecated */
+		/**
+		 * @deprecated
+		 */
 		void deprecatedComment();
 		void notDeprecated();
 	}
diff --git a/test/transform/resource/before/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/before/EqualsAndHashCodeWithSomeExistingMethods.java
new file mode 100644
index 00000000..784e3b3f
--- /dev/null
+++ b/test/transform/resource/before/EqualsAndHashCodeWithSomeExistingMethods.java
@@ -0,0 +1,47 @@
+import lombok.*;
+import static lombok.AccessLevel.NONE;
+
+@Data
+@Getter(NONE)
+@Setter(NONE)
+class EqualsAndHashCodeWithSomeExistingMethods {
+	int x;
+	
+	public int hashCode() {
+		return 42;
+	}
+}
+
+@Data
+@Getter(NONE)
+@Setter(NONE)
+class EqualsAndHashCodeWithSomeExistingMethods2 {
+	int x;
+	
+	public boolean canEqual(Object other) {
+		return false;
+	}
+}
+
+@Data
+@Getter(NONE)
+@Setter(NONE)
+class EqualsAndHashCodeWithAllExistingMethods {
+	int x;
+	
+	public int hashCode() {
+		return 42;
+	}
+	
+	public boolean equals(Object other) {
+		return false;
+	}
+}
+
+@Data
+@Getter(AccessLevel.NONE)
+@Setter(lombok.AccessLevel.NONE)
+class EqualsAndHashCodeWithNoExistingMethods {
+	int x;
+}
+
diff --git a/test/transform/resource/before/GetterSetterJavadoc.java b/test/transform/resource/before/GetterSetterJavadoc.java
new file mode 100644
index 00000000..e3ae0aac
--- /dev/null
+++ b/test/transform/resource/before/GetterSetterJavadoc.java
@@ -0,0 +1,37 @@
+@lombok.Data
+class GetterSetterJavadoc1 {
+	/**
+	 * Some text
+	 *
+	 * @param fieldName Hello, World
+	 * --- GETTER ---
+	 * Getter section
+	 *
+	 * @return Sky is blue
+	 */
+	private int fieldName;
+}
+
+class GetterSetterJavadoc2 {
+	/**
+	 * Some text
+	 *
+	 * @param fieldName Hello, World
+	 * @return Sky is blue
+	 */
+	@lombok.Getter @lombok.Setter private int fieldName;
+}
+
+class GetterSetterJavadoc3 {
+	/**
+	 * Some text
+	 *
+	 * **SETTER**
+	 * Setter section
+	 * @param fieldName Hello, World
+	 * **GETTER**
+	 * Getter section
+	 * @return Sky is blue
+	 */
+	@lombok.Getter @lombok.Setter private int fieldName;
+}
diff --git a/test/transform/resource/before/JavadocGenerally.java b/test/transform/resource/before/JavadocGenerally.java
new file mode 100644
index 00000000..ee015acf
--- /dev/null
+++ b/test/transform/resource/before/JavadocGenerally.java
@@ -0,0 +1,27 @@
+/**
+ * Doc on package
+ */
+package testPackage;
+
+/** Weird doc */
+/**
+ * Doc on class
+ */
+class JavadocGenerally {
+	/**
+	 * Doc on field
+	 */
+	private int someField;
+
+	/**
+	 * Doc on method
+	 */
+	public void test() {
+	}
+
+	/**
+	 * Doc on inner
+	 */
+	public interface TestingInner {
+	}
+}
diff --git a/test/transform/resource/before/LoggerLog4j2.java b/test/transform/resource/before/LoggerLog4j2.java
new file mode 100644
index 00000000..b7ea99ee
--- /dev/null
+++ b/test/transform/resource/before/LoggerLog4j2.java
@@ -0,0 +1,9 @@
+import lombok.extern.log4j.Log4j2;
+
+@lombok.extern.log4j.Log4j2
+class LoggerLog4j2 {
+}
+
+@Log4j2
+class LoggerLog4j2WithImport {
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/NonNullOnParameter.java b/test/transform/resource/before/NonNullOnParameter.java
new file mode 100644
index 00000000..7eb4c565
--- /dev/null
+++ b/test/transform/resource/before/NonNullOnParameter.java
@@ -0,0 +1,30 @@
+class NonNullOnParameter extends Thread {
+	NonNullOnParameter(@lombok.NonNull String arg) {
+		this(arg, "");
+	}
+	
+	NonNullOnParameter(@lombok.NonNull String arg, @lombok.NonNull String arg2) {
+		super(arg);
+		if (arg == null) throw new NullPointerException();
+	}
+	
+	public void test2(@lombok.NonNull String arg, @lombok.NonNull String arg2, @lombok.NonNull String arg3) {
+		if (arg2 == null) {
+			throw new NullPointerException("arg2");
+		}
+		if (arg == null) System.out.println("Hello");
+	}
+	
+	public void test3(@lombok.NonNull String arg) {
+		if (arg != null) throw new IllegalStateException();
+	}
+	
+	public void test(@lombok.NonNull String stringArg, @lombok.NonNull String arg2, @lombok.NonNull int primitiveArg) {
+		
+	}
+	
+	public void test(@lombok.NonNull String arg) {
+		System.out.println("Hey");
+		if (arg == null) throw new NullPointerException();
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ValInTryWithResources.java b/test/transform/resource/before/ValInTryWithResources.java
new file mode 100644
index 00000000..780e1c71
--- /dev/null
+++ b/test/transform/resource/before/ValInTryWithResources.java
@@ -0,0 +1,12 @@
+//version 7
+import lombok.val;
+import java.io.IOException;
+
+public class ValInTryWithResources {
+	public  void whyTryInsteadOfCleanup() throws IOException {
+		try (val in = getClass().getResourceAsStream("ValInTryWithResources.class")) {
+			val i = in;
+			val j = in.read();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ValueExperimental.java b/test/transform/resource/before/ValueExperimental.java
new file mode 100644
index 00000000..6bae26a0
--- /dev/null
+++ b/test/transform/resource/before/ValueExperimental.java
@@ -0,0 +1,9 @@
+import lombok.experimental.Value;
+
+@Value
+class ValueExperimental1 {
+}
+
+@lombok.experimental.Value
+class ValueExperimental2 {
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ValueExperimentalStarImport.java b/test/transform/resource/before/ValueExperimentalStarImport.java
new file mode 100644
index 00000000..5f18cffe
--- /dev/null
+++ b/test/transform/resource/before/ValueExperimentalStarImport.java
@@ -0,0 +1,5 @@
+import lombok.experimental.*;
+
+@Value
+class ValueExperimentalStarImport {
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ValuePlain.java b/test/transform/resource/before/ValuePlain.java
index 39c583cc..3fe33705 100644
--- a/test/transform/resource/before/ValuePlain.java
+++ b/test/transform/resource/before/ValuePlain.java
@@ -1,5 +1,5 @@
-import lombok.experimental.Value;
-@lombok.experimental.Value class Value1 {
+import lombok.Value;
+@lombok.Value class Value1 {
 	final int x;
 	String name;
 }