Replace SetterWitherJavadocParamCopy with SetterAndWitherJavadoc

6 files changed, 94 insertions, 57 deletions

diff --git a/test/transform/resource/after-delombok/SetterAndWitherJavadoc.java b/test/transform/resource/after-delombok/SetterAndWitherJavadoc.java
new file mode 100644
index 00000000..8c0505e7
--- /dev/null
+++ b/test/transform/resource/after-delombok/SetterAndWitherJavadoc.java
@@ -0,0 +1,46 @@
+class SetterAndWitherJavadoc {
+	/**
+	 * Some value.
+	 */
+	int i;
+	/**
+	 * Some other value.
+	 */
+	int j;
+	SetterAndWitherJavadoc(int i, int j) {
+		this.i = i;
+		this.j = j;
+	}
+	/**
+	 * Some value.
+	 * @param the new value
+	 */
+	@java.lang.SuppressWarnings("all")
+	public void setI(final int i) {
+		this.i = i;
+	}
+	/**
+	 * Some value.
+	 * @param the new value
+	 */
+	@java.lang.SuppressWarnings("all")
+	public SetterAndWitherJavadoc withI(final int i) {
+		return this.i == i ? this : new SetterAndWitherJavadoc(i, this.j);
+	}
+	/**
+	 * Set some other value.
+	 * @param the new other value
+	 */
+	@java.lang.SuppressWarnings("all")
+	public void setJ(final int j) {
+		this.j = j;
+	}
+	/**
+	 * Reinstantiate with some other value.
+	 * @param the other new other value
+	 */
+	@java.lang.SuppressWarnings("all")
+	public SetterAndWitherJavadoc withJ(final int j) {
+		return this.j == j ? this : new SetterAndWitherJavadoc(this.i, j);
+	}
+}
diff --git a/test/transform/resource/after-delombok/SetterWitherJavadocParamCopy.java b/test/transform/resource/after-delombok/SetterWitherJavadocParamCopy.java
deleted file mode 100644
index e6f5ab75..00000000
--- a/test/transform/resource/after-delombok/SetterWitherJavadocParamCopy.java
+++ /dev/null
@@ -1,28 +0,0 @@
-class SetterWitherJavadocParamCopy {
-	/**
-	 * Some text
-	 */
-	private int fieldName;
-
-	public SetterWitherJavadocParamCopy(int f) {
-		this.fieldName = f;
-	}
-	/**
-	 * Some text
-	 *
-	 * @param fieldName Hello, World1
-	 */
-	@java.lang.SuppressWarnings("all")
-	public void setFieldName(final int fieldName) {
-		this.fieldName = fieldName;
-	}
-	/**
-	 * Some text
-	 *
-	 * @param fieldName Hello, World1
-	 */
-	@java.lang.SuppressWarnings("all")
-	public SetterWitherJavadocParamCopy withFieldName(final int fieldName) {
-		return this.fieldName == fieldName ? this : new SetterWitherJavadocParamCopy(fieldName);
-	}
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/SetterAndWitherJavadoc.java b/test/transform/resource/after-ecj/SetterAndWitherJavadoc.java
new file mode 100644
index 00000000..623277a0
--- /dev/null
+++ b/test/transform/resource/after-ecj/SetterAndWitherJavadoc.java
@@ -0,0 +1,22 @@
+import lombok.experimental.Wither;
+class SetterAndWitherJavadoc {
+  @lombok.Setter @lombok.experimental.Wither int i;
+  @lombok.Setter @lombok.experimental.Wither int j;
+  SetterAndWitherJavadoc(int i, int j) {
+    super();
+    this.i = i;
+    this.j = j;
+  }
+  public @java.lang.SuppressWarnings("all") void setI(final int i) {
+    this.i = i;
+  }
+  public @java.lang.SuppressWarnings("all") SetterAndWitherJavadoc withI(final int i) {
+    return ((this.i == i) ? this : new SetterAndWitherJavadoc(i, this.j));
+  }
+  public @java.lang.SuppressWarnings("all") void setJ(final int j) {
+    this.j = j;
+  }
+  public @java.lang.SuppressWarnings("all") SetterAndWitherJavadoc withJ(final int j) {
+    return ((this.j == j) ? this : new SetterAndWitherJavadoc(this.i, j));
+  }
+}
diff --git a/test/transform/resource/after-ecj/SetterWitherJavadocParamCopy.java b/test/transform/resource/after-ecj/SetterWitherJavadocParamCopy.java
deleted file mode 100644
index 741342f7..00000000
--- a/test/transform/resource/after-ecj/SetterWitherJavadocParamCopy.java
+++ /dev/null
@@ -1,13 +0,0 @@
-class SetterWitherJavadocParamCopy {
-  private @lombok.Setter @lombok.experimental.Wither int fieldName;
-  public SetterWitherJavadocParamCopy(int f) {
-    super();
-    this.fieldName = f;
-  }
-  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
-    this.fieldName = fieldName;
-  }
-  public @java.lang.SuppressWarnings("all") SetterWitherJavadocParamCopy withFieldName(final int fieldName) {
-    return ((this.fieldName == fieldName) ? this : new SetterWitherJavadocParamCopy(fieldName));
-  }
-}
diff --git a/test/transform/resource/before/SetterAndWitherJavadoc.java b/test/transform/resource/before/SetterAndWitherJavadoc.java
new file mode 100644
index 00000000..6953eb39
--- /dev/null
+++ b/test/transform/resource/before/SetterAndWitherJavadoc.java
@@ -0,0 +1,26 @@
+import lombok.experimental.Wither;
+class SetterAndWitherJavadoc {
+	/**
+	 * Some value.
+	 * @param the new value
+	 */
+	@lombok.Setter @lombok.experimental.Wither int i;
+
+	/**
+	 * Some other value.
+	 *
+	 * --- SETTER ---
+	 * Set some other value.
+	 * @param the new other value
+	 *
+	 * --- WITHER ---
+	 * Reinstantiate with some other value.
+	 * @param the other new other value
+	 */
+	@lombok.Setter @lombok.experimental.Wither int j;
+
+	SetterAndWitherJavadoc(int i, int j) {
+		this.i = i;
+		this.j = j;
+	}
+}
diff --git a/test/transform/resource/before/SetterWitherJavadocParamCopy.java b/test/transform/resource/before/SetterWitherJavadocParamCopy.java
deleted file mode 100644
index 4de091e2..00000000
--- a/test/transform/resource/before/SetterWitherJavadocParamCopy.java
+++ /dev/null
@@ -1,16 +0,0 @@
-class SetterWitherJavadocParamCopy {
-	/**
-	 * Some text
-	 *
-	 * @param fieldName Hello, World1
-	 * --- GETTER ---
-	 * Getter section
-	 *
-	 * @return Sky is blue1
-	 */
-	@lombok.Setter @lombok.experimental.Wither private int fieldName;
-	
-	public SetterWitherJavadocParamCopy(int f) {
-		this.fieldName = f;
-	}
-}