From c1bf4ec3b66cf6632cfd3e554d59ad4f8ad1b3b8 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Sat, 13 Mar 2021 04:31:51 +0100 Subject: [trivial] just fixing line endings - no other changes --- .../JacksonizedSuperBuilderSimple.java | 118 +++--- .../after-delombok/SuperBuilderAbstract.java | 276 ++++++------- .../SuperBuilderAbstractToBuilder.java | 354 ++++++++--------- .../resource/after-delombok/SuperBuilderBasic.java | 284 +++++++------- .../after-delombok/SuperBuilderBasicToBuilder.java | 432 ++++++++++----------- .../after-delombok/SuperBuilderCustomized.java | 206 +++++----- .../SuperBuilderCustomizedWithSetterPrefix.java | 100 ++--- .../after-delombok/SuperBuilderNameClashes.java | 254 ++++++------ .../SuperBuilderNestedGenericTypes.java | 82 ++-- .../SuperBuilderWithCustomBuilderMethod.java | 282 +++++++------- .../after-delombok/SuperBuilderWithDefaults.java | 286 +++++++------- .../after-delombok/SuperBuilderWithGenerics.java | 284 +++++++------- .../after-delombok/SuperBuilderWithGenerics2.java | 284 +++++++------- .../SuperBuilderWithGenericsAndToBuilder.java | 376 +++++++++--------- .../after-delombok/SuperBuilderWithNonNull.java | 260 ++++++------- .../SuperBuilderWithSetterPrefix.java | 432 ++++++++++----------- .../resource/after-ecj/SuperBuilderAbstract.java | 222 +++++------ .../after-ecj/SuperBuilderAbstractToBuilder.java | 280 ++++++------- .../resource/after-ecj/SuperBuilderBasic.java | 244 ++++++------ .../after-ecj/SuperBuilderBasicToBuilder.java | 366 ++++++++--------- .../resource/after-ecj/SuperBuilderCustomized.java | 182 ++++----- .../SuperBuilderCustomizedWithSetterPrefix.java | 90 ++--- .../after-ecj/SuperBuilderNestedGenericTypes.java | 72 ++-- .../SuperBuilderWithCustomBuilderMethod.java | 244 ++++++------ .../after-ecj/SuperBuilderWithDefaults.java | 242 ++++++------ .../after-ecj/SuperBuilderWithGenerics.java | 244 ++++++------ .../after-ecj/SuperBuilderWithGenerics2.java | 244 ++++++------ .../SuperBuilderWithGenericsAndToBuilder.java | 324 ++++++++-------- .../after-ecj/SuperBuilderWithNonNull.java | 222 +++++------ .../after-ecj/SuperBuilderWithSetterPrefix.java | 366 ++++++++--------- .../resource/after-ecj/ValueCallSuper.java | 64 +-- test/transform/resource/before/ValueCallSuper.java | 14 +- 32 files changed, 3865 insertions(+), 3865 deletions(-) diff --git a/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java b/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java index 5cd35b7e..88a51f41 100644 --- a/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java +++ b/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java @@ -1,59 +1,59 @@ -//version 8: Jackson deps are at least Java7+. -public class JacksonizedSuperBuilderSimple { - @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) - @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl.class) - public static class Parent { - int field1; - @java.lang.SuppressWarnings("all") - public static abstract class ParentBuilder> { - @java.lang.SuppressWarnings("all") - private int field1; - @java.lang.SuppressWarnings("all") - 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(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "JacksonizedSuperBuilderSimple.Parent.ParentBuilder(field1=" + this.field1 + ")"; - } - } - @java.lang.SuppressWarnings("all") - @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) - @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "", buildMethodName = "build") - static final class ParentBuilderImpl extends JacksonizedSuperBuilderSimple.Parent.ParentBuilder { - @java.lang.SuppressWarnings("all") - private ParentBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl self() { - return this; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public JacksonizedSuperBuilderSimple.Parent build() { - return new JacksonizedSuperBuilderSimple.Parent(this); - } - } - @java.lang.SuppressWarnings("all") - protected Parent(final JacksonizedSuperBuilderSimple.Parent.ParentBuilder b) { - this.field1 = b.field1; - } - @java.lang.SuppressWarnings("all") - public static JacksonizedSuperBuilderSimple.Parent.ParentBuilder builder() { - return new JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl(); - } - } - public static void test() { - Parent x = Parent.builder().field1(5).build(); - } -} +//version 8: Jackson deps are at least Java7+. +public class JacksonizedSuperBuilderSimple { + @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) + @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl.class) + public static class Parent { + int field1; + @java.lang.SuppressWarnings("all") + public static abstract class ParentBuilder> { + @java.lang.SuppressWarnings("all") + private int field1; + @java.lang.SuppressWarnings("all") + 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(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "JacksonizedSuperBuilderSimple.Parent.ParentBuilder(field1=" + this.field1 + ")"; + } + } + @java.lang.SuppressWarnings("all") + @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "", buildMethodName = "build") + static final class ParentBuilderImpl extends JacksonizedSuperBuilderSimple.Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + private ParentBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public JacksonizedSuperBuilderSimple.Parent build() { + return new JacksonizedSuperBuilderSimple.Parent(this); + } + } + @java.lang.SuppressWarnings("all") + protected Parent(final JacksonizedSuperBuilderSimple.Parent.ParentBuilder b) { + this.field1 = b.field1; + } + @java.lang.SuppressWarnings("all") + public static JacksonizedSuperBuilderSimple.Parent.ParentBuilder builder() { + return new JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl(); + } + } + public static void test() { + Parent x = Parent.builder().field1(5).build(); + } +} diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstract.java b/test/transform/resource/after-delombok/SuperBuilderAbstract.java index 5fa0b1a0..727c5beb 100644 --- a/test/transform/resource/after-delombok/SuperBuilderAbstract.java +++ b/test/transform/resource/after-delombok/SuperBuilderAbstract.java @@ -1,138 +1,138 @@ -public class SuperBuilderAbstract { - public static class Parent { - int parentField; - @java.lang.SuppressWarnings("all") - public static abstract class ParentBuilder> { - @java.lang.SuppressWarnings("all") - private int parentField; - @java.lang.SuppressWarnings("all") - 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; - return self(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderAbstract.Parent.ParentBuilder(parentField=" + this.parentField + ")"; - } - } - @java.lang.SuppressWarnings("all") - private static final class ParentBuilderImpl extends SuperBuilderAbstract.Parent.ParentBuilder { - @java.lang.SuppressWarnings("all") - private ParentBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected SuperBuilderAbstract.Parent.ParentBuilderImpl self() { - return this; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public SuperBuilderAbstract.Parent build() { - return new SuperBuilderAbstract.Parent(this); - } - } - @java.lang.SuppressWarnings("all") - protected Parent(final SuperBuilderAbstract.Parent.ParentBuilder b) { - this.parentField = b.parentField; - } - @java.lang.SuppressWarnings("all") - public static SuperBuilderAbstract.Parent.ParentBuilder builder() { - return new SuperBuilderAbstract.Parent.ParentBuilderImpl(); - } - } - public static abstract class Child extends Parent { - double childField; - @java.lang.SuppressWarnings("all") - public static abstract class ChildBuilder> extends Parent.ParentBuilder { - @java.lang.SuppressWarnings("all") - private double childField; - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected abstract B self(); - @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; - return self(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderAbstract.Child.ChildBuilder(super=" + super.toString() + ", childField=" + this.childField + ")"; - } - } - @java.lang.SuppressWarnings("all") - protected Child(final SuperBuilderAbstract.Child.ChildBuilder b) { - super(b); - this.childField = b.childField; - } - } - public static class GrandChild extends Child { - String grandChildField; - @java.lang.SuppressWarnings("all") - public static abstract class GrandChildBuilder> extends Child.ChildBuilder { - @java.lang.SuppressWarnings("all") - private String grandChildField; - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected abstract B self(); - @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; - return self(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderAbstract.GrandChild.GrandChildBuilder(super=" + super.toString() + ", grandChildField=" + this.grandChildField + ")"; - } - } - @java.lang.SuppressWarnings("all") - private static final class GrandChildBuilderImpl extends SuperBuilderAbstract.GrandChild.GrandChildBuilder { - @java.lang.SuppressWarnings("all") - private GrandChildBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl self() { - return this; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public SuperBuilderAbstract.GrandChild build() { - return new SuperBuilderAbstract.GrandChild(this); - } - } - @java.lang.SuppressWarnings("all") - protected GrandChild(final SuperBuilderAbstract.GrandChild.GrandChildBuilder b) { - super(b); - this.grandChildField = b.grandChildField; - } - @java.lang.SuppressWarnings("all") - public static SuperBuilderAbstract.GrandChild.GrandChildBuilder builder() { - return new SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl(); - } - } - public static void test() { - GrandChild x = GrandChild.builder().grandChildField("").parentField(5).childField(2.5).build(); - } -} +public class SuperBuilderAbstract { + public static class Parent { + int parentField; + @java.lang.SuppressWarnings("all") + public static abstract class ParentBuilder> { + @java.lang.SuppressWarnings("all") + private int parentField; + @java.lang.SuppressWarnings("all") + 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; + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderAbstract.Parent.ParentBuilder(parentField=" + this.parentField + ")"; + } + } + @java.lang.SuppressWarnings("all") + private static final class ParentBuilderImpl extends SuperBuilderAbstract.Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + private ParentBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SuperBuilderAbstract.Parent.ParentBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SuperBuilderAbstract.Parent build() { + return new SuperBuilderAbstract.Parent(this); + } + } + @java.lang.SuppressWarnings("all") + protected Parent(final SuperBuilderAbstract.Parent.ParentBuilder b) { + this.parentField = b.parentField; + } + @java.lang.SuppressWarnings("all") + public static SuperBuilderAbstract.Parent.ParentBuilder builder() { + return new SuperBuilderAbstract.Parent.ParentBuilderImpl(); + } + } + public static abstract class Child extends Parent { + double childField; + @java.lang.SuppressWarnings("all") + public static abstract class ChildBuilder> extends Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + private double childField; + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected abstract B self(); + @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; + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderAbstract.Child.ChildBuilder(super=" + super.toString() + ", childField=" + this.childField + ")"; + } + } + @java.lang.SuppressWarnings("all") + protected Child(final SuperBuilderAbstract.Child.ChildBuilder b) { + super(b); + this.childField = b.childField; + } + } + public static class GrandChild extends Child { + String grandChildField; + @java.lang.SuppressWarnings("all") + public static abstract class GrandChildBuilder> extends Child.ChildBuilder { + @java.lang.SuppressWarnings("all") + private String grandChildField; + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected abstract B self(); + @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; + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderAbstract.GrandChild.GrandChildBuilder(super=" + super.toString() + ", grandChildField=" + this.grandChildField + ")"; + } + } + @java.lang.SuppressWarnings("all") + private static final class GrandChildBuilderImpl extends SuperBuilderAbstract.GrandChild.GrandChildBuilder { + @java.lang.SuppressWarnings("all") + private GrandChildBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SuperBuilderAbstract.GrandChild build() { + return new SuperBuilderAbstract.GrandChild(this); + } + } + @java.lang.SuppressWarnings("all") + protected GrandChild(final SuperBuilderAbstract.GrandChild.GrandChildBuilder b) { + super(b); + this.grandChildField = b.grandChildField; + } + @java.lang.SuppressWarnings("all") + public static SuperBuilderAbstract.GrandChild.GrandChildBuilder builder() { + return new SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl(); + } + } + public static void test() { + GrandChild x = GrandChild.builder().grandChildField("").parentField(5).childField(2.5).build(); + } +} diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java index e5c11562..53962c60 100644 --- a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java @@ -1,177 +1,177 @@ -public class SuperBuilderAbstractToBuilder { - public static class Parent { - int parentField; - @java.lang.SuppressWarnings("all") - public static abstract class ParentBuilder> { - @java.lang.SuppressWarnings("all") - private int parentField; - @java.lang.SuppressWarnings("all") - protected B $fillValuesFrom(final C instance) { - SuperBuilderAbstractToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); - return self(); - } - @java.lang.SuppressWarnings("all") - private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Parent instance, final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { - b.parentField(instance.parentField); - } - @java.lang.SuppressWarnings("all") - 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; - return self(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderAbstractToBuilder.Parent.ParentBuilder(parentField=" + this.parentField + ")"; - } - } - @java.lang.SuppressWarnings("all") - private static final class ParentBuilderImpl extends SuperBuilderAbstractToBuilder.Parent.ParentBuilder { - @java.lang.SuppressWarnings("all") - private ParentBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl self() { - return this; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public SuperBuilderAbstractToBuilder.Parent build() { - return new SuperBuilderAbstractToBuilder.Parent(this); - } - } - @java.lang.SuppressWarnings("all") - protected Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { - this.parentField = b.parentField; - } - @java.lang.SuppressWarnings("all") - public static SuperBuilderAbstractToBuilder.Parent.ParentBuilder builder() { - return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl(); - } - @java.lang.SuppressWarnings("all") - public SuperBuilderAbstractToBuilder.Parent.ParentBuilder toBuilder() { - return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); - } - } - public static abstract class Child extends Parent { - double childField; - @java.lang.SuppressWarnings("all") - public static abstract class ChildBuilder> extends Parent.ParentBuilder { - @java.lang.SuppressWarnings("all") - private double childField; - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected B $fillValuesFrom(final C instance) { - super.$fillValuesFrom(instance); - SuperBuilderAbstractToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); - return self(); - } - @java.lang.SuppressWarnings("all") - private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Child instance, final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { - b.childField(instance.childField); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected abstract B self(); - @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; - return self(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderAbstractToBuilder.Child.ChildBuilder(super=" + super.toString() + ", childField=" + this.childField + ")"; - } - } - @java.lang.SuppressWarnings("all") - protected Child(final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { - super(b); - this.childField = b.childField; - } - } - public static class GrandChild extends Child { - String grandChildField; - @java.lang.SuppressWarnings("all") - public static abstract class GrandChildBuilder> extends Child.ChildBuilder { - @java.lang.SuppressWarnings("all") - private String grandChildField; - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected B $fillValuesFrom(final C instance) { - super.$fillValuesFrom(instance); - SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); - return self(); - } - @java.lang.SuppressWarnings("all") - private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.GrandChild instance, final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { - b.grandChildField(instance.grandChildField); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected abstract B self(); - @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; - return self(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder(super=" + super.toString() + ", grandChildField=" + this.grandChildField + ")"; - } - } - @java.lang.SuppressWarnings("all") - private static final class GrandChildBuilderImpl extends SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder { - @java.lang.SuppressWarnings("all") - private GrandChildBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl self() { - return this; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public SuperBuilderAbstractToBuilder.GrandChild build() { - return new SuperBuilderAbstractToBuilder.GrandChild(this); - } - } - @java.lang.SuppressWarnings("all") - protected GrandChild(final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { - super(b); - this.grandChildField = b.grandChildField; - } - @java.lang.SuppressWarnings("all") - public static SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder builder() { - return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl(); - } - @java.lang.SuppressWarnings("all") - public SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder toBuilder() { - return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl().$fillValuesFrom(this); - } - } - public static void test() { - GrandChild x = GrandChild.builder().grandChildField("").parentField(5).childField(2.5).build().toBuilder().build(); - } -} +public class SuperBuilderAbstractToBuilder { + public static class Parent { + int parentField; + @java.lang.SuppressWarnings("all") + public static abstract class ParentBuilder> { + @java.lang.SuppressWarnings("all") + private int parentField; + @java.lang.SuppressWarnings("all") + protected B $fillValuesFrom(final C instance) { + SuperBuilderAbstractToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); + return self(); + } + @java.lang.SuppressWarnings("all") + private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Parent instance, final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { + b.parentField(instance.parentField); + } + @java.lang.SuppressWarnings("all") + 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; + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderAbstractToBuilder.Parent.ParentBuilder(parentField=" + this.parentField + ")"; + } + } + @java.lang.SuppressWarnings("all") + private static final class ParentBuilderImpl extends SuperBuilderAbstractToBuilder.Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + private ParentBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SuperBuilderAbstractToBuilder.Parent build() { + return new SuperBuilderAbstractToBuilder.Parent(this); + } + } + @java.lang.SuppressWarnings("all") + protected Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { + this.parentField = b.parentField; + } + @java.lang.SuppressWarnings("all") + public static SuperBuilderAbstractToBuilder.Parent.ParentBuilder builder() { + return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl(); + } + @java.lang.SuppressWarnings("all") + public SuperBuilderAbstractToBuilder.Parent.ParentBuilder toBuilder() { + return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); + } + } + public static abstract class Child extends Parent { + double childField; + @java.lang.SuppressWarnings("all") + public static abstract class ChildBuilder> extends Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + private double childField; + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected B $fillValuesFrom(final C instance) { + super.$fillValuesFrom(instance); + SuperBuilderAbstractToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); + return self(); + } + @java.lang.SuppressWarnings("all") + private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Child instance, final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { + b.childField(instance.childField); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected abstract B self(); + @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; + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderAbstractToBuilder.Child.ChildBuilder(super=" + super.toString() + ", childField=" + this.childField + ")"; + } + } + @java.lang.SuppressWarnings("all") + protected Child(final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { + super(b); + this.childField = b.childField; + } + } + public static class GrandChild extends Child { + String grandChildField; + @java.lang.SuppressWarnings("all") + public static abstract class GrandChildBuilder> extends Child.ChildBuilder { + @java.lang.SuppressWarnings("all") + private String grandChildField; + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected B $fillValuesFrom(final C instance) { + super.$fillValuesFrom(instance); + SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); + return self(); + } + @java.lang.SuppressWarnings("all") + private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.GrandChild instance, final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { + b.grandChildField(instance.grandChildField); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected abstract B self(); + @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; + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder(super=" + super.toString() + ", grandChildField=" + this.grandChildField + ")"; + } + } + @java.lang.SuppressWarnings("all") + private static final class GrandChildBuilderImpl extends SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder { + @java.lang.SuppressWarnings("all") + private GrandChildBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SuperBuilderAbstractToBuilder.GrandChild build() { + return new SuperBuilderAbstractToBuilder.GrandChild(this); + } + } + @java.lang.SuppressWarnings("all") + protected GrandChild(final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { + super(b); + this.grandChildField = b.grandChildField; + } + @java.lang.SuppressWarnings("all") + public static SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder builder() { + return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl(); + } + @java.lang.SuppressWarnings("all") + public SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder toBuilder() { + return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl().$fillValuesFrom(this); + } + } + public static void test() { + GrandChild x = GrandChild.builder().grandChildField("").parentField(5).childField(2.5).build().toBuilder().build(); + } +} diff --git a/test/transform/resource/after-delombok/SuperBuilderBasic.java b/test/transform/resource/after-delombok/SuperBuilderBasic.java index 482ead86..7fff2ef8 100644 --- a/test/transform/resource/after-delombok/SuperBuilderBasic.java +++ b/test/transform/resource/after-delombok/SuperBuilderBasic.java @@ -1,142 +1,142 @@ -import java.util.List; -public class SuperBuilderBasic { - public static class Parent { - int field1; - List items; - @java.lang.SuppressWarnings("all") - public static abstract class ParentBuilder> { - @java.lang.SuppressWarnings("all") - private int field1; - @java.lang.SuppressWarnings("all") - private java.util.ArrayList items; - @java.lang.SuppressWarnings("all") - 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(); - } - @java.lang.SuppressWarnings("all") - public B item(final String item) { - if (this.items == null) this.items = new java.util.ArrayList(); - this.items.add(item); - return self(); - } - @java.lang.SuppressWarnings("all") - public B items(final java.util.Collection items) { - if (items == null) { - throw new java.lang.NullPointerException("items cannot be null"); - } - if (this.items == null) this.items = new java.util.ArrayList(); - this.items.addAll(items); - return self(); - } - @java.lang.SuppressWarnings("all") - public B clearItems() { - if (this.items != null) this.items.clear(); - return self(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderBasic.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; - } - } - @java.lang.SuppressWarnings("all") - private static final class ParentBuilderImpl extends SuperBuilderBasic.Parent.ParentBuilder { - @java.lang.SuppressWarnings("all") - private ParentBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected SuperBuilderBasic.Parent.ParentBuilderImpl self() { - return this; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public SuperBuilderBasic.Parent build() { - return new SuperBuilderBasic.Parent(this); - } - } - @java.lang.SuppressWarnings("all") - protected Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { - this.field1 = b.field1; - java.util.List items; - switch (b.items == null ? 0 : b.items.size()) { - case 0: - items = java.util.Collections.emptyList(); - break; - case 1: - items = java.util.Collections.singletonList(b.items.get(0)); - break; - default: - items = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.items)); - } - this.items = items; - } - @java.lang.SuppressWarnings("all") - public static SuperBuilderBasic.Parent.ParentBuilder builder() { - return new SuperBuilderBasic.Parent.ParentBuilderImpl(); - } - } - public static class Child extends SuperBuilderBasic.Parent { - double field3; - @java.lang.SuppressWarnings("all") - public static abstract class ChildBuilder> extends SuperBuilderBasic.Parent.ParentBuilder { - @java.lang.SuppressWarnings("all") - private double field3; - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected abstract B self(); - @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; - return self(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderBasic.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; - } - } - @java.lang.SuppressWarnings("all") - private static final class ChildBuilderImpl extends SuperBuilderBasic.Child.ChildBuilder { - @java.lang.SuppressWarnings("all") - private ChildBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected SuperBuilderBasic.Child.ChildBuilderImpl self() { - return this; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public SuperBuilderBasic.Child build() { - return new SuperBuilderBasic.Child(this); - } - } - @java.lang.SuppressWarnings("all") - protected Child(final SuperBuilderBasic.Child.ChildBuilder b) { - super(b); - this.field3 = b.field3; - } - @java.lang.SuppressWarnings("all") - public static SuperBuilderBasic.Child.ChildBuilder builder() { - return new SuperBuilderBasic.Child.ChildBuilderImpl(); - } - } - public static void test() { - Child x = Child.builder().field3(0.0).field1(5).item("").build(); - } -} +import java.util.List; +public class SuperBuilderBasic { + public static class Parent { + int field1; + List items; + @java.lang.SuppressWarnings("all") + public static abstract class ParentBuilder> { + @java.lang.SuppressWarnings("all") + private int field1; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList items; + @java.lang.SuppressWarnings("all") + 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(); + } + @java.lang.SuppressWarnings("all") + public B item(final String item) { + if (this.items == null) this.items = new java.util.ArrayList(); + this.items.add(item); + return self(); + } + @java.lang.SuppressWarnings("all") + public B items(final java.util.Collection items) { + if (items == null) { + throw new java.lang.NullPointerException("items cannot be null"); + } + if (this.items == null) this.items = new java.util.ArrayList(); + this.items.addAll(items); + return self(); + } + @java.lang.SuppressWarnings("all") + public B clearItems() { + if (this.items != null) this.items.clear(); + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderBasic.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; + } + } + @java.lang.SuppressWarnings("all") + private static final class ParentBuilderImpl extends SuperBuilderBasic.Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + private ParentBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SuperBuilderBasic.Parent.ParentBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SuperBuilderBasic.Parent build() { + return new SuperBuilderBasic.Parent(this); + } + } + @java.lang.SuppressWarnings("all") + protected Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { + this.field1 = b.field1; + java.util.List items; + switch (b.items == null ? 0 : b.items.size()) { + case 0: + items = java.util.Collections.emptyList(); + break; + case 1: + items = java.util.Collections.singletonList(b.items.get(0)); + break; + default: + items = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.items)); + } + this.items = items; + } + @java.lang.SuppressWarnings("all") + public static SuperBuilderBasic.Parent.ParentBuilder builder() { + return new SuperBuilderBasic.Parent.ParentBuilderImpl(); + } + } + public static class Child extends SuperBuilderBasic.Parent { + double field3; + @java.lang.SuppressWarnings("all") + public static abstract class ChildBuilder> extends SuperBuilderBasic.Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + private double field3; + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected abstract B self(); + @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; + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderBasic.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; + } + } + @java.lang.SuppressWarnings("all") + private static final class ChildBuilderImpl extends SuperBuilderBasic.Child.ChildBuilder { + @java.lang.SuppressWarnings("all") + private ChildBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SuperBuilderBasic.Child.ChildBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SuperBuilderBasic.Child build() { + return new SuperBuilderBasic.Child(this); + } + } + @java.lang.SuppressWarnings("all") + protected Child(final SuperBuilderBasic.Child.ChildBuilder b) { + super(b); + this.field3 = b.field3; + } + @java.lang.SuppressWarnings("all") + public static SuperBuilderBasic.Child.ChildBuilder builder() { + return new SuperBuilderBasic.Child.ChildBuilderImpl(); + } + } + public static void test() { + Child x = Child.builder().field3(0.0).field1(5).item("").build(); + } +} diff --git a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java index 7c1b6ff0..14e2bbf7 100644 --- a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java @@ -1,216 +1,216 @@ -import java.util.List; -public class SuperBuilderBasicToBuilder { - public static class Parent { - private int field1; - int obtainViaField; - int obtainViaMethod; - String obtainViaStaticMethod; - List items; - private int method() { - return 2; - } - private static String staticMethod(Parent instance) { - return "staticMethod"; - } - @java.lang.SuppressWarnings("all") - public static abstract class ParentBuilder> { - @java.lang.SuppressWarnings("all") - private int field1; - @java.lang.SuppressWarnings("all") - private int obtainViaField; - @java.lang.SuppressWarnings("all") - private int obtainViaMethod; - @java.lang.SuppressWarnings("all") - private String obtainViaStaticMethod; - @java.lang.SuppressWarnings("all") - private java.util.ArrayList items; - @java.lang.SuppressWarnings("all") - protected B $fillValuesFrom(final C instance) { - SuperBuilderBasicToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); - return self(); - } - @java.lang.SuppressWarnings("all") - private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Parent instance, final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { - b.field1(instance.field1); - b.obtainViaField(instance.field1); - b.obtainViaMethod(instance.method()); - b.obtainViaStaticMethod(SuperBuilderBasicToBuilder.Parent.staticMethod(instance)); - b.items(instance.items == null ? java.util.Collections.emptyList() : instance.items); - } - @java.lang.SuppressWarnings("all") - 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; - return self(); - } - @java.lang.SuppressWarnings("all") - public B item(final String item) { - if (this.items == null) this.items = new java.util.ArrayList(); - this.items.add(item); - return self(); - } - @java.lang.SuppressWarnings("all") - public B items(final java.util.Collection items) { - if (items == null) { - throw new java.lang.NullPointerException("items cannot be null"); - } - if (this.items == null) this.items = new java.util.ArrayList(); - this.items.addAll(items); - return self(); - } - @java.lang.SuppressWarnings("all") - public B clearItems() { - if (this.items != null) this.items.clear(); - return self(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderBasicToBuilder.Parent.ParentBuilder(field1=" + this.field1 + ", obtainViaField=" + this.obtainViaField + ", obtainViaMethod=" + this.obtainViaMethod + ", obtainViaStaticMethod=" + this.obtainViaStaticMethod + ", items=" + this.items + ")"; - } - } - @java.lang.SuppressWarnings("all") - private static final class ParentBuilderImpl extends SuperBuilderBasicToBuilder.Parent.ParentBuilder { - @java.lang.SuppressWarnings("all") - private ParentBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl self() { - return this; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public SuperBuilderBasicToBuilder.Parent build() { - return new SuperBuilderBasicToBuilder.Parent(this); - } - } - @java.lang.SuppressWarnings("all") - protected Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { - this.field1 = b.field1; - this.obtainViaField = b.obtainViaField; - this.obtainViaMethod = b.obtainViaMethod; - this.obtainViaStaticMethod = b.obtainViaStaticMethod; - java.util.List items; - switch (b.items == null ? 0 : b.items.size()) { - case 0: - items = java.util.Collections.emptyList(); - break; - case 1: - items = java.util.Collections.singletonList(b.items.get(0)); - break; - default: - items = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.items)); - } - this.items = items; - } - @java.lang.SuppressWarnings("all") - public static SuperBuilderBasicToBuilder.Parent.ParentBuilder builder() { - return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl(); - } - @java.lang.SuppressWarnings("all") - public SuperBuilderBasicToBuilder.Parent.ParentBuilder toBuilder() { - return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); - } - } - public static class Child extends Parent { - private double field3; - @java.lang.SuppressWarnings("all") - public static abstract class ChildBuilder> extends Parent.ParentBuilder { - @java.lang.SuppressWarnings("all") - private double field3; - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected B $fillValuesFrom(final C instance) { - super.$fillValuesFrom(instance); - SuperBuilderBasicToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); - return self(); - } - @java.lang.SuppressWarnings("all") - private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Child instance, final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { - b.field3(instance.field3); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected abstract B self(); - @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; - return self(); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderBasicToBuilder.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; - } - } - @java.lang.SuppressWarnings("all") - private static final class ChildBuilderImpl extends SuperBuilderBasicToBuilder.Child.ChildBuilder { - @java.lang.SuppressWarnings("all") - private ChildBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected SuperBuilderBasicToBuilder.Child.ChildBuilderImpl self() { - return this; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public SuperBuilderBasicToBuilder.Child build() { - return new SuperBuilderBasicToBuilder.Child(this); - } - } - @java.lang.SuppressWarnings("all") - protected Child(final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { - super(b); - this.field3 = b.field3; - } - @java.lang.SuppressWarnings("all") - public static SuperBuilderBasicToBuilder.Child.ChildBuilder builder() { - return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl(); - } - @java.lang.SuppressWarnings("all") - public SuperBuilderBasicToBuilder.Child.ChildBuilder toBuilder() { - return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this); - } - } - public static void test() { - Child x = Child.builder().field3(0.0).field1(5).item("").build().toBuilder().build(); - } -} +import java.util.List; +public class SuperBuilderBasicToBuilder { + public static class Parent { + private int field1; + int obtainViaField; + int obtainViaMethod; + String obtainViaStaticMethod; + List items; + private int method() { + return 2; + } + private static String staticMethod(Parent instance) { + return "staticMethod"; + } + @java.lang.SuppressWarnings("all") + public static abstract class ParentBuilder> { + @java.lang.SuppressWarnings("all") + private int field1; + @java.lang.SuppressWarnings("all") + private int obtainViaField; + @java.lang.SuppressWarnings("all") + private int obtainViaMethod; + @java.lang.SuppressWarnings("all") + private String obtainViaStaticMethod; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList items; + @java.lang.SuppressWarnings("all") + protected B $fillValuesFrom(final C instance) { + SuperBuilderBasicToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); + return self(); + } + @java.lang.SuppressWarnings("all") + private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Parent instance, final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { + b.field1(instance.field1); + b.obtainViaField(instance.field1); + b.obtainViaMethod(instance.method()); + b.obtainViaStaticMethod(SuperBuilderBasicToBuilder.Parent.staticMethod(instance)); + b.items(instance.items == null ? java.util.Collections.emptyList() : instance.items); + } + @java.lang.SuppressWarnings("all") + 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; + return self(); + } + @java.lang.SuppressWarnings("all") + public B item(final String item) { + if (this.items == null) this.items = new java.util.ArrayList(); + this.items.add(item); + return self(); + } + @java.lang.SuppressWarnings("all") + public B items(final java.util.Collection items) { + if (items == null) { + throw new java.lang.NullPointerException("items cannot be null"); + } + if (this.items == null) this.items = new java.util.ArrayList(); + this.items.addAll(items); + return self(); + } + @java.lang.SuppressWarnings("all") + public B clearItems() { + if (this.items != null) this.items.clear(); + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderBasicToBuilder.Parent.ParentBuilder(field1=" + this.field1 + ", obtainViaField=" + this.obtainViaField + ", obtainViaMethod=" + this.obtainViaMethod + ", obtainViaStaticMethod=" + this.obtainViaStaticMethod + ", items=" + this.items + ")"; + } + } + @java.lang.SuppressWarnings("all") + private static final class ParentBuilderImpl extends SuperBuilderBasicToBuilder.Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + private ParentBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SuperBuilderBasicToBuilder.Parent build() { + return new SuperBuilderBasicToBuilder.Parent(this); + } + } + @java.lang.SuppressWarnings("all") + protected Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { + this.field1 = b.field1; + this.obtainViaField = b.obtainViaField; + this.obtainViaMethod = b.obtainViaMethod; + this.obtainViaStaticMethod = b.obtainViaStaticMethod; + java.util.List items; + switch (b.items == null ? 0 : b.items.size()) { + case 0: + items = java.util.Collections.emptyList(); + break; + case 1: + items = java.util.Collections.singletonList(b.items.get(0)); + break; + default: + items = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.items)); + } + this.items = items; + } + @java.lang.SuppressWarnings("all") + public static SuperBuilderBasicToBuilder.Parent.ParentBuilder builder() { + return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl(); + } + @java.lang.SuppressWarnings("all") + public SuperBuilderBasicToBuilder.Parent.ParentBuilder toBuilder() { + return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); + } + } + public static class Child extends Parent { + private double field3; + @java.lang.SuppressWarnings("all") + public static abstract class ChildBuilder> extends Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + private double field3; + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected B $fillValuesFrom(final C instance) { + super.$fillValuesFrom(instance); + SuperBuilderBasicToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); + return self(); + } + @java.lang.SuppressWarnings("all") + private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Child instance, final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { + b.field3(instance.field3); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected abstract B self(); + @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; + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderBasicToBuilder.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; + } + } + @java.lang.SuppressWarnings("all") + private static final class ChildBuilderImpl extends SuperBuilderBasicToBuilder.Child.ChildBuilder { + @java.lang.SuppressWarnings("all") + private ChildBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SuperBuilderBasicToBuilder.Child.ChildBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SuperBuilderBasicToBuilder.Child build() { + return new SuperBuilderBasicToBuilder.Child(this); + } + } + @java.lang.SuppressWarnings("all") + protected Child(final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { + super(b); + this.field3 = b.field3; + } + @java.lang.SuppressWarnings("all") + public static SuperBuilderBasicToBuilder.Child.ChildBuilder builder() { + return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl(); + } + @java.lang.SuppressWarnings("all") + public SuperBuilderBasicToBuilder.Child.ChildBuilder toBuilder() { + return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this); + } + } + public static void test() { + Child x = Child.builder().field3(0.0).field1(5).item("").build().toBuilder().build(); + } +} diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomized.java b/test/transform/resource/after-delombok/SuperBuilderCustomized.java index 7d7c4ca8..3a0bbd9b 100644 --- a/test/transform/resource/after-delombok/SuperBuilderCustomized.java +++ b/test/transform/resource/after-delombok/SuperBuilderCustomized.java @@ -1,103 +1,103 @@ -import java.util.List; -public class SuperBuilderCustomized { - public static class Parent { - public static abstract class ParentBuilder> { - @java.lang.SuppressWarnings("all") - private int field1; - public B resetToDefault() { - field1 = 0; - return self(); - } - public B field1(int field1) { - this.field1 = field1 + 1; - return self(); - } - @java.lang.SuppressWarnings("all") - protected abstract B self(); - @java.lang.SuppressWarnings("all") - public abstract C build(); - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "SuperBuilderCustomized.Parent.ParentBuilder(field1=" + this.field1 + ")"; - } - } - int field1; - protected Parent(ParentBuilder b) { - if (b.field1 == 0) throw new IllegalArgumentException("field1 must be != 0"); - this.field1 = b.field1; - } - public static SuperBuilderCustomized.Parent.ParentBuilder builder(int field1) { - return new SuperBuilderCustomized.Parent.ParentBuilderImpl().field1(field1); - } - @java.lang.SuppressWarnings("all") - private static final class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder { - @java.lang.SuppressWarnings("all") - private ParentBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected SuperBuilderCustomized.Parent.ParentBuilderImpl self() { - return this; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public SuperBuilderCustomized.Parent build() { - return new SuperBuilderCustomized.Parent(this); - } - } - } - public static class Child extends Parent { - private static final class ChildBuilderImpl extends ChildBuilder { - @Override - public Child build() { - this.resetToDefault(); - return new Child(this); - } - @java.lang.SuppressWarnings("all") - private ChildBuilderImpl() { - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - protected SuperBuilderCustomized.Child.ChildBuilderImpl self() { - return this; - } - } - double field2; - public static ChildBuilder builder() { - return new Chil