gave the tests for issue #1397 (generated constructors take @Builder.Default into account) an update.

test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java

@@ -1,60 +1,102 @@
 import lombok.NoArgsConstructor;
 import lombok.Value;
 import lombok.Builder;
-final @Builder @Value class ConstructorsWithBuilderDefaults {
-  public static @java.lang.SuppressWarnings("all") class ConstructorsWithBuilderDefaultsBuilder {
-    private @java.lang.SuppressWarnings("all") int x;
+final @Builder @Value class ConstructorsWithBuilderDefaults<T> {
+  public static @java.lang.SuppressWarnings("all") class ConstructorsWithBuilderDefaultsBuilder<T> {
+    private @java.lang.SuppressWarnings("all") java.util.List<T> z;
+    private @java.lang.SuppressWarnings("all") boolean z$set;
+    private @java.lang.SuppressWarnings("all") T x;
     private @java.lang.SuppressWarnings("all") boolean x$set;
+    private @java.lang.SuppressWarnings("all") T q;
     @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder x(final int x) {
+    public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder<T> z(final java.util.List<T> z) {
+      this.z = z;
+      z$set = true;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder<T> x(final T x) {
       this.x = x;
       x$set = true;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults build() {
-      return new ConstructorsWithBuilderDefaults((x$set ? x : ConstructorsWithBuilderDefaults.$default$x()));
+    public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder<T> q(final T q) {
+      this.q = q;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults<T> build() {
+      return new ConstructorsWithBuilderDefaults<T>((z$set ? z : ConstructorsWithBuilderDefaults.<T>$default$z()), (x$set ? x : ConstructorsWithBuilderDefaults.<T>$default$x()), q);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(x=" + this.x) + ")");
+      return (((((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(z=" + this.z) + ", x=") + this.x) + ", q=") + this.q) + ")");
     }
   }
-  private final @Builder.Default int x;
-  private static @java.lang.SuppressWarnings("all") int $default$x() {
-    return 5;
+  private final @Builder.Default java.util.List<T> z;
+  private final @Builder.Default T x;
+  private final T q;
+  private static @java.lang.SuppressWarnings("all") <T>java.util.List<T> $default$z() {
+    return new java.util.ArrayList<T>();
   }
-  @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults(final int x) {
+  private static @java.lang.SuppressWarnings("all") <T>T $default$x() {
+    return null;
+  }
+  @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults(final java.util.List<T> z, final T x, final T q) {
     super();
+    this.z = z;
     this.x = x;
+    this.q = q;
   }
-  public static @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder builder() {
-    return new ConstructorsWithBuilderDefaultsBuilder();
+  public static @java.lang.SuppressWarnings("all") <T>ConstructorsWithBuilderDefaultsBuilder<T> builder() {
+    return new ConstructorsWithBuilderDefaultsBuilder<T>();
   }
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") java.util.List<T> getZ() {
+    return this.z;
+  }
+  public @java.lang.SuppressWarnings("all") T getX() {
     return this.x;
   }
+  public @java.lang.SuppressWarnings("all") T getQ() {
+    return this.q;
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof ConstructorsWithBuilderDefaults)))
         return false;
-    final ConstructorsWithBuilderDefaults other = (ConstructorsWithBuilderDefaults) o;
-    if ((this.getX() != other.getX()))
+    final ConstructorsWithBuilderDefaults<?> other = (ConstructorsWithBuilderDefaults<?>) o;
+    final java.lang.Object this$z = this.getZ();
+    final java.lang.Object other$z = other.getZ();
+    if (((this$z == null) ? (other$z != null) : (! this$z.equals(other$z))))
+        return false;
+    final java.lang.Object this$x = this.getX();
+    final java.lang.Object other$x = other.getX();
+    if (((this$x == null) ? (other$x != null) : (! this$x.equals(other$x))))
+        return false;
+    final java.lang.Object this$q = this.getQ();
+    final java.lang.Object other$q = other.getQ();
+    if (((this$q == null) ? (other$q != null) : (! this$q.equals(other$q))))
         return false;
     return true;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
-    result = ((result * PRIME) + this.getX());
+    final java.lang.Object $z = this.getZ();
+    result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode()));
+    final java.lang.Object $x = this.getX();
+    result = ((result * PRIME) + (($x == null) ? 43 : $x.hashCode()));
+    final java.lang.Object $q = this.getQ();
+    result = ((result * PRIME) + (($q == null) ? 43 : $q.hashCode()));
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (("ConstructorsWithBuilderDefaults(x=" + this.getX()) + ")");
+    return (((((("ConstructorsWithBuilderDefaults(z=" + this.getZ()) + ", x=") + this.getX()) + ", q=") + this.getQ()) + ")");
   }
   private @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults() {
     super();
+    this.q = null;
+    this.z = ConstructorsWithBuilderDefaults.$default$z();
     this.x = ConstructorsWithBuilderDefaults.$default$x();
   }
-}
+}