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

67 files changed, 444 insertions, 0 deletions

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}.
+