From 2e177996fbec3714650e01138ab41f3fe27bb833 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 7 Aug 2026 01:05:54 +0200 Subject: [PATCH] [promotion] `SuperBuilder` promoted to main package. --- doc/changelog.markdown | 1 + src/core/lombok/SuperBuilder.java | 82 +++++++++ .../lombok/core/LombokInternalAliasing.java | 1 + .../handlers/HandleBuilderDefault.java | 4 +- .../eclipse/handlers/HandleJacksonized.java | 2 +- .../eclipse/handlers/HandleSuperBuilder.java | 3 +- .../lombok/experimental/SuperBuilder.java | 7 +- .../lombok/extern/jackson/Jacksonized.java | 2 +- .../javac/handlers/HandleBuilderDefault.java | 4 +- .../javac/handlers/HandleJacksonized.java | 2 +- .../javac/handlers/HandleSuperBuilder.java | 3 +- .../handlers/HandleSuperBuilderRemove.java | 2 +- .../resource/select/superbuilderField/A.java | 2 +- .../SuperBuilderExperimental.java | 170 ++++++++++++++++++ .../CheckerFrameworkSuperBuilder.java | 4 +- .../ConstructorsWithSuperBuilderDefaults.java | 2 +- .../JacksonizedSuperBuilderSimple.java | 2 +- ...onizedSuperBuilderWithJsonDeserialize.java | 2 +- ...AnnotatedCheckerFrameworkSuperBuilder.java | 4 +- .../after-ecj/SuperBuilderAbstract.java | 6 +- .../SuperBuilderAbstractToBuilder.java | 6 +- .../resource/after-ecj/SuperBuilderBasic.java | 4 +- .../after-ecj/SuperBuilderBasicToBuilder.java | 4 +- .../after-ecj/SuperBuilderCustomName.java | 2 +- .../after-ecj/SuperBuilderCustomized.java | 4 +- ...uperBuilderCustomizedWithSetterPrefix.java | 2 +- .../after-ecj/SuperBuilderExperimental.java | 122 +++++++++++++ .../SuperBuilderInAnonymousClass.java | 2 +- .../after-ecj/SuperBuilderInitializer.java | 2 +- .../after-ecj/SuperBuilderJavadoc.java | 2 +- .../after-ecj/SuperBuilderNameClashes.java | 8 +- .../SuperBuilderNestedGenericTypes.java | 4 +- .../SuperBuilderSingularAnnotatedTypes.java | 2 +- .../SuperBuilderSingularCustomized.java | 2 +- .../SuperBuilderSingularToBuilderGuava.java | 4 +- .../SuperBuilderWithAnnotatedTypeParam.java | 4 +- .../SuperBuilderWithArrayTypeParam.java | 4 +- ...uperBuilderWithCustomBuilderClassName.java | 4 +- .../SuperBuilderWithCustomBuilderMethod.java | 4 +- .../after-ecj/SuperBuilderWithDefaults.java | 4 +- ...perBuilderWithDefaultsAndTargetTyping.java | 4 +- .../SuperBuilderWithExistingConstructor.java | 2 +- .../after-ecj/SuperBuilderWithGenerics.java | 4 +- .../after-ecj/SuperBuilderWithGenerics2.java | 4 +- .../after-ecj/SuperBuilderWithGenerics3.java | 4 +- .../SuperBuilderWithGenericsAndToBuilder.java | 4 +- .../after-ecj/SuperBuilderWithNonNull.java | 4 +- ...BuilderWithOverloadedGeneratedMethods.java | 4 +- .../after-ecj/SuperBuilderWithPrefixes.java | 2 +- .../SuperBuilderWithSetterPrefix.java | 4 +- .../before/CheckerFrameworkSuperBuilder.java | 4 +- .../ConstructorsWithSuperBuilderDefaults.java | 2 +- .../before/JacksonizedSuperBuilderSimple.java | 2 +- ...onizedSuperBuilderWithJsonDeserialize.java | 2 +- ...AnnotatedCheckerFrameworkSuperBuilder.java | 4 +- .../resource/before/SuperBuilderAbstract.java | 6 +- .../before/SuperBuilderAbstractToBuilder.java | 6 +- .../resource/before/SuperBuilderBasic.java | 4 +- .../before/SuperBuilderBasicToBuilder.java | 4 +- .../before/SuperBuilderCustomName.java | 2 +- .../before/SuperBuilderCustomized.java | 4 +- ...uperBuilderCustomizedWithSetterPrefix.java | 2 +- .../before/SuperBuilderExperimental.java | 18 ++ .../before/SuperBuilderInAnonymousClass.java | 2 +- .../before/SuperBuilderInitializer.java | 2 +- .../resource/before/SuperBuilderJavadoc.java | 2 +- .../before/SuperBuilderNameClashes.java | 8 +- .../SuperBuilderNestedGenericTypes.java | 4 +- .../resource/before/SuperBuilderOnRecord.java | 2 +- .../SuperBuilderSingularAnnotatedTypes.java | 2 +- .../SuperBuilderSingularCustomized.java | 2 +- .../SuperBuilderSingularToBuilderGuava.java | 4 +- .../SuperBuilderWithAnnotatedTypeParam.java | 4 +- .../SuperBuilderWithArrayTypeParam.java | 4 +- ...uperBuilderWithCustomBuilderClassName.java | 4 +- .../SuperBuilderWithCustomBuilderMethod.java | 4 +- .../before/SuperBuilderWithDefaults.java | 4 +- ...perBuilderWithDefaultsAndTargetTyping.java | 4 +- .../SuperBuilderWithExistingConstructor.java | 2 +- .../before/SuperBuilderWithGenerics.java | 4 +- .../before/SuperBuilderWithGenerics2.java | 4 +- .../before/SuperBuilderWithGenerics3.java | 4 +- .../SuperBuilderWithGenericsAndToBuilder.java | 4 +- .../before/SuperBuilderWithNonNull.java | 4 +- ...BuilderWithOverloadedGeneratedMethods.java | 4 +- .../before/SuperBuilderWithPrefixes.java | 2 +- .../before/SuperBuilderWithSetterPrefix.java | 4 +- 87 files changed, 535 insertions(+), 140 deletions(-) create mode 100644 src/core/lombok/SuperBuilder.java create mode 100644 test/transform/resource/after-delombok/SuperBuilderExperimental.java create mode 100644 test/transform/resource/after-ecj/SuperBuilderExperimental.java create mode 100644 test/transform/resource/before/SuperBuilderExperimental.java diff --git a/doc/changelog.markdown b/doc/changelog.markdown index e47cf16a..618cf710 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -3,6 +3,7 @@ Lombok Changelog ### v1.18.47 "Edgy Guinea Pig" * BUGFIX: `@SneakyThrows` usage on JDK26 no longer results in class files that require `lombok.jar` to be on the runtime classpath (which should not be neccessary). [#4040](https://github.com/projectlombok/lombok/issues/4022). +* PROMOTION: `@SuperBuilder` has been promoted to the main package. Otherwise, no changes have been made to the annotation. The old experimental annotation will remain for a few versions, at which point it will be marked as a deprecated annotation. Eventually it'll be removed. If you had `lombok.config` configuration for this annotation, the configuration keys for this feature have been renamed. ### v1.18.46 (April 22nd, 2026) * PLATFORM: JDK26 support added [#4019](https://github.com/projectlombok/lombok/issues/4019). diff --git a/src/core/lombok/SuperBuilder.java b/src/core/lombok/SuperBuilder.java new file mode 100644 index 00000000..62a94056 --- /dev/null +++ b/src/core/lombok/SuperBuilder.java @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2018-2026 The Project Lombok Authors. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok; + +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.*; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * The SuperBuilder annotation creates a so-called 'builder' aspect to the class that is annotated with {@code @SuperBuilder}, but which works well when extending. + * It is similar to {@code @Builder}, except it is only legal on types, is less configurable, but allows you to {@code extends} other builder-able classes. + *

+ * All classes in the hierarchy must be annotated with {@code @SuperBuilder}. + *

