[fixes #2682] Fix NPE, always add Javadoc return statement

133 files changed, 882 insertions, 19 deletions

diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java
index 2773a17b..0e148b88 100644
--- a/test/transform/resource/after-delombok/Accessors.java
+++ b/test/transform/resource/after-delombok/Accessors.java
@@ -4,6 +4,9 @@ class AccessorsFluent {
 	public String fieldName() {
 		return this.fieldName;
 	}
+	/**
+	 * @return {@code this}.
+	 */
 	@java.lang.SuppressWarnings("all")
 	public AccessorsFluent fieldName(final String fieldName) {
 		this.fieldName = fieldName;
@@ -21,6 +24,9 @@ class AccessorsFluentOnClass {
 	public String getOtherFieldWithOverride() {
 		return this.otherFieldWithOverride;
 	}
+	/**
+	 * @return {@code this}.
+	 */
 	@java.lang.SuppressWarnings("all")
 	public AccessorsFluentOnClass fieldName(final String fieldName) {
 		this.fieldName = fieldName;
@@ -29,6 +35,9 @@ class AccessorsFluentOnClass {
 }
 class AccessorsChain {
 	private boolean isRunning;
+	/**
+	 * @return {@code this}.
+	 */
 	@java.lang.SuppressWarnings("all")
 	public AccessorsChain setRunning(final boolean isRunning) {
 		this.isRunning = isRunning;
@@ -93,6 +102,9 @@ class AccessorsPrefix3 {
 }
 class AccessorsFluentGenerics<T extends Number> {
 	private String name;
+	/**
+	 * @return {@code this}.
+	 */
 	@java.lang.SuppressWarnings("all")
 	public AccessorsFluentGenerics<T> name(final String name) {
 		this.name = name;
diff --git a/test/transform/resource/after-delombok/AccessorsConfiguration.java b/test/transform/resource/after-delombok/AccessorsConfiguration.java
index f6604970..f52ff307 100644
--- a/test/transform/resource/after-delombok/AccessorsConfiguration.java
+++ b/test/transform/resource/after-delombok/AccessorsConfiguration.java
@@ -18,6 +18,9 @@ class AccessorsConfiguration2 {
 }
 class AccessorsConfiguration3 {
 	private String fFieldName = "";
+	/**
+	 * @return {@code this}.
+	 */
 	@java.lang.SuppressWarnings("all")
 	public AccessorsConfiguration3 setFieldName(final String fFieldName) {
 		this.fFieldName = fFieldName;
diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java
index 009ebe6c..591c2b4d 100644
--- a/test/transform/resource/after-delombok/BuilderComplex.java
+++ b/test/transform/resource/after-delombok/BuilderComplex.java
@@ -15,21 +15,33 @@ class BuilderComplex {
 		@java.lang.SuppressWarnings("all")
 		TestVoidName() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderComplex.TestVoidName<T> number(final T number) {
 			this.number = number;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderComplex.TestVoidName<T> arg2(final int arg2) {
 			this.arg2 = arg2;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderComplex.TestVoidName<T> arg3(final String arg3) {
 			this.arg3 = arg3;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderComplex.TestVoidName<T> selfRef(final BuilderComplex selfRef) {
 			this.selfRef = selfRef;
diff --git a/test/transform/resource/after-delombok/BuilderCustomName.java b/test/transform/resource/after-delombok/BuilderCustomName.java
index 4b423ee0..2e5924d3 100644
--- a/test/transform/resource/after-delombok/BuilderCustomName.java
+++ b/test/transform/resource/after-delombok/BuilderCustomName.java
@@ -9,6 +9,9 @@ class BuilderCustomName<T> {
 		protected abstract B self();
 		@java.lang.SuppressWarnings("all")
 		public abstract C build();
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public B field(final int field) {
 			this.field = field;
diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java
index 42b751ce..2170eed5 100644
--- a/test/transform/resource/after-delombok/BuilderDefaults.java
+++ b/test/transform/resource/after-delombok/BuilderDefaults.java
@@ -31,17 +31,26 @@ public final class BuilderDefaults {
 		@java.lang.SuppressWarnings("all")
 		BuilderDefaultsBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaults.BuilderDefaultsBuilder x(final int x) {
 			this.x$value = x;
 			x$set = true;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaults.BuilderDefaultsBuilder name(final String name) {
 			this.name = name;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaults.BuilderDefaultsBuilder z(final long z) {
 			this.z$value = z;
diff --git a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java
index 71dc7c5f..44d9491f 100644
--- a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java
+++ b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java
@@ -38,18 +38,27 @@ public class BuilderDefaultsGenerics<N extends Number, T, R extends List<T>> {
 		@java.lang.SuppressWarnings("all")
 		BuilderDefaultsGenericsBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) {
 			this.callable$value = callable;
 			callable$set = true;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) {
 			this.tee$value = tee;
 			tee$set = true;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) {
 			this.arrr$value = arrr;
diff --git a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
index 356e072e..2b0a6d3b 100644
--- a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
+++ b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
@@ -23,11 +23,17 @@ public class BuilderDefaultsWarnings {
 		@java.lang.SuppressWarnings("all")
 		BuilderDefaultsWarningsBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) {
 			this.x = x;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) {
 			this.z = z;
diff --git a/test/transform/resource/after-delombok/BuilderGenericMethod.java b/test/transform/resource/after-delombok/BuilderGenericMethod.java
index d57f6415..36375952 100644
--- a/test/transform/resource/after-delombok/BuilderGenericMethod.java
+++ b/test/transform/resource/after-delombok/BuilderGenericMethod.java
@@ -13,11 +13,17 @@ class BuilderGenericMethod<T> {
 		@java.lang.SuppressWarnings("all")
 		MapBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderGenericMethod<T>.MapBuilder<N> a(final int a) {
 			this.a = a;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderGenericMethod<T>.MapBuilder<N> b(final long b) {
 			this.b = b;
diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java
index d0d5833f..2ee81dcb 100644
--- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java
+++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java
@@ -16,21 +16,33 @@ class BuilderInstanceMethod<T> {
 		@java.lang.SuppressWarnings("all")
 		StringBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderInstanceMethod<T>.StringBuilder show(final int show) {
 			this.show = show;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderInstanceMethod<T>.StringBuilder yes(final int yes) {
 			this.yes = yes;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderInstanceMethod<T>.StringBuilder also(final List<T> also) {
 			this.also = also;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderInstanceMethod<T>.StringBuilder $andMe(final int $andMe) {
 			this.$andMe = $andMe;
diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java
index 925d0dd3..a43567b3 100644
--- a/test/transform/resource/after-delombok/BuilderSimple.java
+++ b/test/transform/resource/after-delombok/BuilderSimple.java
@@ -18,11 +18,17 @@ class BuilderSimple<T> {
 		@java.lang.SuppressWarnings("all")
 		BuilderSimpleBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderSimple.BuilderSimpleBuilder<T> yes(final int yes) {
 			this.yes = yes;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderSimple.BuilderSimpleBuilder<T> also(final List<T> also) {
 			this.also = also;
diff --git a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java
index ef0d8fc6..3038fe39 100644
--- a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java
@@ -12,6 +12,9 @@ class BuilderSimpleWithSetterPrefix<T> {
 		@java.lang.SuppressWarnings("all")
 		BuilderSimpleWithSetterPrefixBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T> withUnprefixed(final int unprefixed) {
 			this.unprefixed = unprefixed;
diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnos.java b/test/transform/resource/after-delombok/BuilderTypeAnnos.java
index bd450d5b..f5ef42f7 100644
--- a/test/transform/resource/after-delombok/BuilderTypeAnnos.java
+++ b/test/transform/resource/after-delombok/BuilderTypeAnnos.java
@@ -22,6 +22,9 @@ class BuilderTypeAnnos {
 		@java.lang.SuppressWarnings("all")
 		BuilderTypeAnnosBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderTypeAnnos.BuilderTypeAnnosBuilder foo(@TA final List<String> foo) {
 			this.foo = foo;
diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java
index b221e69d..1fb7798a 100644
--- a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java
@@ -22,6 +22,9 @@ class BuilderTypeAnnosWithSetterPrefix {
 		@java.lang.SuppressWarnings("all")
 		BuilderTypeAnnosWithSetterPrefixBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder withFoo(@TA final List<String> foo) {
 			this.foo = foo;
diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java
index 3fa47034..a8a9bc11 100644
--- a/test/transform/resource/after-delombok/BuilderWithAccessors.java
+++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java
@@ -23,21 +23,33 @@ class BuilderWithAccessors {
 		@java.lang.SuppressWarnings("all")
 		BuilderWithAccessorsBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) {
 			this.plower = plower;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) {
 			this.upper = upper;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) {
 			this.foo = foo;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithAccessors.BuilderWithAccessorsBuilder _bar(final int _bar) {
 			this._bar = _bar;
diff --git a/test/transform/resource/after-delombok/BuilderWithBadNames.java b/test/transform/resource/after-delombok/BuilderWithBadNames.java
index d77ca71c..c96fbc58 100644
--- a/test/transform/resource/after-delombok/BuilderWithBadNames.java
+++ b/test/transform/resource/after-delombok/BuilderWithBadNames.java
@@ -15,11 +15,17 @@ public class BuilderWithBadNames {
 		@java.lang.SuppressWarnings("all")
 		BuilderWithBadNamesBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) {
 			this.build = build;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithBadNames.BuilderWithBadNamesBuilder toString(final String toString) {
 			this.toString = toString;
diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecated.java b/test/transform/resource/after-delombok/BuilderWithDeprecated.java
index b6a09376..f0729649 100644
--- a/test/transform/resource/after-delombok/BuilderWithDeprecated.java
+++ b/test/transform/resource/after-delombok/BuilderWithDeprecated.java
@@ -40,6 +40,9 @@ public class BuilderWithDeprecated {
 			this.dep1 = dep1;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep2(final int dep2) {
diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java b/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java
index f039c047..d5c06465 100644
--- a/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java
+++ b/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java
@@ -23,6 +23,9 @@ public class BuilderWithDeprecatedAnnOnly {
 		@java.lang.SuppressWarnings("all")
 		BuilderWithDeprecatedAnnOnlyBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder dep1(final int dep1) {
diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
index 88eeee64..9c7ac1ad 100644
--- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
+++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
@@ -13,11 +13,17 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
 		@java.lang.SuppressWarnings("all")
 		BuilderWithExistingBuilderClassBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
 			this.arg1 = arg1;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
 			this.arg3 = arg3;
diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java
index b1ed5fef..c7da67f8 100644
--- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java
@@ -13,11 +13,17 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
 		@java.lang.SuppressWarnings("all")
 		BuilderWithExistingBuilderClassWithSetterPrefixBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg1(final Z arg1) {
 			this.arg1 = arg1;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg3(final String arg3) {
 			this.arg3 = arg3;
diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java
index d555ab06..61df4427 100644
--- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java
+++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java
@@ -11,6 +11,9 @@ class BuilderWithNoBuilderMethod {
 		@java.lang.SuppressWarnings("all")
 		BuilderWithNoBuilderMethodBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder a(final String a) {
 			this.a = a;
diff --git a/test/transform/resource/after-delombok/BuilderWithNonNull.java b/test/transform/resource/after-delombok/BuilderWithNonNull.java
index 9858d5bd..c9c37542 100644
--- a/test/transform/resource/after-delombok/BuilderWithNonNull.java
+++ b/test/transform/resource/after-delombok/BuilderWithNonNull.java
@@ -15,6 +15,9 @@ class BuilderWithNonNull {
 		@java.lang.SuppressWarnings("all")
 		BuilderWithNonNullBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithNonNull.BuilderWithNonNullBuilder id(@lombok.NonNull final String id) {
 			if (id == null) {
diff --git a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java
index 8a27f443..ec8ed514 100644
--- a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java
@@ -15,6 +15,9 @@ class BuilderWithNonNullWithSetterPrefix {
 		@java.lang.SuppressWarnings("all")
 		BuilderWithNonNullWithSetterPrefixBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder withId(@lombok.NonNull final String id) {
 			if (id == null) {
diff --git a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java
index 33dd7d10..a96fe1cc 100644
--- a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java
+++ b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java
@@ -19,11 +19,17 @@ public class BuilderWithRecursiveGenerics {
 			@java.lang.SuppressWarnings("all")
 			TestBuilder() {
 			}
+			/**
+			 * @return {@code this}.
+			 */
 			@java.lang.SuppressWarnings("all")
 			public BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz> foo(final Foo foo) {
 				this.foo = foo;
 				return this;
 			}
+			/**
+			 * @return {@code this}.
+			 */
 			@java.lang.SuppressWarnings("all")
 			public BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz> bar(final Bar bar) {
 				this.bar = bar;
diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java
index 3eeadcc5..0df43609 100644
--- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java
+++ b/test/transform/resource/after-delombok/BuilderWithToBuilder.java
@@ -27,16 +27,25 @@ class BuilderWithToBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		BuilderWithToBuilderBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> one(final String one) {
 			this.one = one;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> two(final String two) {
 			this.two = two;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> foo(final T foo) {
 			this.foo = foo;
@@ -114,16 +123,25 @@ class ConstructorWithToBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		ConstructorWithToBuilderBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> mOne(final String mOne) {
 			this.mOne = mOne;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> baz(final T baz) {
 			this.baz = baz;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> bars(final com.google.common.collect.ImmutableList<T> bars) {
 			this.bars = bars;
@@ -167,7 +185,9 @@ class StaticMethodWithToBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		StaticMethodWithToBuilderBuilder() {
 		}
-
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder<T> foo(final T foo) {
 			this.foo = foo;
diff --git a/test/transform/resource/after-delombok/BuilderWithTolerate.java b/test/transform/resource/after-delombok/BuilderWithTolerate.java
index daa02ac3..79494c49 100644
--- a/test/transform/resource/after-delombok/BuilderWithTolerate.java
+++ b/test/transform/resource/after-delombok/BuilderWithTolerate.java
@@ -14,6 +14,9 @@ public class BuilderWithTolerate {
 		@java.lang.SuppressWarnings("all")
 		BuilderWithTolerateBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithTolerate.BuilderWithTolerateBuilder value(final int value) {
 			this.value = value;
diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java
index c9b73d7c..f7f38b29 100644
--- a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java
+++ b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java
@@ -17,6 +17,9 @@ class CheckerFrameworkBasic {
 	public int getZ() {
 		return this.z;
 	}
+	/**
+	 * @return {@code this}.
+	 */
 	@org.checkerframework.common.returnsreceiver.qual.This
 	@java.lang.SuppressWarnings("all")
 	public CheckerFrameworkBasic setZ(final int z) {
@@ -64,6 +67,9 @@ class CheckerFrameworkBasic {
 		this.y = y;
 		this.z = z;
 	}
+	/**
+	 * @return {@code this}.
+	 */
 	@org.checkerframework.dataflow.qual.SideEffectFree
 	@java.lang.SuppressWarnings("all")
 	public CheckerFrameworkBasic withX(final int x) {
diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java
index 38600b8e..99272bd5 100644
--- a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java
+++ b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java
@@ -31,6 +31,9 @@ class CheckerFrameworkBuilder {
 		@java.lang.SuppressWarnings("all")
 		CheckerFrameworkBuilderBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@org.checkerframework.common.returnsreceiver.qual.This
 		@java.lang.SuppressWarnings("all")
 		public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder x(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("x") CheckerFrameworkBuilderBuilder this, final int x) {
@@ -38,12 +41,18 @@ class CheckerFrameworkBuilder {
 			x$set = true;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@org.checkerframework.common.returnsreceiver.qual.This
 		@java.lang.SuppressWarnings("all")
 		public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder y(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("y") CheckerFrameworkBuilderBuilder this, final int y) {
 			this.y = y;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@org.checkerframework.common.returnsreceiver.qual.This
 		@java.lang.SuppressWarnings("all")
 		public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder z(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("z") CheckerFrameworkBuilderBuilder this, final int z) {
diff --git a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java
index 7c2dff9e..919a3e33 100644
--- a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java
+++ b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java
@@ -29,6 +29,9 @@ class CheckerFrameworkSuperBuilder {
 			@org.checkerframework.dataflow.qual.SideEffectFree
 			@java.lang.SuppressWarnings("all")
 			public abstract C build(CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilder<C, B> this);
+			/**
+			 * @return {@code this}.
+			 */
 			@org.checkerframework.common.returnsreceiver.qual.This
 			@java.lang.SuppressWarnings("all")
 			public B x(CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("x") ParentBuilder<C, B> this, final int x) {
@@ -36,12 +39,18 @@ class CheckerFrameworkSuperBuilder {
 				x$set = true;
 				return self();
 			}
+			/**
+			 * @return {@code this}.
+			 */
 			@org.checkerframework.common.returnsreceiver.qual.This
 			@java.lang.SuppressWarnings("all")
 			public B y(CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("y") ParentBuilder<C, B> this, final int y) {
 				this.y = y;
 				return self();
 			}
+			/**
+			 * @return {@code this}.
+			 */
 			@org.checkerframework.common.returnsreceiver.qual.This
 			@java.lang.SuppressWarnings("all")
 			public B z(CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("z") ParentBuilder<C, B> this, final int z) {
@@ -147,6 +156,9 @@ class CheckerFrameworkSuperBuilder {
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			public abstract C build(CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilder<C, B> this);
+			/**
+			 * @return {@code this}.
+			 */
 			@org.checkerframework.common.returnsreceiver.qual.This
 			@java.lang.SuppressWarnings("all")
 			public B a(CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("a") ZChildBuilder<C, B> this, final int a) {
@@ -154,6 +166,9 @@ class CheckerFrameworkSuperBuilder {
 				a$set = true;
 				return self();
 			}
+			/**
+			 * @return {@code this}.
+			 */
 			@org.checkerframework.common.returnsreceiver.qual.This
 			@java.lang.SuppressWarnings("all")
 			public B b(CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("b") ZChildBuilder<C, B> this, final int b) {
diff --git a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java
index d5ac9bad..bcc9a57e 100644
--- a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java
+++ b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java
@@ -16,12 +16,18 @@ final class ConstructorsWithBuilderDefaults {
 		@java.lang.SuppressWarnings("all")
 		ConstructorsWithBuilderDefaultsBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final int x) {
 			this.x$value = x;
 			x$set = true;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder y(final int y) {
 			this.y = y;
diff --git a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java
index 9609f62b..f62167c6 100644
--- a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java
+++ b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java
@@ -33,18 +33,27 @@ final class ConstructorsWithBuilderDefaults<T> {
 		@java.lang.SuppressWarnings("all")
 		ConstructorsWithBuilderDefaultsBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> z(final java.util.List<T> z) {
 			this.z$value = z;
 			z$set = true;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> x(final T x) {
 			this.x$value = x;
 			x$set = true;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> q(final T q) {
 			this.q = q;
diff --git a/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java b/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java
index f9cd424d..6cf390ed 100644
--- a/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java
+++ b/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java
@@ -26,11 +26,17 @@ public class I2335_BuilderMultipleObtainVia {
 		@java.lang.SuppressWarnings("all")
 		I2335_BuilderMultipleObtainViaBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theString(final String theString) {
 			this.theString = theString;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theLong(final Long theLong) {
 			this.theLong = theLong;
diff --git a/test/transform/resource/after-delombok/JacksonJsonProperty.java b/test/transform/resource/after-delombok/JacksonJsonProperty.java
index 9ca8d7de..14e50447 100644
--- a/test/transform/resource/after-delombok/JacksonJsonProperty.java
+++ b/test/transform/resource/after-delombok/JacksonJsonProperty.java
@@ -16,6 +16,9 @@ public class JacksonJsonProperty {
 		@java.lang.SuppressWarnings("all")
 		JacksonJsonPropertyBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@JsonProperty("kebab-case-prop")
 		@JsonSetter(nulls = Nulls.SKIP)
 		@java.lang.SuppressWarnings("all")
diff --git a/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java b/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java
index 30f6b9af..5abfda63 100644
--- a/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java
+++ b/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java
@@ -18,21 +18,33 @@ class JacksonizedBuilderComplex {
 		@java.lang.SuppressWarnings("all")
 		TestVoidName() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public JacksonizedBuilderComplex.TestVoidName<T> withNumber(final T number) {
 			this.number = number;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public JacksonizedBuilderComplex.TestVoidName<T> withArg2(final int arg2) {
 			this.arg2 = arg2;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public JacksonizedBuilderComplex.TestVoidName<T> withArg3(final String arg3) {
 			this.arg3 = arg3;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public JacksonizedBuilderComplex.TestVoidName<T> withSelfRef(final JacksonizedBuilderComplex selfRef) {
 			this.selfRef = selfRef;
diff --git a/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java b/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java
index bd79df90..550163b9 100644
--- a/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java
+++ b/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java
@@ -23,11 +23,17 @@ class JacksonizedBuilderSimple<T> {
 		@java.lang.SuppressWarnings("all")
 		JacksonizedBuilderSimpleBuilder() {
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder<T> yes(final int yes) {
 			this.yes = yes;
 			return this;
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder<T> also(final List<T> also) {
 			this.also = also;
diff --git a/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java b/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java
index 7fd3f8dc..a5765934 100644
--- a/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java
+++ b/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java
@@ -11,6 +11,9 @@ public class JacksonizedSuperBuilderSimple {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field1(final int field1) {

 				this.field1 = field1;

diff --git a/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java b/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java
index a94d5f5b..d26b4ee4 100644
--- a/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java
+++ b/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java
@@ -11,6 +11,9 @@ public class JacksonizedSuperBuilderWithJsonDeserialize {
 		protected abstract B self();
 		@java.lang.SuppressWarnings("all")
 		public abstract C build();
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public B field1(final int field1) {
 			this.field1 = field1;
diff --git a/test/transform/resource/after-delombok/NullLibrary1.java b/test/transform/resource/after-delombok/NullLibrary1.java
index e426e3d3..e19c535d 100644
--- a/test/transform/resource/after-delombok/NullLibrary1.java
+++ b/test/transform/resource/after-delombok/NullLibrary1.java
@@ -34,6 +34,9 @@ public class NullLibrary1 {
 	public NullLibrary1(final String foo) {
 		this.foo = foo;
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@org.eclipse.jdt.annotation.NonNull
 	@java.lang.SuppressWarnings("all")
 	public NullLibrary1 withFoo(final String foo) {
diff --git a/test/transform/resource/after-delombok/NullLibrary2.java b/test/transform/resource/after-delombok/NullLibrary2.java
index 8f48c8a5..5087e4ee 100644
--- a/test/transform/resource/after-delombok/NullLibrary2.java
+++ b/test/transform/resource/after-delombok/NullLibrary2.java
@@ -35,6 +35,9 @@ public class NullLibrary2 {
 	public NullLibrary2(final String foo) {
 		this.foo = foo;
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@org.springframework.lang.NonNull
 	@java.lang.SuppressWarnings("all")
 	public NullLibrary2 withFoo(final String foo) {
diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstract.java b/test/transform/resource/after-delombok/SuperBuilderAbstract.java
index a5825bf4..5fa0b1a0 100644
--- a/test/transform/resource/after-delombok/SuperBuilderAbstract.java
+++ b/test/transform/resource/after-delombok/SuperBuilderAbstract.java
@@ -9,6 +9,9 @@ public class SuperBuilderAbstract {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B parentField(final int parentField) {

 				this.parentField = parentField;

@@ -57,6 +60,9 @@ public class SuperBuilderAbstract {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B childField(final double childField) {

 				this.childField = childField;

@@ -86,6 +92,9 @@ public class SuperBuilderAbstract {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B grandChildField(final String grandChildField) {

 				this.grandChildField = grandChildField;

diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java
index aef3976f..e5c11562 100644
--- a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java
+++ b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java
@@ -18,6 +18,9 @@ public class SuperBuilderAbstractToBuilder {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B parentField(final int parentField) {

 				this.parentField = parentField;

@@ -81,6 +84,9 @@ public class SuperBuilderAbstractToBuilder {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B childField(final double childField) {

 				this.childField = childField;

@@ -121,6 +127,9 @@ public class SuperBuilderAbstractToBuilder {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B grandChildField(final String grandChildField) {

 				this.grandChildField = grandChildField;

diff --git a/test/transform/resource/after-delombok/SuperBuilderBasic.java b/test/transform/resource/after-delombok/SuperBuilderBasic.java
index c3fa86f2..482ead86 100644
--- a/test/transform/resource/after-delombok/SuperBuilderBasic.java
+++ b/test/transform/resource/after-delombok/SuperBuilderBasic.java
@@ -13,6 +13,9 @@ public class SuperBuilderBasic {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field1(final int field1) {

 				this.field1 = field1;

@@ -93,6 +96,9 @@ public class SuperBuilderBasic {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field3(final double field3) {

 				this.field3 = field3;

diff --git a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java
index c0a80f93..7c1b6ff0 100644
--- a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java
+++ b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java
@@ -41,21 +41,33 @@ public class SuperBuilderBasicToBuilder {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field1(final int field1) {

 				this.field1 = field1;

 				return self();

 			}

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B obtainViaField(final int obtainViaField) {

 				this.obtainViaField = obtainViaField;

 				return self();

 			}

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B obtainViaMethod(final int obtainViaMethod) {

 				this.obtainViaMethod = obtainViaMethod;

 				return self();

 			}

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B obtainViaStaticMethod(final String obtainViaStaticMethod) {

 				this.obtainViaStaticMethod = obtainViaStaticMethod;

@@ -154,6 +166,9 @@ public class SuperBuilderBasicToBuilder {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field3(final double field3) {

 				this.field3 = field3;

diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomized.java b/test/transform/resource/after-delombok/SuperBuilderCustomized.java
index f66133c9..7d7c4ca8 100644
--- a/test/transform/resource/after-delombok/SuperBuilderCustomized.java
+++ b/test/transform/resource/after-delombok/SuperBuilderCustomized.java
@@ -77,6 +77,9 @@ public class SuperBuilderCustomized {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field2(final double field2) {

 				this.field2 = field2;

diff --git a/test/transform/resource/after-delombok/SuperBuilderNameClashes.java b/test/transform/resource/after-delombok/SuperBuilderNameClashes.java
index baf47dc4..bd176f49 100644
--- a/test/transform/resource/after-delombok/SuperBuilderNameClashes.java
+++ b/test/transform/resource/after-delombok/SuperBuilderNameClashes.java
@@ -85,6 +85,9 @@ public class SuperBuilderNameClashes {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C3 build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B c2(final C2 c2) {

 				this.c2 = c2;

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java
index cfa39295..7e9337c9 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java
@@ -13,6 +13,9 @@ public class SuperBuilderWithCustomBuilderMethod {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field1(final A field1) {

 				this.field1 = field1;

@@ -96,6 +99,9 @@ public class SuperBuilderWithCustomBuilderMethod {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field3(final double field3) {

 				this.field3 = field3;

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java
index ad56cea2..40f0900b 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java
@@ -25,12 +25,18 @@ public class SuperBuilderWithDefaults {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B millis(final long millis) {

 				this.millis$value = millis;

 				millis$set = true;

 				return self();

 			}

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B numberField(final N numberField) {

 				this.numberField$value = numberField;

@@ -89,6 +95,9 @@ public class SuperBuilderWithDefaults {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B doubleField(final double doubleField) {

 				this.doubleField$value = doubleField;

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java
index f5627211..0c3d2379 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java
@@ -13,6 +13,9 @@ public class SuperBuilderWithGenerics {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field1(final A field1) {

 				this.field1 = field1;

@@ -93,6 +96,9 @@ public class SuperBuilderWithGenerics {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field3(final double field3) {

 				this.field3 = field3;

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java
index 2b4697d5..71e29d92 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java
@@ -13,6 +13,9 @@ public class SuperBuilderWithGenerics2 {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field1(final A field1) {

 				this.field1 = field1;

@@ -93,6 +96,9 @@ public class SuperBuilderWithGenerics2 {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field3(final A field3) {

 				this.field3 = field3;

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java
index b21f8fee..991d7cbe 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java
@@ -10,6 +10,9 @@ public class SuperBuilderWithGenerics3 {
 			protected abstract B self();
 			@java.lang.SuppressWarnings("all")
 			public abstract C build();
+			/**
+			 * @return {@code this}.
+			 */
 			@java.lang.SuppressWarnings("all")
 			public B str(final String str) {
 				this.str = str;
@@ -60,6 +63,9 @@ public class SuperBuilderWithGenerics3 {
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			public abstract C build();
+			/**
+			 * @return {@code this}.
+			 */
 			@java.lang.SuppressWarnings("all")
 			public B field3(final double field3) {
 				this.field3 = field3;
diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java
index 48d51fba..ac65a444 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java
@@ -25,6 +25,9 @@ public class SuperBuilderWithGenericsAndToBuilder {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field1(final A field1) {

 				this.field1 = field1;

@@ -135,6 +138,9 @@ public class SuperBuilderWithGenericsAndToBuilder {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B field3(final double field3) {

 				this.field3 = field3;

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java
index 7c9a5a13..771e42f4 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java
@@ -17,6 +17,9 @@ public class SuperBuilderWithNonNull {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B nonNullParentField(@lombok.NonNull final String nonNullParentField) {

 				if (nonNullParentField == null) {

@@ -74,6 +77,9 @@ public class SuperBuilderWithNonNull {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B nonNullChildField(@lombok.NonNull final String nonNullChildField) {

 				if (nonNullChildField == null) {

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java b/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java
index 9662c4d9..16325113 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java
@@ -14,11 +14,17 @@ class SuperBuilderWithPrefixes {
 		protected abstract B self();
 		@java.lang.SuppressWarnings("all")
 		public abstract C build();
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public B field(final int field) {
 			this.field = field;
 			return self();
 		}
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public B otherField(final int otherField) {
 			this.otherField = otherField;
diff --git a/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java
index 28395fcd..0f007350 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java
@@ -41,21 +41,33 @@ public class SuperBuilderWithSetterPrefix {
 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B withField1(final int field1) {

 				this.field1 = field1;

 				return self();

 			}

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B withObtainViaField(final int obtainViaField) {

 				this.obtainViaField = obtainViaField;

 				return self();

 			}

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B withObtainViaMethod(final int obtainViaMethod) {

 				this.obtainViaMethod = obtainViaMethod;

 				return self();

 			}

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B withObtainViaStaticMethod(final String obtainViaStaticMethod) {

 				this.obtainViaStaticMethod = obtainViaStaticMethod;

@@ -154,6 +166,9 @@ public class SuperBuilderWithSetterPrefix {
 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

+			/**

+			 * @return {@code this}.

+			 */

 			@java.lang.SuppressWarnings("all")

 			public B setField3(final double field3) {

 				this.field3 = field3;

diff --git a/test/transform/resource/after-delombok/Tolerate.java b/test/transform/resource/after-delombok/Tolerate.java
index c3e3d7fd..2539f091 100644
--- a/test/transform/resource/after-delombok/Tolerate.java
+++ b/test/transform/resource/after-delombok/Tolerate.java
@@ -1,54 +1,39 @@
 import java.util.regex.Pattern;
-
 class Tolerate {
-	
 	private Pattern pattern;
-	
 	@lombok.experimental.Tolerate
 	public void setPattern(String pattern) {
 		setPattern(Pattern.compile(pattern));
 	}
-	
 	@java.lang.SuppressWarnings("all")
-	
-	
 	public void setPattern(final Pattern pattern) {
 		this.pattern = pattern;
 	}
-	
 	@java.lang.SuppressWarnings("all")
-	
-	
 	public Pattern getPattern() {
 		return this.pattern;
 	}
 }
 class Tolerate2 {
 	private final Pattern pattern;
-	
 	@lombok.experimental.Tolerate
 	public Tolerate2 withPattern(String pattern) {
 		return withPattern(Pattern.compile(pattern));
 	}
-	
 	public Tolerate2 withPattern(String nameGlob, String extensionGlob) {
 		return withPattern(nameGlob.replace("*", ".*") + "\\." + extensionGlob.replace("*", ".*"));
 	}
-	
 	@java.lang.SuppressWarnings("all")
-	
-	
 	public Pattern getPattern() {
 		return this.pattern;
 	}
-	
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
-	
-	
 	public Tolerate2 withPattern(final Pattern pattern) {
 		return this.pattern == pattern ? this : new Tolerate2(pattern);
 	}
-	
 	@java.lang.SuppressWarnings("all")
 	public Tolerate2(final Pattern pattern) {
 		this.pattern = pattern;
diff --git a/test/transform/resource/after-delombok/WithAlreadyExists.java b/test/transform/resource/after-delombok/WithAlreadyExists.java
index a9cb975d..6997deb9 100644
--- a/test/transform/resource/after-delombok/WithAlreadyExists.java
+++ b/test/transform/resource/after-delombok/WithAlreadyExists.java
@@ -32,6 +32,9 @@ class With5 {
 	}
 	With5(String foo) {
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public With5 withFoo(final String foo) {
 		return this.foo == foo ? this : new With5(foo);
@@ -43,6 +46,9 @@ class With6 {
 	}
 	With6(String foo) {
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public With6 withFoo(final String foo) {
 		return this.foo == foo ? this : new With6(foo);
diff --git a/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java
index 131e792c..4a88bb0e 100644
--- a/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java
+++ b/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java
@@ -11,10 +11,16 @@ class WithAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> {
 		this.y = y;
 		this.z = z;
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithAndAllArgsConstructor<T, J, L> withTest(final J test) {
 		return this.test == test ? this : new WithAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z);
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) {
 		return this.test2 == test2 ? this : new WithAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z);
diff --git a/test/transform/resource/after-delombok/WithMethodAbstract.java b/test/transform/resource/after-delombok/WithMethodAbstract.java
index 16f6f060..250330f7 100644
--- a/test/transform/resource/after-delombok/WithMethodAbstract.java
+++ b/test/transform/resource/after-delombok/WithMethodAbstract.java
@@ -1,5 +1,8 @@
 abstract class WithMethodAbstract {
 	String foo;
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public abstract WithMethodAbstract withFoo(final String foo);
 }
diff --git a/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java b/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java
index d81e76ed..dad6ff9b 100644
--- a/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java
+++ b/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java
@@ -7,6 +7,9 @@ class WithMethodMarkedDeprecated {
 	int javadoc;
 	WithMethodMarkedDeprecated(int annotation, int javadoc) {
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
 	public WithMethodMarkedDeprecated withAnnotation(final int annotation) {
diff --git a/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java b/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java
index 551b59bf..41139a0f 100644
--- a/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java
+++ b/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java
@@ -3,6 +3,9 @@ class WithMethodMarkedDeprecatedAnnOnly {
 	int annotation;
 	WithMethodMarkedDeprecatedAnnOnly(int annotation) {
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
 	public WithMethodMarkedDeprecatedAnnOnly withAnnotation(final int annotation) {
diff --git a/test/transform/resource/after-delombok/WithNested.java b/test/transform/resource/after-delombok/WithNested.java
index 27b65577..b186dabf 100644
--- a/test/transform/resource/after-delombok/WithNested.java
+++ b/test/transform/resource/after-delombok/WithNested.java
@@ -5,6 +5,9 @@ public interface WithNested<Z> {
 		public IAmStaticReally(final String x) {
 			this.x = x;
 		}
+		/**
+		 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+		 */
 		@java.lang.SuppressWarnings("all")
 		public WithNested.IAmStaticReally withX(final String x) {
 			return this.x == x ? this : new WithNested.IAmStaticReally(x);
diff --git a/test/transform/resource/after-delombok/WithOnClass.java b/test/transform/resource/after-delombok/WithOnClass.java
index d6fb6fdf..34c6d811 100644
--- a/test/transform/resource/after-delombok/WithOnClass.java
+++ b/test/transform/resource/after-delombok/WithOnClass.java
@@ -3,6 +3,9 @@ class WithOnClass1 {
 	boolean isPublic;
 	WithOnClass1(boolean isNone, boolean isPublic) {
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithOnClass1 withPublic(final boolean isPublic) {
 		return this.isPublic == isPublic ? this : new WithOnClass1(this.isNone, isPublic);
@@ -14,10 +17,16 @@ class WithOnClass2 {
 	boolean isPackage;
 	WithOnClass2(boolean isNone, boolean isProtected, boolean isPackage) {
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	protected WithOnClass2 withProtected(final boolean isProtected) {
 		return this.isProtected == isProtected ? this : new WithOnClass2(this.isNone, isProtected, this.isPackage);
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	WithOnClass2 withPackage(final boolean isPackage) {
 		return this.isPackage == isPackage ? this : new WithOnClass2(this.isNone, this.isProtected, isPackage);
@@ -29,10 +38,16 @@ class WithOnClass3 {
 	String nonNull;
 	WithOnClass3(String couldBeNull, String nonNull) {
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithOnClass3 withCouldBeNull(final String couldBeNull) {
 		return this.couldBeNull == couldBeNull ? this : new WithOnClass3(couldBeNull, this.nonNull);
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithOnClass3 withNonNull(@lombok.NonNull final String nonNull) {
 		if (nonNull == null) {
@@ -47,6 +62,9 @@ class WithOnClass4 {
 	WithOnClass4(int y) {
 		this.fY = y;
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithOnClass4 withY(final int fY) {
 		return this.fY == fY ? this : new WithOnClass4(fY);
diff --git a/test/transform/resource/after-delombok/WithPlain.java b/test/transform/resource/after-delombok/WithPlain.java
index 01fca04e..547c6fb9 100644
--- a/test/transform/resource/after-delombok/WithPlain.java
+++ b/test/transform/resource/after-delombok/WithPlain.java
@@ -5,11 +5,17 @@ class WithPlain {
 		this.i = i;
 		this.foo = foo;
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@org.springframework.lang.NonNull
 	@java.lang.SuppressWarnings("all")
 	public WithPlain withI(final int i) {
 		return this.i == i ? this : new WithPlain(i, this.foo);
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@org.springframework.lang.NonNull
 	@java.lang.SuppressWarnings("all")
 	public WithPlain withFoo(final int foo) {
diff --git a/test/transform/resource/after-delombok/WithWithGenerics.java b/test/transform/resource/after-delombok/WithWithGenerics.java
index ac34f01a..d1cd3380 100644
--- a/test/transform/resource/after-delombok/WithWithGenerics.java
+++ b/test/transform/resource/after-delombok/WithWithGenerics.java
@@ -5,14 +5,23 @@ class WithWithGenerics<T, J extends T, L extends java.lang.Number> {
 	int $i;
 	public WithWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) {
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithWithGenerics<T, J, L> withTest(final J test) {
 		return this.test == test ? this : new WithWithGenerics<T, J, L>(test, this.test2, this.test3);
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) {
 		return this.test2 == test2 ? this : new WithWithGenerics<T, J, L>(this.test, test2, this.test3);
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) {
 		return this.test3 == test3 ? this : new WithWithGenerics<T, J, L>(this.test, this.test2, test3);
diff --git a/test/transform/resource/after-delombok/WithWithTypeAnnos.java b/test/transform/resource/after-delombok/WithWithTypeAnnos.java
index bf7559ba..8bc1dc88 100644
--- a/test/transform/resource/after-delombok/WithWithTypeAnnos.java
+++ b/test/transform/resource/after-delombok/WithWithTypeAnnos.java
@@ -14,6 +14,9 @@ class WithWithTypeAnnos {
 	WithWithTypeAnnos(@TA @TB List<String> foo) {
 		this.foo = foo;
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithWithTypeAnnos withFoo(@TA final List<String> foo) {
 		return this.foo == foo ? this : new WithWithTypeAnnos(foo);
diff --git a/test/transform/resource/after-delombok/WitherAccessLevel.java b/test/transform/resource/after-delombok/WitherAccessLevel.java
index c687d645..eec79cb6 100644
--- a/test/transform/resource/after-delombok/WitherAccessLevel.java
+++ b/test/transform/resource/after-delombok/WitherAccessLevel.java
@@ -7,22 +7,37 @@ class WitherAccessLevel {
 	boolean value;
 	WitherAccessLevel(boolean isNone, boolean isPrivate, boolean isPackage, boolean isProtected, boolean isPublic, boolean value) {
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	private WitherAccessLevel withPrivate(final boolean isPrivate) {
 		return this.isPrivate == isPrivate ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value);
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	WitherAccessLevel withPackage(final boolean isPackage) {
 		return this.isPackage == isPackage ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value);
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	protected WitherAccessLevel withProtected(final boolean isProtected) {
 		return this.isProtected == isProtected ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value);
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WitherAccessLevel withPublic(final boolean isPublic) {
 		return this.isPublic == isPublic ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value);
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WitherAccessLevel withValue(final boolean value) {
 		return this.value == value ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value);
diff --git a/test/transform/resource/after-delombok/WitherLegacyStar.java b/test/transform/resource/after-delombok/WitherLegacyStar.java
index 69da9278..90d55cee 100644
--- a/test/transform/resource/after-delombok/WitherLegacyStar.java
+++ b/test/transform/resource/after-delombok/WitherLegacyStar.java
@@ -3,6 +3,9 @@ class WitherLegacyStar {
 	WitherLegacyStar(int i) {
 		this.i = i;
 	}
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WitherLegacyStar withI(final int i) {
 		return this.i == i ? this : new WitherLegacyStar(i);
diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java
index 8ac92e6e..cdc7b146 100644
--- a/test/transform/resource/after-ecj/Accessors.java
+++ b/test/transform/resource/after-ecj/Accessors.java
@@ -6,6 +6,9 @@ class AccessorsFluent {
   public @java.lang.SuppressWarnings("all") String fieldName() {
     return this.fieldName;
   }
+  /**
+   * @return {@code this}.
+   */
   public @java.lang.SuppressWarnings("all") AccessorsFluent fieldName(final String fieldName) {
     this.fieldName = fieldName;
     return this;
@@ -17,6 +20,9 @@ class AccessorsFluent {
   AccessorsFluentOnClass() {
     super();
   }
+  /**
+   * @return {@code this}.
+   */
   public @java.lang.SuppressWarnings("all") AccessorsFluentOnClass fieldName(final String fieldName) {
     this.fieldName = fieldName;
     return this;
@@ -33,6 +39,9 @@ class AccessorsChain {
   AccessorsChain() {
     super();
   }
+  /**
+   * @return {@code this}.
+   */
   public @java.lang.SuppressWarnings("all") AccessorsChain setRunning(final boolean isRunning) {
     this.isRunning = isRunning;
     return this;
@@ -102,6 +111,9 @@ class AccessorsFluentGenerics<T extends Number> {
   AccessorsFluentGenerics() {
     super();
   }
+  /**
+   * @return {@code this}.
+   */
   public @java.lang.SuppressWarnings("all") AccessorsFluentGenerics<T> name(final String name) {
     this.name = name;
     return this;
diff --git a/test/transform/resource/after-ecj/AccessorsConfiguration.java b/test/transform/resource/after-ecj/AccessorsConfiguration.java
index 6678e020..a844763c 100644
--- a/test/transform/resource/after-ecj/AccessorsConfiguration.java
+++ b/test/transform/resource/after-ecj/AccessorsConfiguration.java
@@ -24,6 +24,9 @@ class AccessorsConfiguration {
   AccessorsConfiguration3() {
     super();
   }
+  /**
+   * @return {@code this}.
+   */
   public @java.lang.SuppressWarnings("all") AccessorsConfiguration3 setFieldName(final String fFieldName) {
     this.fFieldName = fFieldName;
     return this;
diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java
index 6a28e114..ce6b0fd4 100644
--- a/test/transform/resource/after-ecj/BuilderComplex.java
+++ b/test/transform/resource/after-ecj/BuilderComplex.java
@@ -9,18 +9,30 @@ class BuilderComplex {
     @java.lang.SuppressWarnings("all") TestVoidName() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> number(final T number) {
       this.number = number;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> arg2(final int arg2) {
       this.arg2 = arg2;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> arg3(final String arg3) {
       this.arg3 = arg3;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> selfRef(final BuilderComplex selfRef) {
       this.selfRef = selfRef;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java b/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java
index bb3916e8..29b6373b 100644
--- a/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java
+++ b/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java
@@ -16,10 +16,16 @@ class BuilderConstructorJavadoc<T> {
     @java.lang.SuppressWarnings("all") BuilderConstructorJavadocBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder<T> basic(final int basic) {
       this.basic = basic;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder<T> multiline(final int multiline) {
       this.multiline = multiline;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderCustomName.java b/test/transform/resource/after-ecj/BuilderCustomName.java
index ee44cc75..652bdf16 100644
--- a/test/transform/resource/after-ecj/BuilderCustomName.java
+++ b/test/transform/resource/after-ecj/BuilderCustomName.java
@@ -7,6 +7,9 @@ import java.util.List;
     }
     protected abstract @java.lang.SuppressWarnings("all") B self();
     public abstract @java.lang.SuppressWarnings("all") C build();
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") B field(final int field) {
       this.field = field;
       return self();
diff --git a/test/transform/resource/after-ecj/BuilderDefaults.java b/test/transform/resource/after-ecj/BuilderDefaults.java
index c9be219d..37a00cbf 100644
--- a/test/transform/resource/after-ecj/BuilderDefaults.java
+++ b/test/transform/resource/after-ecj/BuilderDefaults.java
@@ -10,15 +10,24 @@ public final @Value @Builder class BuilderDefaults {
     @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder x(final int x) {
       this.x$value = x;
       x$set = true;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder name(final String name) {
       this.name = name;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder z(final long z) {
       this.z$value = z;
       z$set = true;
diff --git a/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java b/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java
index 0dc06144..4f9a3cfd 100644
--- a/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java
+++ b/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java
@@ -11,16 +11,25 @@ public @Builder class BuilderDefaultsGenerics<N extends Number, T, R extends Lis
     @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) {
       this.callable$value = callable;
       callable$set = true;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) {
       this.tee$value = tee;
       tee$set = true;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) {
       this.arrr$value = arrr;
       arrr$set = true;
diff --git a/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java b/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java
index bc773df3..16caf39e 100644
--- a/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java
+++ b/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java
@@ -8,10 +8,16 @@ public @Builder class BuilderDefaultsWarnings {
     @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) {
       this.x = x;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) {
       this.z = z;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderGenericMethod.java b/test/transform/resource/after-ecj/BuilderGenericMethod.java
index 442d74dd..be35cf9e 100644
--- a/test/transform/resource/after-ecj/BuilderGenericMethod.java
+++ b/test/transform/resource/after-ecj/BuilderGenericMethod.java
@@ -8,10 +8,16 @@ class BuilderGenericMethod<T> {
     @java.lang.SuppressWarnings("all") MapBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderGenericMethod<T>.MapBuilder<N> a(final int a) {
       this.a = a;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderGenericMethod<T>.MapBuilder<N> b(final long b) {
       this.b = b;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderInstanceMethod.java b/test/transform/resource/after-ecj/BuilderInstanceMethod.java
index e0bf16fd..33502ca9 100644
--- a/test/transform/resource/after-ecj/BuilderInstanceMethod.java
+++ b/test/transform/resource/after-ecj/BuilderInstanceMethod.java
@@ -8,18 +8,30 @@ class BuilderInstanceMethod<T> {
     @java.lang.SuppressWarnings("all") StringBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder show(final int show) {
       this.show = show;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder yes(final int yes) {
       this.yes = yes;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder also(final List<T> also) {
       this.also = also;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder $andMe(final int $andMe) {
       this.$andMe = $andMe;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderSimple.java b/test/transform/resource/after-ecj/BuilderSimple.java
index 36804792..a991545e 100644
--- a/test/transform/resource/after-ecj/BuilderSimple.java
+++ b/test/transform/resource/after-ecj/BuilderSimple.java
@@ -6,10 +6,16 @@ import java.util.List;
     @java.lang.SuppressWarnings("all") BuilderSimpleBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderSimple.BuilderSimpleBuilder<T> yes(final int yes) {
       this.yes = yes;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderSimple.BuilderSimpleBuilder<T> also(final List<T> also) {
       this.also = also;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java
index bcb3a4f5..51077a91 100644
--- a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java
@@ -5,6 +5,9 @@ import java.util.List;
     @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T> withUnprefixed(final int unprefixed) {
       this.unprefixed = unprefixed;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnos.java b/test/transform/resource/after-ecj/BuilderTypeAnnos.java
index 0037b435..cae7f2b4 100644
--- a/test/transform/resource/after-ecj/BuilderTypeAnnos.java
+++ b/test/transform/resource/after-ecj/BuilderTypeAnnos.java
@@ -11,6 +11,9 @@ import java.util.List;
     @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderTypeAnnos.BuilderTypeAnnosBuilder foo(final @TA List<String> foo) {
       this.foo = foo;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java
index 2ca07414..a3e27985 100644
--- a/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java
@@ -11,6 +11,9 @@ import java.util.List;
     @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefixBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder withFoo(final @TA List<String> foo) {
       this.foo = foo;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderWithAccessors.java b/test/transform/resource/after-ecj/BuilderWithAccessors.java
index 7b666077..2d9f80d5 100644
--- a/test/transform/resource/after-ecj/BuilderWithAccessors.java
+++ b/test/transform/resource/after-ecj/BuilderWithAccessors.java
@@ -7,18 +7,30 @@
     @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) {
       this.plower = plower;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) {
       this.upper = upper;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) {
       this.foo = foo;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder _bar(final int _bar) {
       this._bar = _bar;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderWithBadNames.java b/test/transform/resource/after-ecj/BuilderWithBadNames.java
index 9285021d..c0366e14 100644
--- a/test/transform/resource/after-ecj/BuilderWithBadNames.java
+++ b/test/transform/resource/after-ecj/BuilderWithBadNames.java
@@ -5,10 +5,16 @@ public @lombok.Builder class BuilderWithBadNames {
     @java.lang.SuppressWarnings("all") BuilderWithBadNamesBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) {
       this.build = build;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithBadNames.BuilderWithBadNamesBuilder toString(final String toString) {
       this.toString = toString;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderWithDeprecated.java b/test/transform/resource/after-ecj/BuilderWithDeprecated.java
index 65326a66..7e484b5d 100644
--- a/test/transform/resource/after-ecj/BuilderWithDeprecated.java
+++ b/test/transform/resource/after-ecj/BuilderWithDeprecated.java
@@ -18,6 +18,9 @@ public @Builder class BuilderWithDeprecated {
       this.dep1 = dep1;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep2(final int dep2) {
       this.dep2 = dep2;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java b/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java
index d25dacc1..2c563387 100644
--- a/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java
+++ b/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java
@@ -9,6 +9,9 @@ public @Builder class BuilderWithDeprecatedAnnOnly {
     @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnlyBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder dep1(final int dep1) {
       this.dep1 = dep1;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
index ea7171f0..b8c716a7 100644
--- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
+++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
@@ -9,10 +9,16 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
     @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
       this.arg1 = arg1;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
       this.arg3 = arg3;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java
index 4b8a5ff4..f3619019 100644
--- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java
@@ -9,10 +9,16 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
     @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefixBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg1(final Z arg1) {
       this.arg1 = arg1;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg3(final String arg3) {
       this.arg3 = arg3;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java b/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java
index 8ad9b56e..d5cdf765 100644
--- a/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java
+++ b/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java
@@ -5,6 +5,9 @@ import lombok.Builder;
     @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder a(final String a) {
       this.a = a;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderWithNonNull.java b/test/transform/resource/after-ecj/BuilderWithNonNull.java
index 49fd863b..eb041fae 100644
--- a/test/transform/resource/after-ecj/BuilderWithNonNull.java
+++ b/test/transform/resource/after-ecj/BuilderWithNonNull.java
@@ -4,6 +4,9 @@
     @java.lang.SuppressWarnings("all") BuilderWithNonNullBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithNonNull.BuilderWithNonNullBuilder id(final @lombok.NonNull String id) {
       if ((id == null))
           {
diff --git a/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java
index 0ae45a67..dc43f9a9 100644
--- a/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java
@@ -4,6 +4,9 @@
     @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefixBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder withId(final @lombok.NonNull String id) {
       if ((id == null))
           {
diff --git a/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java b/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java
index a004ff98..e42b9e5f 100644
--- a/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java
+++ b/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java
@@ -11,10 +11,16 @@ public class BuilderWithRecursiveGenerics {
       @java.lang.SuppressWarnings("all") TestBuilder() {
         super();
       }
+      /**
+       * @return {@code this}.
+       */
       public @java.lang.SuppressWarnings("all") BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz> foo(final Foo foo) {
         this.foo = foo;
         return this;
       }
+      /**
+       * @return {@code this}.
+       */
       public @java.lang.SuppressWarnings("all") BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz> bar(final Bar bar) {
         this.bar = bar;
         return this;
diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilder.java b/test/transform/resource/after-ecj/BuilderWithToBuilder.java
index 857caa17..0ba3e11a 100644
--- a/test/transform/resource/after-ecj/BuilderWithToBuilder.java
+++ b/test/transform/resource/after-ecj/BuilderWithToBuilder.java
@@ -9,14 +9,23 @@ import lombok.Builder;
     @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> one(final String one) {
       this.one = one;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> two(final String two) {
       this.two = two;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> foo(final T foo) {
       this.foo = foo;
       return this;
@@ -93,14 +102,23 @@ import lombok.Builder;
     @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> mOne(final String mOne) {
       this.mOne = mOne;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> baz(final T baz) {
       this.baz = baz;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> bars(final com.google.common.collect.ImmutableList<T> bars) {
       this.bars = bars;
       return this;
@@ -132,6 +150,9 @@ class StaticMethodWithToBuilder<T> {
     @java.lang.SuppressWarnings("all") StaticMethodWithToBuilderBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder<T> foo(final T foo) {
       this.foo = foo;
       return this;
diff --git a/test/transform/resource/after-ecj/BuilderWithTolerate.java b/test/transform/resource/after-ecj/BuilderWithTolerate.java
index 79de7869..8b6fbb53 100644
--- a/test/transform/resource/after-ecj/BuilderWithTolerate.java
+++ b/test/transform/resource/after-ecj/BuilderWithTolerate.java
@@ -9,6 +9,9 @@ public @Builder class BuilderWithTolerate {
     @java.lang.SuppressWarnings("all") BuilderWithTolerateBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") BuilderWithTolerate.BuilderWithTolerateBuilder value(final int value) {
       this.value = value;
       return this;
diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java
index 5411c2a4..87466c7d 100644
--- a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java
+++ b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java
@@ -6,6 +6,9 @@ import lombok.With;
   private final @With int x;
   private final int y;
   private int z;
+  /**
+   * @return {@code this}.
+   */
   public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBasic withX(final int x) {
     return ((this.x == x) ? this : new CheckerFrameworkBasic(x, this.y, this.z));
   }
@@ -18,6 +21,9 @@ import lombok.With;
   public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int getZ() {
     return this.z;
   }
+  /**
+   * @return {@code this}.
+   */
   public @org.checkerframework.common.returnsreceiver.qual.This @java.lang.SuppressWarnings("all") CheckerFrameworkBasic setZ(final int z) {
     this.z = z;
     return this;
diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java
index 9a15cde8..d5ad0991 100644
--- a/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java
+++ b/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java
@@ -11,15 +11,24 @@ import lombok.Singular;
     @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @org.checkerframework.common.returnsreceiver.qual.This @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder x(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("x") CheckerFrameworkBuilderBuilder this, final int x) {
       this.x$value = x;
       x$set = true;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @org.checkerframework.common.returnsreceiver.qual.This @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder y(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("y") CheckerFrameworkBuilderBuilder this, final int y) {
       this.y = y;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @org.checkerframework.common.returnsreceiver.qual.This @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder z(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.NotCalledMethods("z") CheckerFrameworkBuilderBuilder this, final int z) {
       this.z = z;
       return this;
diff --git a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java
index e4cc405d..1c552fcc 100644
--- a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java
+++ b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java
@@ -13,15 +13,24 @@ class CheckerFrameworkSuperBuilder {
       }
       protected abstract @org.checkerframework.common.returnsreceiver.qual.This @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") B self();
       public abstract @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") C build(CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilder<C, B> this);
+      /**
+       * @return {@code this}.
+       */
       public @org.checkerframework.common.returnsreceiver.qual.This @java.lang.SuppressWarnings("all") B x(CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.calledmethods.qual.NotCalledMethods("x") ParentBuilder<C, B> this, final int x) {
         this.x$value = x;
         x$set = true;
         return self();
       }
+      /**
+       * @return {@code this}.
+       */
       public @org.checkerframework.common.returnsreceiver.qual.This @java.lang.SuppressWarnings("all") B y(CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.calledmethods.qual.NotCalledMethods("y") ParentBuilder<C, B> this, final int y) {
         this.y = y;
         return self();
       }
+      /**
+       * @return {@code this}.
+       */
       public @org.checkerframework.common.returnsreceiver.qual.This @java.lang.SuppressWarnings("all") B z(CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.calledmethods.qual.NotCalledMethods("z") ParentBuilder<C, B> this, final int z) {
         this.z = z;
         return self();
@@ -104,11 +113,17 @@ class CheckerFrameworkSuperBuilder {
       }
       protected abstract @java.lang.Override @org.checkerframework.common.returnsreceiver.qual.This @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") B self();
       public abstract @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") C build(CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilder<C, B> this);
+      /**
+       * @return {@code this}.
+       */
       public @org.checkerframework.common.returnsreceiver.qual.This @java.lang.SuppressWarnings("all") B a(CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.calledmethods.qual.NotCalledMethods("a") ZChildBuilder<C, B> this, final int a) {
         this.a$value = a;
         a$set = true;
         return self();
       }
+      /**
+       * @return {@code this}.
+       */
       public @org.checkerframework.common.returnsreceiver.qual.This @java.lang.SuppressWarnings("all") B b(CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.calledmethods.qual.NotCalledMethods("b") ZChildBuilder<C, B> this, final int b) {
         this.b = b;
         return self();
diff --git a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java
index ba4ee605..1fcd97e3 100644
--- a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java
+++ b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java
@@ -10,11 +10,17 @@ final @NoArgsConstructor(force = true) @AllArgsConstructor @Builder @Value class
     @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final int x) {
       this.x$value = x;
       x$set = true;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder y(final int y) {
       this.y = y;
       return this;
diff --git a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java
index 4355ee5c..4d6e7079 100644
--- a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java
+++ b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java
@@ -11,16 +11,25 @@ final @Builder @Value class ConstructorsWithBuilderDefaults<T> {
     @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> z(final java.util.List<T> z) {
       this.z$value = z;
       z$set = true;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> x(final T x) {
       this.x$value = x;
       x$set = true;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> q(final T q) {
       this.q = q;
       return this;
diff --git a/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java b/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java
index 9c5eb6ae..393fe42a 100644
--- a/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java
+++ b/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java
@@ -6,10 +6,16 @@ public @Builder class I2335_BuilderMultipleObtainVia {
     @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainViaBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theString(final String theString) {
       this.theString = theString;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theLong(final Long theLong) {
       this.theLong = theLong;
       return this;
diff --git a/test/transform/resource/after-ecj/JacksonJsonProperty.java b/test/transform/resource/after-ecj/JacksonJsonProperty.java
index 008f0256..c6d3d290 100644
--- a/test/transform/resource/after-ecj/JacksonJsonProperty.java
+++ b/test/transform/resource/after-ecj/JacksonJsonProperty.java
@@ -9,6 +9,9 @@ public @Builder class JacksonJsonProperty {
     @java.lang.SuppressWarnings("all") JacksonJsonPropertyBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") JacksonJsonProperty.JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) {
       this.kebabCaseProp = kebabCaseProp;
       return this;
diff --git a/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java b/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java
index 8a06b34b..6b95a6a2 100644
--- a/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java
+++ b/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java
@@ -10,18 +10,30 @@ import lombok.extern.jackson.Jacksonized;
     @java.lang.SuppressWarnings("all") TestVoidName() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName<T> withNumber(final T number) {
       this.number = number;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName<T> withArg2(final int arg2) {
       this.arg2 = arg2;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName<T> withArg3(final String arg3) {
       this.arg3 = arg3;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName<T> withSelfRef(final JacksonizedBuilderComplex selfRef) {
       this.selfRef = selfRef;
       return this;
diff --git a/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java b/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java
index 2e0a4e0c..87910d47 100644
--- a/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java
+++ b/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java
@@ -8,10 +8,16 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
     @java.lang.SuppressWarnings("all") JacksonizedBuilderSimpleBuilder() {
       super();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder<T> yes(final int yes) {
       this.yes = yes;
       return this;
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder<T> also(final List<T> also) {
       this.also = also;
       return this;
diff --git a/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java b/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java
index 8227162a..46709a66 100644
--- a/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java
+++ b/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java
@@ -7,6 +7,9 @@ public class JacksonizedSuperBuilderSimple {
       }
       protected abstract @java.lang.SuppressWarnings("all") B self();
       public abstract @java.lang.SuppressWarnings("all") C build();
+      /**
+       * @return {@code this}.
+       */
       public @java.lang.SuppressWarnings("all") B field1(final int field1) {
         this.field1 = field1;
         return self();
diff --git a/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java b/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java
index a5677275..62938eea 100644
--- a/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java
+++ b/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java
@@ -6,6 +6,9 @@ public @lombok.extern.jackson.Jacksonized @lombok.experimental.SuperBuilder @com
     }
     protected abstract @java.lang.SuppressWarnings("all") B self();
     public abstract @java.lang.SuppressWarnings("all") C build();
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") B field1(final int field1) {
       this.field1 = field1;
       return self();
diff --git a/test/transform/resource/after-ecj/NullLibrary1.java b/test/transform/resource/after-ecj/NullLibrary1.java
index baea9e7a..5856f3b4 100644
--- a/test/transform/resource/after-ecj/NullLibrary1.java
+++ b/test/transform/resource/after-ecj/NullLibrary1.java
@@ -1,5 +1,8 @@
 public @lombok.EqualsAndHashCode @lombok.ToString @lombok.AllArgsConstructor class NullLibrary1 {
   @lombok.With String foo;
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @org.eclipse.jdt.annotation.NonNull @java.lang.SuppressWarnings("all") NullLibrary1 withFoo(final String foo) {
     return ((this.foo == foo) ? this : new NullLibrary1(foo));
   }
diff --git a/test/transform/resource/after-ecj/NullLibrary2.java b/test/transform/resource/after-ecj/NullLibrary2.java
index 60ad103f..e6a0723c 100644
--- a/test/transform/resource/after-ecj/NullLibrary2.java
+++ b/test/transform/resource/after-ecj/NullLibrary2.java
@@ -1,5 +1,8 @@
 public @lombok.EqualsAndHashCode @lombok.ToString @lombok.AllArgsConstructor class NullLibrary2 {
   @lombok.With String foo;
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") NullLibrary2 withFoo(final String foo) {
     return ((this.foo == foo) ? this : new NullLibrary2(foo));
   }
diff --git a/test/transform/resource/after-ecj/SuperBuilderAbstract.java b/test/transform/resource/after-ecj/SuperBuilderAbstract.java
index 51701668..88406272 100644
--- a/test/transform/resource/after-ecj/SuperBuilderAbstract.java
+++ b/test/transform/resource/after-ecj/SuperBuilderAbstract.java
@@ -7,6 +7,9 @@ public class SuperBuilderAbstract {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B parentField(final int parentField) {

         this.parentField = parentField;

         return self();

@@ -43,6 +46,9 @@ public class SuperBuilderAbstract {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B childField(final double childField) {

         this.childField = childField;

         return self();

@@ -65,6 +71,9 @@ public class SuperBuilderAbstract {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B grandChildField(final String grandChildField) {

         this.grandChildField = grandChildField;

         return self();

diff --git a/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java
index 4fa722e5..d1ce4fa9 100644
--- a/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java
+++ b/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java
@@ -14,6 +14,9 @@ public class SuperBuilderAbstractToBuilder {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B parentField(final int parentField) {

         this.parentField = parentField;

         return self();

@@ -61,6 +64,9 @@ public class SuperBuilderAbstractToBuilder {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B childField(final double childField) {

         this.childField = childField;

         return self();

@@ -91,6 +97,9 @@ public class SuperBuilderAbstractToBuilder {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B grandChildField(final String grandChildField) {

         this.grandChildField = grandChildField;

         return self();

diff --git a/test/transform/resource/after-ecj/SuperBuilderBasic.java b/test/transform/resource/after-ecj/SuperBuilderBasic.java
index 7902c95f..b5e835d4 100644
--- a/test/transform/resource/after-ecj/SuperBuilderBasic.java
+++ b/test/transform/resource/after-ecj/SuperBuilderBasic.java
@@ -9,6 +9,9 @@ public class SuperBuilderBasic {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field1(final int field1) {

         this.field1 = field1;

         return self();

@@ -79,6 +82,9 @@ public class SuperBuilderBasic {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field3(final double field3) {

         this.field3 = field3;

         return self();

diff --git a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java
index 56703396..f6d298e1 100644
--- a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java
+++ b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java
@@ -23,18 +23,30 @@ public class SuperBuilderBasicToBuilder {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field1(final int field1) {

         this.field1 = field1;

         return self();

       }

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B obtainViaField(final int obtainViaField) {

         this.obtainViaField = obtainViaField;

         return self();

       }

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B obtainViaMethod(final int obtainViaMethod) {

         this.obtainViaMethod = obtainViaMethod;

         return self();

       }

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B obtainViaStaticMethod(final String obtainViaStaticMethod) {

         this.obtainViaStaticMethod = obtainViaStaticMethod;

         return self();

@@ -128,6 +140,9 @@ public class SuperBuilderBasicToBuilder {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field3(final double field3) {

         this.field3 = field3;

         return self();

diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomized.java b/test/transform/resource/after-ecj/SuperBuilderCustomized.java
index fe0e1238..c9619602 100644
--- a/test/transform/resource/after-ecj/SuperBuilderCustomized.java
+++ b/test/transform/resource/after-ecj/SuperBuilderCustomized.java
@@ -62,6 +62,9 @@ public class SuperBuilderCustomized {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field2(final double field2) {

         this.field2 = field2;

         return self();

diff --git a/test/transform/resource/after-ecj/SuperBuilderNameClashes.java b/test/transform/resource/after-ecj/SuperBuilderNameClashes.java
index 89ce3824..44d3db92 100644
--- a/test/transform/resource/after-ecj/SuperBuilderNameClashes.java
+++ b/test/transform/resource/after-ecj/SuperBuilderNameClashes.java
@@ -70,6 +70,9 @@ public class SuperBuilderNameClashes {
       }
       protected abstract @java.lang.SuppressWarnings("all") B self();
       public abstract @java.lang.SuppressWarnings("all") C3 build();
+      /**
+       * @return {@code this}.
+       */
       public @java.lang.SuppressWarnings("all") B c2(final C2 c2) {
         this.c2 = c2;
         return self();
diff --git a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java
index 25f6f876..5438f576 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java
@@ -9,6 +9,9 @@ public class SuperBuilderWithCustomBuilderMethod {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field1(final A field1) {

         this.field1 = field1;

         return self();

@@ -79,6 +82,9 @@ public class SuperBuilderWithCustomBuilderMethod {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field3(final double field3) {

         this.field3 = field3;

         return self();

diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java
index 03bfd319..72079b2f 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java
@@ -11,11 +11,17 @@ public class SuperBuilderWithDefaults {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B millis(final long millis) {

         this.millis$value = millis;

         millis$set = true;

         return self();

       }

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B numberField(final N numberField) {

         this.numberField$value = numberField;

         numberField$set = true;

@@ -68,6 +74,9 @@ public class SuperBuilderWithDefaults {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B doubleField(final double doubleField) {

         this.doubleField$value = doubleField;

         doubleField$set = true;

diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java
index 6bda526e..bc9db55f 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java
@@ -9,6 +9,9 @@ public class SuperBuilderWithGenerics {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field1(final A field1) {

         this.field1 = field1;

         return self();

@@ -79,6 +82,9 @@ public class SuperBuilderWithGenerics {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field3(final double field3) {

         this.field3 = field3;

         return self();

diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java
index 4fac5de9..07d10798 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java
@@ -9,6 +9,9 @@ public class SuperBuilderWithGenerics2 {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field1(final A field1) {

         this.field1 = field1;

         return self();

@@ -79,6 +82,9 @@ public class SuperBuilderWithGenerics2 {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field3(final A field3) {

         this.field3 = field3;

         return self();

diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java
index 760c4439..8184bb05 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java
@@ -8,6 +8,9 @@ public class SuperBuilderWithGenerics3 {
       }
       protected abstract @java.lang.SuppressWarnings("all") B self();
       public abstract @java.lang.SuppressWarnings("all") C build();
+      /**
+       * @return {@code this}.
+       */
       public @java.lang.SuppressWarnings("all") B str(final String str) {
         this.str = str;
         return self();
@@ -49,6 +52,9 @@ public class SuperBuilderWithGenerics3 {
       }
       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();
       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();
+      /**
+       * @return {@code this}.
+       */
       public @java.lang.SuppressWarnings("all") B field3(final double field3) {
         this.field3 = field3;
         return self();
diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java
index 4e55ae38..c1eb42fd 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java
@@ -18,6 +18,9 @@ public class SuperBuilderWithGenericsAndToBuilder {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field1(final A field1) {

         this.field1 = field1;

         return self();

@@ -116,6 +119,9 @@ public class SuperBuilderWithGenericsAndToBuilder {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B field3(final double field3) {

         this.field3 = field3;

         return self();

diff --git a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java
index f0a2bc00..b9c96a38 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java
@@ -9,6 +9,9 @@ public class SuperBuilderWithNonNull {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B nonNullParentField(final @lombok.NonNull String nonNullParentField) {

         if ((nonNullParentField == null))

             {

@@ -60,6 +63,9 @@ public class SuperBuilderWithNonNull {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B nonNullChildField(final @lombok.NonNull String nonNullChildField) {

         if ((nonNullChildField == null))

             {

diff --git a/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java b/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java
index 1f972899..303d53f6 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java
@@ -8,10 +8,16 @@
     }
     protected abstract @java.lang.SuppressWarnings("all") B self();
     public abstract @java.lang.SuppressWarnings("all") C build();
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") B field(final int field) {
       this.field = field;
       return self();
     }
+    /**
+     * @return {@code this}.
+     */
     public @java.lang.SuppressWarnings("all") B otherField(final int otherField) {
       this.otherField = otherField;
       return self();
diff --git a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java
index 6d24f613..0edb6608 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java
@@ -23,18 +23,30 @@ public class SuperBuilderWithSetterPrefix {
       }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B withField1(final int field1) {

         this.field1 = field1;

         return self();

       }

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B withObtainViaField(final int obtainViaField) {

         this.obtainViaField = obtainViaField;

         return self();

       }

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B withObtainViaMethod(final int obtainViaMethod) {

         this.obtainViaMethod = obtainViaMethod;

         return self();

       }

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B withObtainViaStaticMethod(final String obtainViaStaticMethod) {

         this.obtainViaStaticMethod = obtainViaStaticMethod;

         return self();

@@ -128,6 +140,9 @@ public class SuperBuilderWithSetterPrefix {
       }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      /**

+       * @return {@code this}.

+       */

       public @java.lang.SuppressWarnings("all") B setField3(final double field3) {

         this.field3 = field3;

         return self();

diff --git a/test/transform/resource/after-ecj/Tolerate.java b/test/transform/resource/after-ecj/Tolerate.java
index 1fe5fe4c..fa3f8624 100644
--- a/test/transform/resource/after-ecj/Tolerate.java
+++ b/test/transform/resource/after-ecj/Tolerate.java
@@ -25,6 +25,9 @@ import java.util.regex.Pattern;
   public @java.lang.SuppressWarnings("all") Pattern getPattern() {
     return this.pattern;
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") Tolerate2 withPattern(final Pattern pattern) {
     return ((this.pattern == pattern) ? this : new Tolerate2(pattern));
   }
diff --git a/test/transform/resource/after-ecj/WithAlreadyExists.java b/test/transform/resource/after-ecj/WithAlreadyExists.java
index a868cde5..9dbd6d8a 100644
--- a/test/transform/resource/after-ecj/WithAlreadyExists.java
+++ b/test/transform/resource/after-ecj/WithAlreadyExists.java
@@ -37,6 +37,9 @@ class With5 {
   With5(String foo) {
     super();
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") With5 withFoo(final String foo) {
     return ((this.foo == foo) ? this : new With5(foo));
   }
@@ -48,6 +51,9 @@ class With6 {
   With6(String foo) {
     super();
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") With6 withFoo(final String foo) {
     return ((this.foo == foo) ? this : new With6(foo));
   }
diff --git a/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java b/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java
index d3fcded2..52a7f3a3 100644
--- a/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java
+++ b/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java
@@ -4,9 +4,15 @@
   final int x = 10;
   int y = 20;
   final int z;
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor<T, J, L> withTest(final J test) {
     return ((this.test == test) ? this : new WithAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z));
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) {
     return ((this.test2 == test2) ? this : new WithAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z));
   }
diff --git a/test/transform/resource/after-ecj/WithMethodAbstract.java b/test/transform/resource/after-ecj/WithMethodAbstract.java
index cb71357a..e0b14fc2 100644
--- a/test/transform/resource/after-ecj/WithMethodAbstract.java
+++ b/test/transform/resource/after-ecj/WithMethodAbstract.java
@@ -3,5 +3,8 @@ abstract class WithMethodAbstract {
   WithMethodAbstract() {
     super();
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public abstract @java.lang.SuppressWarnings("all") WithMethodAbstract withFoo(final String foo);
 }
diff --git a/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java b/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java
index 4220308c..d5f2bbcc 100644
--- a/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java
+++ b/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java
@@ -5,6 +5,9 @@ class WithMethodMarkedDeprecated {
   WithMethodMarkedDeprecated(int annotation, int javadoc) {
     super();
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WithMethodMarkedDeprecated withAnnotation(final int annotation) {
     return ((this.annotation == annotation) ? this : new WithMethodMarkedDeprecated(annotation, this.javadoc));
   }
diff --git a/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java b/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java
index 1dcee0d8..d4604af5 100644
--- a/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java
+++ b/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java
@@ -4,6 +4,9 @@ class WithMethodMarkedDeprecatedAnnOnly {
   WithMethodMarkedDeprecatedAnnOnly(int annotation) {
     super();
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WithMethodMarkedDeprecatedAnnOnly withAnnotation(final int annotation) {
     return ((this.annotation == annotation) ? this : new WithMethodMarkedDeprecatedAnnOnly(annotation));
   }
diff --git a/test/transform/resource/after-ecj/WithNested.java b/test/transform/resource/after-ecj/WithNested.java
index 55f6edb2..25a8bced 100644
--- a/test/transform/resource/after-ecj/WithNested.java
+++ b/test/transform/resource/after-ecj/WithNested.java
@@ -1,6 +1,9 @@
 public interface WithNested<Z> {
   @lombok.RequiredArgsConstructor class IAmStaticReally {
     final @lombok.With String x;
+    /**
+     * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+     */
     public @java.lang.SuppressWarnings("all") WithNested.IAmStaticReally withX(final String x) {
       return ((this.x == x) ? this : new WithNested.IAmStaticReally(x));
     }
diff --git a/test/transform/resource/after-ecj/WithOnClass.java b/test/transform/resource/after-ecj/WithOnClass.java
index ca3e8c6b..1c635fce 100644
--- a/test/transform/resource/after-ecj/WithOnClass.java
+++ b/test/transform/resource/after-ecj/WithOnClass.java
@@ -4,6 +4,9 @@
   WithOnClass1(boolean isNone, boolean isPublic) {
     super();
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WithOnClass1 withPublic(final boolean isPublic) {
     return ((this.isPublic == isPublic) ? this : new WithOnClass1(this.isNone, isPublic));
   }
@@ -15,9 +18,15 @@
   WithOnClass2(boolean isNone, boolean isProtected, boolean isPackage) {
     super();
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   @java.lang.SuppressWarnings("all") WithOnClass2 withPackage(final boolean isPackage) {
     return ((this.isPackage == isPackage) ? this : new WithOnClass2(this.isNone, this.isProtected, isPackage));
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   protected @java.lang.SuppressWarnings("all") WithOnClass2 withProtected(final boolean isProtected) {
     return ((this.isProtected == isProtected) ? this : new WithOnClass2(this.isNone, isProtected, this.isPackage));
   }
@@ -28,9 +37,15 @@
   WithOnClass3(String couldBeNull, String nonNull) {
     super();
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WithOnClass3 withCouldBeNull(final String couldBeNull) {
     return ((this.couldBeNull == couldBeNull) ? this : new WithOnClass3(couldBeNull, this.nonNull));
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WithOnClass3 withNonNull(final @lombok.NonNull String nonNull) {
     if ((nonNull == null))
         {
@@ -46,6 +61,9 @@
     super();
     this.fY = y;
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WithOnClass4 withY(final int fY) {
     return ((this.fY == fY) ? this : new WithOnClass4(fY));
   }
diff --git a/test/transform/resource/after-ecj/WithPlain.java b/test/transform/resource/after-ecj/WithPlain.java
index 66a1455b..9f888abe 100644
--- a/test/transform/resource/after-ecj/WithPlain.java
+++ b/test/transform/resource/after-ecj/WithPlain.java
@@ -7,9 +7,15 @@ class WithPlain {
     this.i = i;
     this.foo = foo;
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") WithPlain withI(final int i) {
     return ((this.i == i) ? this : new WithPlain(i, this.foo));
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") WithPlain withFoo(final int foo) {
     return ((this.foo == foo) ? this : new WithPlain(this.i, foo));
   }
diff --git a/test/transform/resource/after-ecj/WithWithGenerics.java b/test/transform/resource/after-ecj/WithWithGenerics.java
index b6985b99..98b18092 100644
--- a/test/transform/resource/after-ecj/WithWithGenerics.java
+++ b/test/transform/resource/after-ecj/WithWithGenerics.java
@@ -6,12 +6,21 @@ class WithWithGenerics<T, J extends T, L extends java.lang.Number> {
   public WithWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) {
     super();
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WithWithGenerics<T, J, L> withTest(final J test) {
     return ((this.test == test) ? this : new WithWithGenerics<T, J, L>(test, this.test2, this.test3));
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WithWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) {
     return ((this.test2 == test2) ? this : new WithWithGenerics<T, J, L>(this.test, test2, this.test3));
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WithWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) {
     return ((this.test3 == test3) ? this : new WithWithGenerics<T, J, L>(this.test, this.test2, test3));
   }
diff --git a/test/transform/resource/after-ecj/WithWithTypeAnnos.java b/test/transform/resource/after-ecj/WithWithTypeAnnos.java
index ff73869b..8f1b3f69 100644
--- a/test/transform/resource/after-ecj/WithWithTypeAnnos.java
+++ b/test/transform/resource/after-ecj/WithWithTypeAnnos.java
@@ -12,6 +12,9 @@ class WithWithTypeAnnos {
     super();
     this.foo = foo;
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WithWithTypeAnnos withFoo(final @TA List<String> foo) {
     return ((this.foo == foo) ? this : new WithWithTypeAnnos(foo));
   }
diff --git a/test/transform/resource/after-ecj/WitherAccessLevel.java b/test/transform/resource/after-ecj/WitherAccessLevel.java
index 09a2e514..b6457534 100644
--- a/test/transform/resource/after-ecj/WitherAccessLevel.java
+++ b/test/transform/resource/after-ecj/WitherAccessLevel.java
@@ -9,18 +9,33 @@ class WitherAccessLevel {
   WitherAccessLevel(boolean isNone, boolean isPrivate, boolean isPackage, boolean isProtected, boolean isPublic, boolean value) {
     super();
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   private @java.lang.SuppressWarnings("all") WitherAccessLevel withPrivate(final boolean isPrivate) {
     return ((this.isPrivate == isPrivate) ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value));
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   @java.lang.SuppressWarnings("all") WitherAccessLevel withPackage(final boolean isPackage) {
     return ((this.isPackage == isPackage) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value));
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   protected @java.lang.SuppressWarnings("all") WitherAccessLevel withProtected(final boolean isProtected) {
     return ((this.isProtected == isProtected) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value));
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WitherAccessLevel withPublic(final boolean isPublic) {
     return ((this.isPublic == isPublic) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value));
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WitherAccessLevel withValue(final boolean value) {
     return ((this.value == value) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value));
   }
diff --git a/test/transform/resource/after-ecj/WitherLegacyStar.java b/test/transform/resource/after-ecj/WitherLegacyStar.java
index 7aeaa969..2b9ebe79 100644
--- a/test/transform/resource/after-ecj/WitherLegacyStar.java
+++ b/test/transform/resource/after-ecj/WitherLegacyStar.java
@@ -5,6 +5,9 @@ class WitherLegacyStar {
     super();
     this.i = i;
   }
+  /**
+   * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+   */
   public @java.lang.SuppressWarnings("all") WitherLegacyStar withI(final int i) {
     return ((this.i == i) ? this : new WitherLegacyStar(i));
   }