Merge remote-tracking branch 'origin/master' into jacksonizedAccessors

test/transform/resource/before/BuilderConstructorJavadoc.java

@@ -10,9 +10,10 @@ class BuilderConstructorJavadoc<T> {
 	 *        {@code @code} or <code>tags</code>
 	 * @param predef don't copy this one
 	 * @param predefWithJavadoc don't copy this one
+	 * @param last also copy last param
 	 */
 	@lombok.Builder
-	BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc) {
+	BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc, int last) {
 		
 	}
 	

test/transform/resource/before/BuilderNestedJavadoc.java

@@ -0,0 +1,10 @@
+@lombok.Builder
+public class BuilderNestedJavadoc {
+	@lombok.Builder
+	public static class NestedClass {
+		/**
+		 * Example javadoc
+		 */
+		String name;
+	}
+}

test/transform/resource/before/ConstructorJavadoc.java

@@ -0,0 +1,20 @@
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public class ConstructorJavadoc {
+	/**
+	 * Some text
+	 *
+	 * @param fieldName Hello, World1
+	 * --- GETTER ---
+	 * Getter section
+	 *
+	 * @return Sky is blue1
+	 */
+	private int fieldName;
+	
+	/**
+	 * Sky is blue
+	 */
+	private int fieldName2;
+}

test/transform/resource/before/EqualsAndHashCodeOfAndExcludeError.java

@@ -0,0 +1,14 @@
+// skip-compare-contents
+@lombok.EqualsAndHashCode(of={"x", Const.A})
+final class EqualsAndHashCodeErrorOf {
+	int x;
+}
+
+@lombok.EqualsAndHashCode(exclude={"x", Const.A})
+final class EqualsAndHashCodeErrorExclude {
+	int x;
+}
+
+class Const {
+	static final String A = "A";
+}

test/transform/resource/before/GeneratedJavaxOff.java

@@ -1,5 +0,0 @@
-//CONF: lombok.addJavaxGeneratedAnnotation = false
-class GeneratedJavaxOff {
-	@lombok.Getter
-	int x;
-}

test/transform/resource/before/GeneratedJavaxOffLombokOff.java

@@ -0,0 +1,6 @@
+//CONF: lombok.addJavaxGeneratedAnnotation = false
+//CONF: lombok.addLombokGeneratedAnnotation = false
+class GeneratedJavaxOffLombokOff {
+	@lombok.Getter
+	int x;
+}

test/transform/resource/before/GeneratedJavaxOnLombokOn.java

@@ -1,5 +1,4 @@
 //CONF: lombok.addJavaxGeneratedAnnotation = true
-//CONF: lombok.addLombokGeneratedAnnotation = true
 class GeneratedJavaxOnLombokOn {
 	@lombok.Getter
 	int x;

test/transform/resource/before/GeneratedOffLombokOn.java

@@ -1,5 +1,4 @@
 //CONF: lombok.addGeneratedAnnotation = false
-//CONF: lombok.addLombokGeneratedAnnotation = true
 class GeneratedOffLombokOn {
 	@lombok.Getter
 	int x;

test/transform/resource/before/OnXFlagUsage.java

@@ -0,0 +1,22 @@
+//version 8:
+//conf: lombok.onX.flagUsage = warning
+//skip compare content: We're just checking if the flagUsage key works.
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@Getter(onMethod_ = @Deprecated)
+@Setter(onMethod_ = @Deprecated, onParam_ = @Deprecated)
+@NoArgsConstructor(onConstructor_ = @Deprecated)
+@AllArgsConstructor(onConstructor_ = @Deprecated)
+public class OnXFlagUsage {
+	private final String a = "";
+	private String b;
+}
+
+@RequiredArgsConstructor(onConstructor_ = @Deprecated)
+class OnXFlagUsage2 {
+	private final String a = "";
+}

test/transform/resource/before/StandardExceptionWithConstructor.java

@@ -0,0 +1,7 @@
+import lombok.experimental.StandardException;
+
+@StandardException
+public class StandardExceptionWithConstructor extends Exception {
+	public StandardExceptionWithConstructor(Integer x, Integer y) {
+	}
+}

test/transform/resource/before/SuperBuilderWithArrayTypeParam.java

@@ -0,0 +1,16 @@
+//version 8:
+public class SuperBuilderWithArrayTypeParam {
+	@lombok.experimental.SuperBuilder
+	public static class Parent<A> {
+		A field1;
+	}
+	
+	@lombok.experimental.SuperBuilder
+	public static class Child extends Parent<Integer[]> {
+		double field3;
+	}
+	
+	public static void test() {
+		Child x = Child.builder().field3(0.0).field1(new Integer[] {2}).build();
+	}
+}

test/transform/resource/before/WeirdJavadoc.java

@@ -0,0 +1,28 @@
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+public class WeirdJavadoc {
+	// Comment
+	/* Weird comment /** */
+	/**
+	 * This is the real comment
+	 * @param test Copy this
+	 */
+	/* Weird comment /** */
+	@Builder
+	WeirdJavadoc(String test) {
+		
+	}
+	
+	// Comment
+	/* Weird comment /** */
+	/**
+	 * This is the real comment
+	 * @param test Copy this
+	 */
+	/* Weird comment /** */
+	@Getter
+	@Setter
+	private String test;
+}