+ * Lombok generates 2 inner 'builder' classes, which extend the parent class' builder class (unless your class doesn't have an extends clause). + * Lombok also generates a static method named {@code builder()}, and a protected constructor that takes 1 argument of the builderclass type. + *

+ * The TBuilder class contains 1 method for each parameter of the annotated + * constructor / method (each field, when annotating a class), which returns the builder itself. + * The builder also has a {@code build()} method which returns a completed instance of the original type. + *

+ * Complete documentation is found at the project lombok features page for @SuperBuilder. + * + * @see Singular + */ +@Target(TYPE) +@Retention(SOURCE) +public @interface SuperBuilder { + /** @return Name of the method that creates a new builder instance. Default: {@code builder}. If the empty string, suppress generating the {@code builder} method. */ + String builderMethodName() default "builder"; + + /** @return Name of the method in the builder class that creates an instance of your {@code @Builder}-annotated class. */ + String buildMethodName() default "build"; + + /** + * If {@code true}, generate an instance method to obtain a builder that is initialized with the values of this instance. + * In this case, all superclasses must also have {@code toBuilder=true}. + * + * @return Whether to generate a {@code toBuilder()} method. + */ + boolean toBuilder() default false; + + /** + * Prefix to prepend to 'set' methods in the generated builder class. By default, generated methods do not include a prefix. + * + * For example, a method normally generated as {@code someField(String someField)} would instead be + * generated as {@code withSomeField(String someField)} if using {@code @SuperBuilder(setterPrefix = "with")}. + * + * Note that using "with" to prefix builder setter methods is strongly discouraged as "with" normally + * suggests immutable data structures, and builders by definition are mutable objects. + * + * For {@code @Singular} fields, the generated methods are called {@code withName}, {@code withNames}, and {@code clearNames}, instead of + * the default {@code name}, {@code names}, and {@code clearNames}. + * + * This prefix only applies to the 'set' methods for the fields of the annotated class. + * For consistency reasons, you should use the same prefix on all superclasses and subclasses that use {@code @SuperBuilder}. + * + * @return The prefix to prepend to generated method names. + */ + String setterPrefix() default ""; +} diff --git a/src/core/lombok/core/LombokInternalAliasing.java b/src/core/lombok/core/LombokInternalAliasing.java index 60dea0f2..f31e7363 100644 --- a/src/core/lombok/core/LombokInternalAliasing.java +++ b/src/core/lombok/core/LombokInternalAliasing.java @@ -47,6 +47,7 @@ public class LombokInternalAliasing { m1.put("lombok.experimental.var", "lombok.var"); m1.put("lombok.Delegate", "lombok.experimental.Delegate"); m1.put("lombok.experimental.Wither", "lombok.With"); + m1.put("lombok.experimental.SuperBuilder", "lombok.SuperBuilder"); ALIASES = Collections.unmodifiableMap(m1); Map> m2 = new HashMap>(); diff --git a/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java b/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java index 464a0efd..a3584ef7 100644 --- a/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java @@ -30,7 +30,7 @@ import lombok.core.AnnotationValues; import lombok.core.HandlerPriority; import lombok.eclipse.EclipseAnnotationHandler; import lombok.eclipse.EclipseNode; -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; import lombok.spi.Provides; @Provides @@ -41,7 +41,7 @@ public class HandleBuilderDefault extends EclipseAnnotationHandler { } @Override public void handle(AnnotationValues annotation, Annotation ast, EclipseNode annotationNode) { - handleExperimentalFlagUsage(annotationNode, ConfigurationKeys.SUPERBUILDER_FLAG_USAGE, "@SuperBuilder"); SuperBuilderJob job = new SuperBuilderJob(); job.sourceNode = annotationNode; job.source = ast; diff --git a/src/core/lombok/experimental/SuperBuilder.java b/src/core/lombok/experimental/SuperBuilder.java index 630fb73b..6fd3da90 100644 --- a/src/core/lombok/experimental/SuperBuilder.java +++ b/src/core/lombok/experimental/SuperBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2025 The Project Lombok Authors. + * Copyright (C) 2018-2026 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -33,6 +33,8 @@ import lombok.Singular; * The SuperBuilder annotation creates a so-called 'builder' aspect to the class that is annotated with {@code @SuperBuilder}, but which works well when extending. * It is similar to {@code @Builder}, except it is only legal on types, is less configurable, but allows you to {@code extends} other builder-able classes. *

+ * NB: {@code @SuperBuilder} has been moved to the main package; update your lombok dependencies and search/replace all {@code import lombok.experimental.SuperBuilder} to {@code import lombok.SuperBuilder}. + *

* All classes in the hierarchy must be annotated with {@code @SuperBuilder}. *

* Lombok generates 2 inner 'builder' classes, which extend the parent class' builder class (unless your class doesn't have an extends clause). @@ -42,10 +44,11 @@ import lombok.Singular; * constructor / method (each field, when annotating a class), which returns the builder itself. * The builder also has a {@code build()} method which returns a completed instance of the original type. *

- * Complete documentation is found at the project lombok features page for @SuperBuilder. + * Complete documentation is found at the project lombok features page for @SuperBuilder. * * @see Singular */ +// @Deprecated // First release on or after 2027-06-01: Deprecate this type, with text: @deprecated {@code SuperBuilder} has been promoted to the main package; use {@link lombok.SuperBuilder} instead. @Target(TYPE) @Retention(SOURCE) public @interface SuperBuilder { diff --git a/src/core/lombok/extern/jackson/Jacksonized.java b/src/core/lombok/extern/jackson/Jacksonized.java index 059c93d7..d75b327f 100644 --- a/src/core/lombok/extern/jackson/Jacksonized.java +++ b/src/core/lombok/extern/jackson/Jacksonized.java @@ -29,7 +29,7 @@ import java.lang.annotation.Target; import lombok.Builder; import lombok.experimental.Accessors; -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; /** * The {@code @Jacksonized} annotation is an add-on annotation for diff --git a/src/core/lombok/javac/handlers/HandleBuilderDefault.java b/src/core/lombok/javac/handlers/HandleBuilderDefault.java index 8438057a..bf7435f5 100644 --- a/src/core/lombok/javac/handlers/HandleBuilderDefault.java +++ b/src/core/lombok/javac/handlers/HandleBuilderDefault.java @@ -31,7 +31,7 @@ import lombok.Builder; import lombok.core.AST.Kind; import lombok.core.AnnotationValues; import lombok.core.HandlerPriority; -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; import lombok.javac.JavacAnnotationHandler; import lombok.javac.JavacNode; import lombok.spi.Provides; @@ -44,7 +44,7 @@ public class HandleBuilderDefault extends JavacAnnotationHandler { @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { - handleExperimentalFlagUsage(annotationNode, ConfigurationKeys.SUPERBUILDER_FLAG_USAGE, "@SuperBuilder"); SuperBuilderJob job = new SuperBuilderJob(); job.sourceNode = annotationNode; job.checkerFramework = getCheckerFrameworkVersion(annotationNode); diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilderRemove.java b/src/core/lombok/javac/handlers/HandleSuperBuilderRemove.java index d3db5ef4..483de6e1 100644 --- a/src/core/lombok/javac/handlers/HandleSuperBuilderRemove.java +++ b/src/core/lombok/javac/handlers/HandleSuperBuilderRemove.java @@ -28,7 +28,7 @@ import com.sun.tools.javac.tree.JCTree.JCAnnotation; import lombok.core.AlreadyHandledAnnotations; import lombok.core.AnnotationValues; import lombok.core.HandlerPriority; -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; import lombok.javac.JavacAnnotationHandler; import lombok.javac.JavacNode; import lombok.spi.Provides; diff --git a/test/eclipse/resource/select/superbuilderField/A.java b/test/eclipse/resource/select/superbuilderField/A.java index d9df476c..a0da1323 100644 --- a/test/eclipse/resource/select/superbuilderField/A.java +++ b/test/eclipse/resource/select/superbuilderField/A.java @@ -1,6 +1,6 @@ package pkg; -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; @SuperBuilder public class A { diff --git a/test/transform/resource/after-delombok/SuperBuilderExperimental.java b/test/transform/resource/after-delombok/SuperBuilderExperimental.java new file mode 100644 index 00000000..67f51a64 --- /dev/null +++ b/test/transform/resource/after-delombok/SuperBuilderExperimental.java @@ -0,0 +1,170 @@ +import java.util.List; +public class SuperBuilderExperimental { + public static class Parent { + int field1; + List items; + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static abstract class ParentBuilder> { + @java.lang.SuppressWarnings("all") + @lombok.Generated + private int field1; + @java.lang.SuppressWarnings("all") + @lombok.Generated + private java.util.ArrayList items; + /** + * @return {@code this}. + */ + @java.lang.SuppressWarnings("all") + @lombok.Generated + public B field1(final int field1) { + this.field1 = field1; + return self(); + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + 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") + @lombok.Generated + 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") + @lombok.Generated + public B clearItems() { + if (this.items != null) this.items.clear(); + return self(); + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected abstract B self(); + @java.lang.SuppressWarnings("all") + @lombok.Generated + public abstract C build(); + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public java.lang.String toString() { + return "SuperBuilderExperimental.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + private static final class ParentBuilderImpl extends SuperBuilderExperimental.Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + @lombok.Generated + private ParentBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected SuperBuilderExperimental.Parent.ParentBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public SuperBuilderExperimental.Parent build() { + return new SuperBuilderExperimental.Parent(this); + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected Parent(final SuperBuilderExperimental.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") + @lombok.Generated + public static SuperBuilderExperimental.Parent.ParentBuilder builder() { + return new SuperBuilderExperimental.Parent.ParentBuilderImpl(); + } + } + public static class Child extends SuperBuilderExperimental.Parent { + double field3; + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static abstract class ChildBuilder> extends SuperBuilderExperimental.Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + @lombok.Generated + private double field3; + /** + * @return {@code this}. + */ + @java.lang.SuppressWarnings("all") + @lombok.Generated + public B field3(final double field3) { + this.field3 = field3; + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected abstract B self(); + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public abstract C build(); + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public java.lang.String toString() { + return "SuperBuilderExperimental.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + private static final class ChildBuilderImpl extends SuperBuilderExperimental.Child.ChildBuilder { + @java.lang.SuppressWarnings("all") + @lombok.Generated + private ChildBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected SuperBuilderExperimental.Child.ChildBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public SuperBuilderExperimental.Child build() { + return new SuperBuilderExperimental.Child(this); + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected Child(final SuperBuilderExperimental.Child.ChildBuilder b) { + super(b); + this.field3 = b.field3; + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static SuperBuilderExperimental.Child.ChildBuilder builder() { + return new SuperBuilderExperimental.Child.ChildBuilderImpl(); + } + } + public static void test() { + Child x = Child.builder().field3(0.0).field1(5).item("").build(); + } +} diff --git a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java index 4a7c9b35..d142ae3d 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java @@ -1,7 +1,7 @@ import java.util.List; import lombok.Singular; class CheckerFrameworkSuperBuilder { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; @@ -103,7 +103,7 @@ class CheckerFrameworkSuperBuilder { return new CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class ZChild extends Parent { + public static @lombok.SuperBuilder class ZChild extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ZChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated int a$value; private @java.lang.SuppressWarnings("all") @lombok.Generated boolean a$set; diff --git a/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java b/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java index 6c9b8b81..de7b17c2 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java +++ b/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java @@ -1,6 +1,6 @@ import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; import lombok.Builder; @NoArgsConstructor @AllArgsConstructor @SuperBuilder class ConstructorsWithSuperBuilderDefaults { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorsWithSuperBuilderDefaultsBuilder> { diff --git a/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java b/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java index b9ee4cdd..468c7054 100644 --- a/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java +++ b/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java @@ -1,5 +1,5 @@ public class JacksonizedSuperBuilderSimple { - public static @lombok.extern.jackson.Jacksonized @lombok.experimental.SuperBuilder @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl.class) @tools.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl.class) class Parent { + public static @lombok.extern.jackson.Jacksonized @lombok.SuperBuilder @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl.class) @tools.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl.class) class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public ParentBuilder() { diff --git a/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java b/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java index b991dbf6..a6d5d3f7 100644 --- a/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java +++ b/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java @@ -1,4 +1,4 @@ -public @lombok.extern.jackson.Jacksonized @lombok.experimental.SuperBuilder @com.fasterxml.jackson.databind.annotation.JsonDeserialize class JacksonizedSuperBuilderWithJsonDeserialize { +public @lombok.extern.jackson.Jacksonized @lombok.SuperBuilder @com.fasterxml.jackson.databind.annotation.JsonDeserialize class JacksonizedSuperBuilderWithJsonDeserialize { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class JacksonizedSuperBuilderWithJsonDeserializeBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public JacksonizedSuperBuilderWithJsonDeserializeBuilder() { diff --git a/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java b/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java index 62984573..2e268e1f 100644 --- a/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java @@ -1,7 +1,7 @@ import java.util.List; import lombok.Singular; class NullAnnotatedCheckerFrameworkSuperBuilder { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; @@ -103,7 +103,7 @@ class NullAnnotatedCheckerFrameworkSuperBuilder { return new NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class ZChild extends Parent { + public static @lombok.SuperBuilder class ZChild extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ZChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated int a$value; private @java.lang.SuppressWarnings("all") @lombok.Generated boolean a$set; diff --git a/test/transform/resource/after-ecj/SuperBuilderAbstract.java b/test/transform/resource/after-ecj/SuperBuilderAbstract.java index 1370ed55..dc6c02a5 100644 --- a/test/transform/resource/after-ecj/SuperBuilderAbstract.java +++ b/test/transform/resource/after-ecj/SuperBuilderAbstract.java @@ -1,5 +1,5 @@ public class SuperBuilderAbstract { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int parentField; public ParentBuilder() { @@ -38,7 +38,7 @@ public class SuperBuilderAbstract { return new SuperBuilderAbstract.Parent.ParentBuilderImpl(); } } - public static abstract @lombok.experimental.SuperBuilder class Child extends Parent { + public static abstract @lombok.SuperBuilder class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double childField; public ChildBuilder() { @@ -63,7 +63,7 @@ public class SuperBuilderAbstract { this.childField = b.childField; } } - public static @lombok.experimental.SuperBuilder class GrandChild extends Child { + public static @lombok.SuperBuilder class GrandChild extends Child { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GrandChildBuilder> extends Child.ChildBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated String grandChildField; public GrandChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java index 7467c511..201c5585 100644 --- a/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java @@ -1,5 +1,5 @@ public class SuperBuilderAbstractToBuilder { - public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { + public static @lombok.SuperBuilder(toBuilder = true) class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int parentField; public ParentBuilder() { @@ -48,7 +48,7 @@ public class SuperBuilderAbstractToBuilder { return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl(); } } - public static abstract @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { + public static abstract @lombok.SuperBuilder(toBuilder = true) class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double childField; public ChildBuilder() { @@ -81,7 +81,7 @@ public class SuperBuilderAbstractToBuilder { this.childField = b.childField; } } - public static @lombok.experimental.SuperBuilder(toBuilder = true) class GrandChild extends Child { + public static @lombok.SuperBuilder(toBuilder = true) class GrandChild extends Child { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GrandChildBuilder> extends Child.ChildBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated String grandChildField; public GrandChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderBasic.java b/test/transform/resource/after-ecj/SuperBuilderBasic.java index 7cc0e350..33d41058 100644 --- a/test/transform/resource/after-ecj/SuperBuilderBasic.java +++ b/test/transform/resource/after-ecj/SuperBuilderBasic.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderBasic { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; @@ -74,7 +74,7 @@ public class SuperBuilderBasic { return new SuperBuilderBasic.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class Child extends SuperBuilderBasic.Parent { + public static @lombok.SuperBuilder class Child extends SuperBuilderBasic.Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends SuperBuilderBasic.Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java index 2d9262db..e9f26718 100644 --- a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderBasicToBuilder { - public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { + public static @lombok.SuperBuilder(toBuilder = true) class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; private @java.lang.SuppressWarnings("all") @lombok.Generated int obtainViaField; @@ -124,7 +124,7 @@ public class SuperBuilderBasicToBuilder { return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { + public static @lombok.SuperBuilder(toBuilder = true) class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomName.java b/test/transform/resource/after-ecj/SuperBuilderCustomName.java index 528db4f3..f69e4d6e 100644 --- a/test/transform/resource/after-ecj/SuperBuilderCustomName.java +++ b/test/transform/resource/after-ecj/SuperBuilderCustomName.java @@ -1,5 +1,5 @@ import java.util.List; -@lombok.experimental.SuperBuilder class SuperBuilderCustomName { +@lombok.SuperBuilder class SuperBuilderCustomName { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SimpleTestBuilder, B extends SuperBuilderCustomName.SimpleTestBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int field; public SimpleTestBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomized.java b/test/transform/resource/after-ecj/SuperBuilderCustomized.java index 2fd55627..96ff5c74 100644 --- a/test/transform/resource/after-ecj/SuperBuilderCustomized.java +++ b/test/transform/resource/after-ecj/SuperBuilderCustomized.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderCustomized { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public ParentBuilder() { @@ -42,7 +42,7 @@ public class SuperBuilderCustomized { return new SuperBuilderCustomized.Parent.ParentBuilderImpl().field1(field1); } } - public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static @lombok.SuperBuilder class Child extends Parent { private static final class ChildBuilderImpl extends ChildBuilder { private ChildBuilderImpl() { super(); diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java b/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java index 6337df34..022324e6 100644 --- a/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderCustomizedWithSetterPrefix { - public static @lombok.experimental.SuperBuilder(setterPrefix = "set") class Parent { + public static @lombok.SuperBuilder(setterPrefix = "set") class Parent { public static abstract class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public ParentBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderExperimental.java b/test/transform/resource/after-ecj/SuperBuilderExperimental.java new file mode 100644 index 00000000..3652bc03 --- /dev/null +++ b/test/transform/resource/after-ecj/SuperBuilderExperimental.java @@ -0,0 +1,122 @@ +import java.util.List; +public class SuperBuilderExperimental { + public static @lombok.experimental.SuperBuilder class Parent { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; + public ParentBuilder() { + super(); + } + /** + * @return {@code this}. + */ + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final int field1) { + this.field1 = field1; + return self(); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { + if ((this.items == null)) + this.items = new java.util.ArrayList(); + this.items.add(item); + return self(); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated 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(); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { + if ((this.items != null)) + this.items.clear(); + return self(); + } + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { + return (((("SuperBuilderExperimental.Parent.ParentBuilder(field1=" + this.field1) + ", items=") + this.items) + ")"); + } + } + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderExperimental.Parent.ParentBuilder { + private ParentBuilderImpl() { + super(); + } + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderExperimental.Parent.ParentBuilderImpl self() { + return this; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderExperimental.Parent build() { + return new SuperBuilderExperimental.Parent(this); + } + } + int field1; + @lombok.Singular List items; + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderExperimental.Parent.ParentBuilder b) { + super(); + 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; + } + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderExperimental.Parent.ParentBuilder builder() { + return new SuperBuilderExperimental.Parent.ParentBuilderImpl(); + } + } + public static @lombok.experimental.SuperBuilder class Child extends SuperBuilderExperimental.Parent { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends SuperBuilderExperimental.Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; + public ChildBuilder() { + super(); + } + /** + * @return {@code this}. + */ + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { + this.field3 = field3; + return self(); + } + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { + return (((("SuperBuilderExperimental.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); + } + } + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderExperimental.Child.ChildBuilder { + private ChildBuilderImpl() { + super(); + } + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderExperimental.Child.ChildBuilderImpl self() { + return this; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderExperimental.Child build() { + return new SuperBuilderExperimental.Child(this); + } + } + double field3; + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderExperimental.Child.ChildBuilder b) { + super(b); + this.field3 = b.field3; + } + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderExperimental.Child.ChildBuilder builder() { + return new SuperBuilderExperimental.Child.ChildBuilderImpl(); + } + } + public SuperBuilderExperimental() { + super(); + } + public static void test() { + Child x = Child.builder().field3(0.0).field1(5).item("").build(); + } +} diff --git a/test/transform/resource/after-ecj/SuperBuilderInAnonymousClass.java b/test/transform/resource/after-ecj/SuperBuilderInAnonymousClass.java index 238f42df..a89771b5 100644 --- a/test/transform/resource/after-ecj/SuperBuilderInAnonymousClass.java +++ b/test/transform/resource/after-ecj/SuperBuilderInAnonymousClass.java @@ -1,4 +1,4 @@ -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; public class SuperBuilderInAnonymousClass { Object annonymous = new Object() { @SuperBuilder class InnerParent { diff --git a/test/transform/resource/after-ecj/SuperBuilderInitializer.java b/test/transform/resource/after-ecj/SuperBuilderInitializer.java index ce637899..3eabdb15 100644 --- a/test/transform/resource/after-ecj/SuperBuilderInitializer.java +++ b/test/transform/resource/after-ecj/SuperBuilderInitializer.java @@ -1,4 +1,4 @@ -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; class SuperBuilderInitializer { public static @SuperBuilder class One { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class OneBuilder> { diff --git a/test/transform/resource/after-ecj/SuperBuilderJavadoc.java b/test/transform/resource/after-ecj/SuperBuilderJavadoc.java index ab65e7bc..cc773076 100644 --- a/test/transform/resource/after-ecj/SuperBuilderJavadoc.java +++ b/test/transform/resource/after-ecj/SuperBuilderJavadoc.java @@ -1,5 +1,5 @@ import java.util.List; -public abstract @lombok.experimental.SuperBuilder class SuperBuilderJavadoc { +public abstract @lombok.SuperBuilder class SuperBuilderJavadoc { public static abstract class SuperBuilderJavadocBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int basic; private @java.lang.SuppressWarnings("all") @lombok.Generated int getsetwith; diff --git a/test/transform/resource/after-ecj/SuperBuilderNameClashes.java b/test/transform/resource/after-ecj/SuperBuilderNameClashes.java index 5ef99a56..1fd933ab 100644 --- a/test/transform/resource/after-ecj/SuperBuilderNameClashes.java +++ b/test/transform/resource/after-ecj/SuperBuilderNameClashes.java @@ -1,5 +1,5 @@ public class SuperBuilderNameClashes { - public static @lombok.experimental.SuperBuilder class GenericsClash { + public static @lombok.SuperBuilder class GenericsClash { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GenericsClashBuilder, B2 extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder> { public GenericsClashBuilder() { super(); @@ -28,7 +28,7 @@ public class SuperBuilderNameClashes { return new SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class B { + public static @lombok.SuperBuilder class B { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class BBuilder> { public BBuilder() { super(); @@ -62,7 +62,7 @@ public class SuperBuilderNameClashes { super(); } } - public static @lombok.experimental.SuperBuilder class C { + public static @lombok.SuperBuilder class C { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class CBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated C2 c2; public CBuilder() { @@ -107,7 +107,7 @@ public class SuperBuilderNameClashes { } interface B3 { } - public static @lombok.experimental.SuperBuilder class ExtendsClauseCollision extends B implements B2.B4, B3 { + public static @lombok.SuperBuilder class ExtendsClauseCollision extends B implements B2.B4, B3 { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ExtendsClauseCollisionBuilder> extends B.BBuilder { public ExtendsClauseCollisionBuilder() { super(); diff --git a/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java b/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java index 5a175532..ac08c7a6 100644 --- a/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java +++ b/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java @@ -1,5 +1,5 @@ public class SuperBuilderNestedGenericTypes { - public static abstract @lombok.experimental.SuperBuilder class Generic> { + public static abstract @lombok.SuperBuilder class Generic> { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GenericBuilder, C extends SuperBuilderNestedGenericTypes.Generic, B extends SuperBuilderNestedGenericTypes.Generic.GenericBuilder> { public GenericBuilder() { super(); @@ -14,7 +14,7 @@ public class SuperBuilderNestedGenericTypes { super(); } } - public static abstract @lombok.experimental.SuperBuilder class NestedGeneric> extends Generic>> { + public static abstract @lombok.SuperBuilder class NestedGeneric> extends Generic>> { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class NestedGenericBuilder, C extends SuperBuilderNestedGenericTypes.NestedGeneric, B extends SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder> extends Generic.GenericBuilder>, C, B> { public NestedGenericBuilder() { super(); diff --git a/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java b/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java index 6c03494a..b035d87d 100644 --- a/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java @@ -6,7 +6,7 @@ import lombok.NonNull; import lombok.Singular; @Target(ElementType.TYPE_USE) @interface MyAnnotation { } -@lombok.experimental.SuperBuilder class SuperBuilderSingularAnnotatedTypes { +@lombok.SuperBuilder class SuperBuilderSingularAnnotatedTypes { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderSingularAnnotatedTypesBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> foos; private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; diff --git a/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java b/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java index 551fdc5d..ed5b3fc8 100644 --- a/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java +++ b/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java @@ -1,5 +1,5 @@ import java.util.Set; -@lombok.experimental.SuperBuilder class SuperBuilderSingularCustomized { +@lombok.SuperBuilder class SuperBuilderSingularCustomized { public static abstract class SuperBuilderSingularCustomizedBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList foos; public SuperBuilderSingularCustomizedBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java b/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java index d007fa22..5cc007a6 100644 --- a/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java +++ b/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java @@ -1,5 +1,5 @@ public class SuperBuilderSingularToBuilderGuava { - public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { + public static @lombok.SuperBuilder(toBuilder = true) class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder cards; private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder frogs; @@ -162,7 +162,7 @@ public class SuperBuilderSingularToBuilderGuava { return new SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { + public static @lombok.SuperBuilder(toBuilder = true) class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java b/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java index 27691d0b..5f4a3d0f 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java @@ -8,7 +8,7 @@ import java.util.List; public class SuperBuilderWithAnnotatedTypeParam { public @Documented @Target({ElementType.TYPE_USE, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface MyAnnotation { } - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; public ParentBuilder() { @@ -47,7 +47,7 @@ public class SuperBuilderWithAnnotatedTypeParam { return new SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class Child extends Parent<@MyAnnotation String> { + public static @lombok.SuperBuilder class Child extends Parent<@MyAnnotation String> { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder<@MyAnnotation String, C, B> { private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderWithArrayTypeParam.java b/test/transform/resource/after-ecj/SuperBuilderWithArrayTypeParam.java index 578f62c7..f5e79edd 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithArrayTypeParam.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithArrayTypeParam.java @@ -1,6 +1,6 @@ //version 8: public class SuperBuilderWithArrayTypeParam { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithArrayTypeParam.Parent.ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; public ParentBuilder() { @@ -39,7 +39,7 @@ public class SuperBuilderWithArrayTypeParam { return new SuperBuilderWithArrayTypeParam.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static @lombok.SuperBuilder class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java index d60c08ff..ae80b4b8 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java @@ -1,5 +1,5 @@ class SuperBuilderWithCustomBuilderClassName { - static @lombok.experimental.SuperBuilder class SuperClass { + static @lombok.SuperBuilder class SuperClass { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class Builder> { public Builder() { super(); @@ -28,7 +28,7 @@ class SuperBuilderWithCustomBuilderClassName { return new SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl(); } } - static @lombok.experimental.SuperBuilder class SubClass extends SuperClass { + static @lombok.SuperBuilder class SubClass extends SuperClass { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class Builder> extends SuperClass.Builder { public Builder() { super(); diff --git a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java index bda0f840..dfe5b2b7 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderWithCustomBuilderMethod { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; @@ -74,7 +74,7 @@ public class SuperBuilderWithCustomBuilderMethod { return new SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static @lombok.SuperBuilder class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java index 73771675..6ee28b71 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderWithDefaults { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithDefaults.Parent.ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated long millis$value; private @java.lang.SuppressWarnings("all") @lombok.Generated boolean millis$set; @@ -65,7 +65,7 @@ public class SuperBuilderWithDefaults { return new SuperBuilderWithDefaults.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static @lombok.SuperBuilder class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double doubleField$value; private @java.lang.SuppressWarnings("all") @lombok.Generated boolean doubleField$set; diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java index e5a7602e..37c3d5cb 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java @@ -1,7 +1,7 @@ import java.util.Arrays; import lombok.Builder; public class SuperBuilderWithDefaultsAndTargetTyping { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated String foo$value; private @java.lang.SuppressWarnings("all") @lombok.Generated boolean foo$set; @@ -48,7 +48,7 @@ public class SuperBuilderWithDefaultsAndTargetTyping { return new SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static @lombok.SuperBuilder class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated String foo$value; private @java.lang.SuppressWarnings("all") @lombok.Generated boolean foo$set; diff --git a/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java b/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java index 1d35434e..e6bcf92b 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java @@ -1,4 +1,4 @@ -public @lombok.experimental.SuperBuilder class SuperBuilderWithExistingConstructor { +public @lombok.SuperBuilder class SuperBuilderWithExistingConstructor { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderWithExistingConstructorBuilder> { public SuperBuilderWithExistingConstructorBuilder() { super(); diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java index 4c254905..b3694753 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderWithGenerics { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenerics.Parent.ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; @@ -74,7 +74,7 @@ public class SuperBuilderWithGenerics { return new SuperBuilderWithGenerics.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static @lombok.SuperBuilder class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithGenerics.Child.ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java index 0a3f8c84..db28dafd 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderWithGenerics2 { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenerics2.Parent.ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; @@ -74,7 +74,7 @@ public class SuperBuilderWithGenerics2 { return new SuperBuilderWithGenerics2.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder(builderMethodName = "builder2") class Child extends Parent { + public static @lombok.SuperBuilder(builderMethodName = "builder2") class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithGenerics2.Child.ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated A field3; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java index 0f3cf788..ac88f08c 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderWithGenerics3 { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenerics3.Parent.ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated String str; public ParentBuilder() { @@ -39,7 +39,7 @@ public class SuperBuilderWithGenerics3 { return new SuperBuilderWithGenerics3.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static @lombok.SuperBuilder class Child extends Parent { public static class SomeInnerStaticClass { public SomeInnerStaticClass() { super(); diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java index dba6c743..0f401df9 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java @@ -1,6 +1,6 @@ import java.util.Map; public class SuperBuilderWithGenericsAndToBuilder { - public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { + public static @lombok.SuperBuilder(toBuilder = true) class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items$key; @@ -103,7 +103,7 @@ public class SuperBuilderWithGenericsAndToBuilder { return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { + public static @lombok.SuperBuilder(toBuilder = true) class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java index 85410ccf..22b1f10a 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderWithNonNull { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated String nonNullParentField$value; private @java.lang.SuppressWarnings("all") @lombok.Generated boolean nonNullParentField$set; @@ -55,7 +55,7 @@ public class SuperBuilderWithNonNull { return new SuperBuilderWithNonNull.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static @lombok.SuperBuilder class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated String nonNullChildField; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java b/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java index 3d2dffb4..f960aa3b 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java @@ -1,5 +1,5 @@ public class SuperBuilderWithOverloadedGeneratedMethods { - public static @lombok.experimental.SuperBuilder class Parent { + public static @lombok.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int self; public ParentBuilder() { @@ -38,7 +38,7 @@ public class SuperBuilderWithOverloadedGeneratedMethods { return new SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static @lombok.SuperBuilder class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double build; public ChildBuilder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java b/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java index ef266001..7b4ef554 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java @@ -1,4 +1,4 @@ -@lombok.experimental.SuperBuilder class SuperBuilderWithPrefixes { +@lombok.SuperBuilder class SuperBuilderWithPrefixes { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderWithPrefixesBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int field; private @java.lang.SuppressWarnings("all") @lombok.Generated int otherField; diff --git a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java index 3742c8a4..daead4ed 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java @@ -1,6 +1,6 @@ import java.util.List; public class SuperBuilderWithSetterPrefix { - public static @lombok.experimental.SuperBuilder(toBuilder = true,setterPrefix = "with") class Parent { + public static @lombok.SuperBuilder(toBuilder = true,setterPrefix = "with") class Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; private @java.lang.SuppressWarnings("all") @lombok.Generated int obtainViaField; @@ -124,7 +124,7 @@ public class SuperBuilderWithSetterPrefix { return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl(); } } - public static @lombok.experimental.SuperBuilder(toBuilder = true,setterPrefix = "set") class Child extends Parent { + public static @lombok.SuperBuilder(toBuilder = true,setterPrefix = "set") class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { diff --git a/test/transform/resource/before/CheckerFrameworkSuperBuilder.java b/test/transform/resource/before/CheckerFrameworkSuperBuilder.java index fefff676..fdf8e86a 100644 --- a/test/transform/resource/before/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/before/CheckerFrameworkSuperBuilder.java @@ -4,7 +4,7 @@ import java.util.List; import lombok.Singular; class CheckerFrameworkSuperBuilder { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { @lombok.Builder.Default int x = 5; int y; @@ -12,7 +12,7 @@ class CheckerFrameworkSuperBuilder { @Singular List names; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class ZChild extends Parent { @lombok.Builder.Default int a = 1; int b; diff --git a/test/transform/resource/before/ConstructorsWithSuperBuilderDefaults.java b/test/transform/resource/before/ConstructorsWithSuperBuilderDefaults.java index a214132a..5a57c4f9 100644 --- a/test/transform/resource/before/ConstructorsWithSuperBuilderDefaults.java +++ b/test/transform/resource/before/ConstructorsWithSuperBuilderDefaults.java @@ -1,6 +1,6 @@ import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; import lombok.Builder; @NoArgsConstructor diff --git a/test/transform/resource/before/JacksonizedSuperBuilderSimple.java b/test/transform/resource/before/JacksonizedSuperBuilderSimple.java index 74290afe..e1240508 100644 --- a/test/transform/resource/before/JacksonizedSuperBuilderSimple.java +++ b/test/transform/resource/before/JacksonizedSuperBuilderSimple.java @@ -3,7 +3,7 @@ //version 8: Jackson deps are at least Java7+. public class JacksonizedSuperBuilderSimple { @lombok.extern.jackson.Jacksonized - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) public static class Parent { int field1; diff --git a/test/transform/resource/before/JacksonizedSuperBuilderWithJsonDeserialize.java b/test/transform/resource/before/JacksonizedSuperBuilderWithJsonDeserialize.java index ac0dba07..03faa790 100644 --- a/test/transform/resource/before/JacksonizedSuperBuilderWithJsonDeserialize.java +++ b/test/transform/resource/before/JacksonizedSuperBuilderWithJsonDeserialize.java @@ -1,6 +1,6 @@ //version 8: Jackson deps are at least Java7+. @lombok.extern.jackson.Jacksonized -@lombok.experimental.SuperBuilder +@lombok.SuperBuilder @com.fasterxml.jackson.databind.annotation.JsonDeserialize public class JacksonizedSuperBuilderWithJsonDeserialize { int field1; diff --git a/test/transform/resource/before/NullAnnotatedCheckerFrameworkSuperBuilder.java b/test/transform/resource/before/NullAnnotatedCheckerFrameworkSuperBuilder.java index eea118cb..68268e0f 100644 --- a/test/transform/resource/before/NullAnnotatedCheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/before/NullAnnotatedCheckerFrameworkSuperBuilder.java @@ -4,7 +4,7 @@ import java.util.List; import lombok.Singular; class NullAnnotatedCheckerFrameworkSuperBuilder { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { @lombok.Builder.Default int x = 5; int y; @@ -12,7 +12,7 @@ class NullAnnotatedCheckerFrameworkSuperBuilder { @Singular List names; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class ZChild extends Parent { @lombok.Builder.Default int a = 1; int b; diff --git a/test/transform/resource/before/SuperBuilderAbstract.java b/test/transform/resource/before/SuperBuilderAbstract.java index 23f284e2..e778a51e 100644 --- a/test/transform/resource/before/SuperBuilderAbstract.java +++ b/test/transform/resource/before/SuperBuilderAbstract.java @@ -1,15 +1,15 @@ public class SuperBuilderAbstract { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { int parentField; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public abstract static class Child extends Parent { double childField; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class GrandChild extends Child { String grandChildField; } diff --git a/test/transform/resource/before/SuperBuilderAbstractToBuilder.java b/test/transform/resource/before/SuperBuilderAbstractToBuilder.java index 3359829c..8f78e085 100644 --- a/test/transform/resource/before/SuperBuilderAbstractToBuilder.java +++ b/test/transform/resource/before/SuperBuilderAbstractToBuilder.java @@ -1,15 +1,15 @@ public class SuperBuilderAbstractToBuilder { - @lombok.experimental.SuperBuilder(toBuilder = true) + @lombok.SuperBuilder(toBuilder = true) public static class Parent { int parentField; } - @lombok.experimental.SuperBuilder(toBuilder = true) + @lombok.SuperBuilder(toBuilder = true) public abstract static class Child extends Parent { double childField; } - @lombok.experimental.SuperBuilder(toBuilder = true) + @lombok.SuperBuilder(toBuilder = true) public static class GrandChild extends Child { String grandChildField; } diff --git a/test/transform/resource/before/SuperBuilderBasic.java b/test/transform/resource/before/SuperBuilderBasic.java index 99d7284e..d5fbdea1 100644 --- a/test/transform/resource/before/SuperBuilderBasic.java +++ b/test/transform/resource/before/SuperBuilderBasic.java @@ -1,13 +1,13 @@ import java.util.List; public class SuperBuilderBasic { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { int field1; @lombok.Singular List items; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends SuperBuilderBasic.Parent { double field3; } diff --git a/test/transform/resource/before/SuperBuilderBasicToBuilder.java b/test/transform/resource/before/SuperBuilderBasicToBuilder.java index bd97876e..66adb654 100644 --- a/test/transform/resource/before/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/before/SuperBuilderBasicToBuilder.java @@ -1,7 +1,7 @@ import java.util.List; public class SuperBuilderBasicToBuilder { - @lombok.experimental.SuperBuilder(toBuilder=true) + @lombok.SuperBuilder(toBuilder=true) public static class Parent { private int field1; @lombok.Builder.ObtainVia(field="field1") @@ -21,7 +21,7 @@ public class SuperBuilderBasicToBuilder { } } - @lombok.experimental.SuperBuilder(toBuilder=true) + @lombok.SuperBuilder(toBuilder=true) public static class Child extends Parent { private double field3; } diff --git a/test/transform/resource/before/SuperBuilderCustomName.java b/test/transform/resource/before/SuperBuilderCustomName.java index 7308e282..44ca4b50 100644 --- a/test/transform/resource/before/SuperBuilderCustomName.java +++ b/test/transform/resource/before/SuperBuilderCustomName.java @@ -1,7 +1,7 @@ //CONF: lombok.builder.className = SimpleTestBuilder import java.util.List; -@lombok.experimental.SuperBuilder +@lombok.SuperBuilder class SuperBuilderCustomName { private final int field; } diff --git a/test/transform/resource/before/SuperBuilderCustomized.java b/test/transform/resource/before/SuperBuilderCustomized.java index 652d0865..533097a2 100644 --- a/test/transform/resource/before/SuperBuilderCustomized.java +++ b/test/transform/resource/before/SuperBuilderCustomized.java @@ -2,7 +2,7 @@ import java.util.List; public class SuperBuilderCustomized { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { public static abstract class ParentBuilder> { public B resetToDefault() { @@ -27,7 +27,7 @@ public class SuperBuilderCustomized { } } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends Parent { private static final class ChildBuilderImpl extends ChildBuilder { @Override diff --git a/test/transform/resource/before/SuperBuilderCustomizedWithSetterPrefix.java b/test/transform/resource/before/SuperBuilderCustomizedWithSetterPrefix.java index be2cfc4a..ec1a87f3 100644 --- a/test/transform/resource/before/SuperBuilderCustomizedWithSetterPrefix.java +++ b/test/transform/resource/before/SuperBuilderCustomizedWithSetterPrefix.java @@ -1,7 +1,7 @@ import java.util.List; public class SuperBuilderCustomizedWithSetterPrefix { - @lombok.experimental.SuperBuilder(setterPrefix = "set") + @lombok.SuperBuilder(setterPrefix = "set") public static class Parent { public static abstract class ParentBuilder> { public B setField1(int field1) { diff --git a/test/transform/resource/before/SuperBuilderExperimental.java b/test/transform/resource/before/SuperBuilderExperimental.java new file mode 100644 index 00000000..616f5455 --- /dev/null +++ b/test/transform/resource/before/SuperBuilderExperimental.java @@ -0,0 +1,18 @@ +import java.util.List; + +public class SuperBuilderExperimental { + @lombok.experimental.SuperBuilder + public static class Parent { + int field1; + @lombok.Singular List items; + } + + @lombok.experimental.SuperBuilder + public static class Child extends SuperBuilderExperimental.Parent { + double field3; + } + + public static void test() { + Child x = Child.builder().field3(0.0).field1(5).item("").build(); + } +} diff --git a/test/transform/resource/before/SuperBuilderInAnonymousClass.java b/test/transform/resource/before/SuperBuilderInAnonymousClass.java index bff871aa..39914319 100644 --- a/test/transform/resource/before/SuperBuilderInAnonymousClass.java +++ b/test/transform/resource/before/SuperBuilderInAnonymousClass.java @@ -1,4 +1,4 @@ -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; public class SuperBuilderInAnonymousClass { Object annonymous = new Object() { diff --git a/test/transform/resource/before/SuperBuilderInitializer.java b/test/transform/resource/before/SuperBuilderInitializer.java index 966a4daf..f6620384 100644 --- a/test/transform/resource/before/SuperBuilderInitializer.java +++ b/test/transform/resource/before/SuperBuilderInitializer.java @@ -1,4 +1,4 @@ -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; class SuperBuilderInitializer { @SuperBuilder diff --git a/test/transform/resource/before/SuperBuilderJavadoc.java b/test/transform/resource/before/SuperBuilderJavadoc.java index cea46eb4..843aaa4f 100644 --- a/test/transform/resource/before/SuperBuilderJavadoc.java +++ b/test/transform/resource/before/SuperBuilderJavadoc.java @@ -1,6 +1,6 @@ import java.util.List; -@lombok.experimental.SuperBuilder +@lombok.SuperBuilder public abstract class SuperBuilderJavadoc { /** * basic gets only a builder setter. diff --git a/test/transform/resource/before/SuperBuilderNameClashes.java b/test/transform/resource/before/SuperBuilderNameClashes.java index ec3afbb8..a5001567 100644 --- a/test/transform/resource/before/SuperBuilderNameClashes.java +++ b/test/transform/resource/before/SuperBuilderNameClashes.java @@ -1,16 +1,16 @@ public class SuperBuilderNameClashes { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class GenericsClash { } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class B { } public static class C2 { } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class C { C2 c2; } @@ -23,7 +23,7 @@ public class SuperBuilderNameClashes { interface B3 { } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class ExtendsClauseCollision extends B implements B2.B4, B3 { } } diff --git a/test/transform/resource/before/SuperBuilderNestedGenericTypes.java b/test/transform/resource/before/SuperBuilderNestedGenericTypes.java index c463357e..b5f0e3f9 100644 --- a/test/transform/resource/before/SuperBuilderNestedGenericTypes.java +++ b/test/transform/resource/before/SuperBuilderNestedGenericTypes.java @@ -1,9 +1,9 @@ public class SuperBuilderNestedGenericTypes { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static abstract class Generic> { } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static abstract class NestedGeneric> extends Generic>> { } diff --git a/test/transform/resource/before/SuperBuilderOnRecord.java b/test/transform/resource/before/SuperBuilderOnRecord.java index 23e5efac..78b5e2ec 100644 --- a/test/transform/resource/before/SuperBuilderOnRecord.java +++ b/test/transform/resource/before/SuperBuilderOnRecord.java @@ -1,7 +1,7 @@ // skip compare content // version 14: -import lombok.experimental.SuperBuilder; +import lombok.SuperBuilder; @SuperBuilder record SuperBuilderOnRecord(String a, String b) { diff --git a/test/transform/resource/before/SuperBuilderSingularAnnotatedTypes.java b/test/transform/resource/before/SuperBuilderSingularAnnotatedTypes.java index 097f4e60..f327be3a 100644 --- a/test/transform/resource/before/SuperBuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/before/SuperBuilderSingularAnnotatedTypes.java @@ -7,7 +7,7 @@ import lombok.NonNull; import lombok.Singular; @Target(ElementType.TYPE_USE) @interface MyAnnotation {} -@lombok.experimental.SuperBuilder +@lombok.SuperBuilder class SuperBuilderSingularAnnotatedTypes { @Singular private Set<@MyAnnotation @NonNull String> foos; @Singular private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; diff --git a/test/transform/resource/before/SuperBuilderSingularCustomized.java b/test/transform/resource/before/SuperBuilderSingularCustomized.java index 86b6022a..01dfa2ee 100644 --- a/test/transform/resource/before/SuperBuilderSingularCustomized.java +++ b/test/transform/resource/before/SuperBuilderSingularCustomized.java @@ -1,5 +1,5 @@ import java.util.Set; -@lombok.experimental.SuperBuilder +@lombok.SuperBuilder class SuperBuilderSingularCustomized { @lombok.Singular private Set foos; public static abstract class SuperBuilderSingularCustomizedBuilder> { diff --git a/test/transform/resource/before/SuperBuilderSingularToBuilderGuava.java b/test/transform/resource/before/SuperBuilderSingularToBuilderGuava.java index 7e5b51f2..497afa6a 100644 --- a/test/transform/resource/before/SuperBuilderSingularToBuilderGuava.java +++ b/test/transform/resource/before/SuperBuilderSingularToBuilderGuava.java @@ -1,5 +1,5 @@ public class SuperBuilderSingularToBuilderGuava { - @lombok.experimental.SuperBuilder(toBuilder=true) + @lombok.SuperBuilder(toBuilder=true) public static class Parent { @lombok.Singular private com.google.common.collect.ImmutableList cards; @lombok.Singular private com.google.common.collect.ImmutableCollection frogs; @@ -8,7 +8,7 @@ public class SuperBuilderSingularToBuilderGuava { @lombok.Singular private com.google.common.collect.ImmutableTable users; } - @lombok.experimental.SuperBuilder(toBuilder=true) + @lombok.SuperBuilder(toBuilder=true) public static class Child extends Parent { private double field3; } diff --git a/test/transform/resource/before/SuperBuilderWithAnnotatedTypeParam.java b/test/transform/resource/before/SuperBuilderWithAnnotatedTypeParam.java index 4f5bed50..1cd37ea5 100644 --- a/test/transform/resource/before/SuperBuilderWithAnnotatedTypeParam.java +++ b/test/transform/resource/before/SuperBuilderWithAnnotatedTypeParam.java @@ -13,12 +13,12 @@ public class SuperBuilderWithAnnotatedTypeParam { public @interface MyAnnotation { } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { A field1; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends Parent<@MyAnnotation String> { double field3; } diff --git a/test/transform/resource/before/SuperBuilderWithArrayTypeParam.java b/test/transform/resource/before/SuperBuilderWithArrayTypeParam.java index 9d85a8a5..ad278832 100644 --- a/test/transform/resource/before/SuperBuilderWithArrayTypeParam.java +++ b/test/transform/resource/before/SuperBuilderWithArrayTypeParam.java @@ -1,11 +1,11 @@ //version 8: public class SuperBuilderWithArrayTypeParam { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { A field1; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends Parent { double field3; } diff --git a/test/transform/resource/before/SuperBuilderWithCustomBuilderClassName.java b/test/transform/resource/before/SuperBuilderWithCustomBuilderClassName.java index 23590045..1c6674d4 100644 --- a/test/transform/resource/before/SuperBuilderWithCustomBuilderClassName.java +++ b/test/transform/resource/before/SuperBuilderWithCustomBuilderClassName.java @@ -1,9 +1,9 @@ //CONF: lombok.builder.className=Builder class SuperBuilderWithCustomBuilderClassName { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder static class SuperClass { } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder static class SubClass extends SuperClass { } } diff --git a/test/transform/resource/before/SuperBuilderWithCustomBuilderMethod.java b/test/transform/resource/before/SuperBuilderWithCustomBuilderMethod.java index b828eafe..a26bd6c8 100644 --- a/test/transform/resource/before/SuperBuilderWithCustomBuilderMethod.java +++ b/test/transform/resource/before/SuperBuilderWithCustomBuilderMethod.java @@ -2,13 +2,13 @@ import java.util.List; public class SuperBuilderWithCustomBuilderMethod { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { A field1; @lombok.Singular List items; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends Parent { double field3; public static ChildBuilder builder() { diff --git a/test/transform/resource/before/SuperBuilderWithDefaults.java b/test/transform/resource/before/SuperBuilderWithDefaults.java index d6859a78..0c378d77 100644 --- a/test/transform/resource/before/SuperBuilderWithDefaults.java +++ b/test/transform/resource/before/SuperBuilderWithDefaults.java @@ -1,13 +1,13 @@ import java.util.List; public class SuperBuilderWithDefaults { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { @lombok.Builder.Default private long millis = System.currentTimeMillis(); @lombok.Builder.Default private N numberField = null; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends Parent { @lombok.Builder.Default private double doubleField = Math.PI; } diff --git a/test/transform/resource/before/SuperBuilderWithDefaultsAndTargetTyping.java b/test/transform/resource/before/SuperBuilderWithDefaultsAndTargetTyping.java index 996615b6..09b415a9 100644 --- a/test/transform/resource/before/SuperBuilderWithDefaultsAndTargetTyping.java +++ b/test/transform/resource/before/SuperBuilderWithDefaultsAndTargetTyping.java @@ -2,12 +2,12 @@ import java.util.Arrays; import lombok.Builder; public class SuperBuilderWithDefaultsAndTargetTyping { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { @lombok.Builder.Default private String foo = doSth(Arrays.asList(1), Arrays.asList('a')); } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends Parent { @lombok.Builder.Default private String foo = doSth(Arrays.asList(1), Arrays.asList('a')); } diff --git a/test/transform/resource/before/SuperBuilderWithExistingConstructor.java b/test/transform/resource/before/SuperBuilderWithExistingConstructor.java index d6bfe2ec..a3163f42 100644 --- a/test/transform/resource/before/SuperBuilderWithExistingConstructor.java +++ b/test/transform/resource/before/SuperBuilderWithExistingConstructor.java @@ -1,4 +1,4 @@ -@lombok.experimental.SuperBuilder +@lombok.SuperBuilder public class SuperBuilderWithExistingConstructor { public SuperBuilderWithExistingConstructor() { } diff --git a/test/transform/resource/before/SuperBuilderWithGenerics.java b/test/transform/resource/before/SuperBuilderWithGenerics.java index c3cd4277..ddfd9dfd 100644 --- a/test/transform/resource/before/SuperBuilderWithGenerics.java +++ b/test/transform/resource/before/SuperBuilderWithGenerics.java @@ -1,13 +1,13 @@ import java.util.List; public class SuperBuilderWithGenerics { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { A field1; @lombok.Singular List items; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends Parent { double field3; } diff --git a/test/transform/resource/before/SuperBuilderWithGenerics2.java b/test/transform/resource/before/SuperBuilderWithGenerics2.java index f84ff1f5..e6eadfac 100644 --- a/test/transform/resource/before/SuperBuilderWithGenerics2.java +++ b/test/transform/resource/before/SuperBuilderWithGenerics2.java @@ -1,13 +1,13 @@ import java.util.List; public class SuperBuilderWithGenerics2 { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { A field1; @lombok.Singular List items; } - @lombok.experimental.SuperBuilder(builderMethodName="builder2") + @lombok.SuperBuilder(builderMethodName="builder2") public static class Child extends Parent { A field3; } diff --git a/test/transform/resource/before/SuperBuilderWithGenerics3.java b/test/transform/resource/before/SuperBuilderWithGenerics3.java index f2cd25c3..9d5350a9 100644 --- a/test/transform/resource/before/SuperBuilderWithGenerics3.java +++ b/test/transform/resource/before/SuperBuilderWithGenerics3.java @@ -1,12 +1,12 @@ import java.util.List; public class SuperBuilderWithGenerics3 { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { private final String str; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends Parent { public static class SomeInnerStaticClass { } double field3; diff --git a/test/transform/resource/before/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/before/SuperBuilderWithGenericsAndToBuilder.java index 1f2caf6d..66838cef 100644 --- a/test/transform/resource/before/SuperBuilderWithGenericsAndToBuilder.java +++ b/test/transform/resource/before/SuperBuilderWithGenericsAndToBuilder.java @@ -1,13 +1,13 @@ import java.util.Map; public class SuperBuilderWithGenericsAndToBuilder { - @lombok.experimental.SuperBuilder(toBuilder = true) + @lombok.SuperBuilder(toBuilder = true) public static class Parent { A field1; @lombok.Singular Map items; } - @lombok.experimental.SuperBuilder(toBuilder = true) + @lombok.SuperBuilder(toBuilder = true) public static class Child extends Parent { double field3; } diff --git a/test/transform/resource/before/SuperBuilderWithNonNull.java b/test/transform/resource/before/SuperBuilderWithNonNull.java index 7287c688..5c1fab6f 100644 --- a/test/transform/resource/before/SuperBuilderWithNonNull.java +++ b/test/transform/resource/before/SuperBuilderWithNonNull.java @@ -2,14 +2,14 @@ import java.util.List; public class SuperBuilderWithNonNull { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { @lombok.NonNull @lombok.Builder.Default final String nonNullParentField = "default"; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends Parent { @lombok.NonNull String nonNullChildField; diff --git a/test/transform/resource/before/SuperBuilderWithOverloadedGeneratedMethods.java b/test/transform/resource/before/SuperBuilderWithOverloadedGeneratedMethods.java index be6fea6a..8e90fd6a 100644 --- a/test/transform/resource/before/SuperBuilderWithOverloadedGeneratedMethods.java +++ b/test/transform/resource/before/SuperBuilderWithOverloadedGeneratedMethods.java @@ -1,10 +1,10 @@ public class SuperBuilderWithOverloadedGeneratedMethods { - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Parent { int self; } - @lombok.experimental.SuperBuilder + @lombok.SuperBuilder public static class Child extends Parent { double build; } diff --git a/test/transform/resource/before/SuperBuilderWithPrefixes.java b/test/transform/resource/before/SuperBuilderWithPrefixes.java index b15c9607..95c95b61 100644 --- a/test/transform/resource/before/SuperBuilderWithPrefixes.java +++ b/test/transform/resource/before/SuperBuilderWithPrefixes.java @@ -1,6 +1,6 @@ //CONF: lombok.accessors.prefix += m //CONF: lombok.accessors.prefix += x -@lombok.experimental.SuperBuilder +@lombok.SuperBuilder class SuperBuilderWithPrefixes { int mField; int xOtherField; diff --git a/test/transform/resource/before/SuperBuilderWithSetterPrefix.java b/test/transform/resource/before/SuperBuilderWithSetterPrefix.java index 5eaef360..99669474 100644 --- a/test/transform/resource/before/SuperBuilderWithSetterPrefix.java +++ b/test/transform/resource/before/SuperBuilderWithSetterPrefix.java @@ -1,7 +1,7 @@ import java.util.List; public class SuperBuilderWithSetterPrefix { - @lombok.experimental.SuperBuilder(toBuilder=true, setterPrefix = "with") + @lombok.SuperBuilder(toBuilder=true, setterPrefix = "with") public static class Parent { private int field1; @lombok.Builder.ObtainVia(field="field1") @@ -21,7 +21,7 @@ public class SuperBuilderWithSetterPrefix { } } - @lombok.experimental.SuperBuilder(toBuilder=true, setterPrefix = "set") + @lombok.SuperBuilder(toBuilder=true, setterPrefix = "set") public static class Child extends Parent { private double field3; }