From 9aac454aecafa2ea831af914161326295db5e481 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 4 Dec 2017 21:41:22 +0100 Subject: fixing tests to account for generation of javax.annotation.Generated and ConstructorProperties being default-off. --- .../resource/after-delombok/Accessors.java | 16 ----- .../after-delombok/AccessorsConfiguration.java | 4 -- .../after-delombok/BuilderChainAndFluent.java | 9 --- .../resource/after-delombok/BuilderComplex.java | 13 ---- .../resource/after-delombok/BuilderDefaults.java | 23 ------- .../after-delombok/BuilderDefaultsWarnings.java | 20 ------ .../after-delombok/BuilderInstanceMethod.java | 13 ---- .../resource/after-delombok/BuilderSimple.java | 11 ---- .../BuilderSingularGuavaListsSets.java | 27 -------- .../after-delombok/BuilderSingularGuavaMaps.java | 19 ------ .../after-delombok/BuilderSingularLists.java | 19 ------ .../after-delombok/BuilderSingularMaps.java | 1 - .../after-delombok/BuilderSingularNoAuto.java | 19 ------ .../BuilderSingularRedirectToGuava.java | 19 ------ .../after-delombok/BuilderSingularSets.java | 23 ------- .../BuilderSingularWithPrefixes.java | 11 ---- .../resource/after-delombok/BuilderValueData.java | 21 ------ .../after-delombok/BuilderWithAccessors.java | 15 ----- .../after-delombok/BuilderWithDeprecated.java | 19 ------ .../BuilderWithExistingBuilderClass.java | 8 --- .../BuilderWithRecursiveGenerics.java | 16 ----- .../after-delombok/BuilderWithToBuilder.java | 38 ----------- .../after-delombok/BuilderWithTolerate.java | 8 --- .../after-delombok/ClassNamedAfterGetter.java | 1 - .../after-delombok/CommentsInterspersed.java | 1 - .../ConflictingStaticConstructorNames.java | 5 -- .../resource/after-delombok/Constructors.java | 21 ------ .../after-delombok/ConstructorsConfiguration.java | 1 - .../after-delombok/ConstructorsWithAccessors.java | 6 +- .../resource/after-delombok/DataConfiguration.java | 6 -- .../resource/after-delombok/DataExtended.java | 7 -- .../resource/after-delombok/DataIgnore.java | 7 -- .../resource/after-delombok/DataOnEnum.java | 4 -- .../resource/after-delombok/DataOnLocalClass.java | 21 ------ .../resource/after-delombok/DataPlain.java | 41 ------------ .../resource/after-delombok/DataWithGetter.java | 11 ---- .../after-delombok/DataWithGetterNone.java | 8 --- .../resource/after-delombok/DelegateOnGetter.java | 3 - .../after-delombok/DelegateOnGetterNone.java | 2 - .../resource/after-delombok/DelegateOnMethods.java | 1 - .../after-delombok/DelegateTypesAndExcludes.java | 2 - .../after-delombok/DelegateWithDeprecated.java | 3 - .../after-delombok/DelegateWithVarargs.java | 4 -- .../resource/after-delombok/EncodingUsAscii.java | 1 - .../resource/after-delombok/EncodingUtf8.java | 1 - .../resource/after-delombok/EqualsAndHashCode.java | 11 ---- .../EqualsAndHashCodeConfigKeys1.java | 6 -- .../EqualsAndHashCodeConfigKeys2.java | 9 --- .../EqualsAndHashCodeNestedShadow.java | 6 -- .../EqualsAndHashCodeOfAndExclude.java | 4 -- .../EqualsAndHashCodeWithExistingMethods.java | 2 - .../EqualsAndHashCodeWithOnParam.java | 3 - ...efaultsViaConfigAndRequiredArgsConstructor.java | 2 - .../after-delombok/GenerateSuppressFBWarnings.java | 1 - .../resource/after-delombok/GetterAccessLevel.java | 9 --- .../after-delombok/GetterAlreadyExists.java | 10 --- .../resource/after-delombok/GetterBoolean.java | 4 -- .../resource/after-delombok/GetterDeprecated.java | 2 - .../resource/after-delombok/GetterEnum.java | 4 -- .../resource/after-delombok/GetterLazy.java | 1 - .../resource/after-delombok/GetterLazyBoolean.java | 6 -- .../after-delombok/GetterLazyEahcToString.java | 6 -- .../resource/after-delombok/GetterLazyInvalid.java | 1 - .../resource/after-delombok/GetterLazyNative.java | 9 --- .../after-delombok/GetterLazyTransient.java | 2 - .../resource/after-delombok/GetterNone.java | 1 - .../resource/after-delombok/GetterOnClass.java | 8 --- .../resource/after-delombok/GetterOnMethod.java | 3 - .../after-delombok/GetterOnMethodErrors.java | 1 - .../after-delombok/GetterOnMethodErrors2.java | 8 --- .../resource/after-delombok/GetterOnStatic.java | 2 - .../resource/after-delombok/GetterPlain.java | 2 - .../after-delombok/GetterSetterJavadoc.java | 15 ----- .../resource/after-delombok/GetterWithDollar.java | 3 - .../resource/after-delombok/InjectField.java | 6 -- .../resource/after-delombok/LoggerCommons.java | 3 - .../resource/after-delombok/LoggerConfig.java | 1 - .../resource/after-delombok/LoggerJBossLog.java | 4 -- .../resource/after-delombok/LoggerJul.java | 3 - .../resource/after-delombok/LoggerLog4j.java | 3 - .../resource/after-delombok/LoggerLog4j2.java | 3 - .../resource/after-delombok/LoggerSlf4j.java | 4 -- .../resource/after-delombok/LoggerSlf4jTypes.java | 3 - .../after-delombok/LoggerSlf4jWithPackage.java | 2 - .../resource/after-delombok/LoggerXSlf4j.java | 3 - .../resource/after-delombok/MixGetterVal.java | 1 - .../resource/after-delombok/MultiFieldGetter.java | 4 -- .../after-delombok/NoArgsConstructorForce.java | 1 - .../resource/after-delombok/NonNullPlain.java | 8 --- .../NonNullWithAlternateException.java | 1 - .../resource/after-delombok/OnXJava7Style.java | 5 -- .../resource/after-delombok/OnXJava8Style.java | 5 -- .../resource/after-delombok/SetterAccessLevel.java | 5 -- .../after-delombok/SetterAlreadyExists.java | 2 - .../resource/after-delombok/SetterDeprecated.java | 2 - .../resource/after-delombok/SetterOnClass.java | 8 --- .../after-delombok/SetterOnMethodOnParam.java | 3 - .../resource/after-delombok/SetterOnStatic.java | 2 - .../resource/after-delombok/SetterPlain.java | 2 - .../resource/after-delombok/SetterWithDollar.java | 3 - .../after-delombok/SimpleTypeResolution.java | 1 - .../resource/after-delombok/SynchronizedPlain.java | 2 - .../after-delombok/ToStringConfiguration.java | 5 -- .../resource/after-delombok/ToStringInner.java | 4 -- .../resource/after-delombok/ToStringPlain.java | 2 - .../resource/after-delombok/Tolerate.java | 6 -- .../after-delombok/TrickyTypeResolution.java | 1 - .../resource/after-delombok/UtilityClass.java | 4 -- .../resource/after-delombok/ValueCallSuper.java | 5 -- .../resource/after-delombok/ValueExperimental.java | 8 --- .../ValueExperimentalStarImport.java | 4 -- .../resource/after-delombok/ValuePlain.java | 22 ------- .../resource/after-delombok/ValueStaticField.java | 4 -- .../resource/after-delombok/WitherAccessLevel.java | 5 -- .../after-delombok/WitherAlreadyExists.java | 2 - .../WitherAndAllArgsConstructor.java | 4 -- .../resource/after-delombok/WitherDeprecated.java | 2 - .../resource/after-delombok/WitherOnClass.java | 6 -- .../resource/after-delombok/WitherPlain.java | 2 - .../after-delombok/WitherWithAbstract.java | 1 - .../after-delombok/WitherWithGenerics.java | 3 - test/transform/resource/after-ecj/Accessors.java | 32 ++++----- .../resource/after-ecj/AccessorsConfiguration.java | 8 +-- .../resource/after-ecj/BuilderChainAndFluent.java | 16 ++--- .../resource/after-ecj/BuilderComplex.java | 26 ++++---- .../resource/after-ecj/BuilderDefaults.java | 44 ++++++------- .../after-ecj/BuilderDefaultsWarnings.java | 38 +++++------ .../resource/after-ecj/BuilderInstanceMethod.java | 26 ++++---- .../resource/after-ecj/BuilderSimple.java | 20 +++--- .../after-ecj/BuilderSingularGuavaListsSets.java | 52 +++++++-------- .../after-ecj/BuilderSingularGuavaMaps.java | 36 +++++----- .../resource/after-ecj/BuilderSingularLists.java | 36 +++++----- .../resource/after-ecj/BuilderSingularMaps.java | 52 +++++++-------- .../resource/after-ecj/BuilderSingularNoAuto.java | 36 +++++----- .../after-ecj/BuilderSingularRedirectToGuava.java | 36 +++++----- .../resource/after-ecj/BuilderSingularSets.java | 44 ++++++------- .../after-ecj/BuilderSingularWithPrefixes.java | 20 +++--- .../resource/after-ecj/BuilderValueData.java | 42 ++++++------ .../resource/after-ecj/BuilderWithAccessors.java | 28 ++++---- .../resource/after-ecj/BuilderWithDeprecated.java | 36 +++++----- .../after-ecj/BuilderWithExistingBuilderClass.java | 16 ++--- .../after-ecj/BuilderWithRecursiveGenerics.java | 30 ++++----- .../resource/after-ecj/BuilderWithToBuilder.java | 74 ++++++++++----------- .../resource/after-ecj/BuilderWithTolerate.java | 14 ++-- .../resource/after-ecj/ClassNamedAfterGetter.java | 2 +- .../resource/after-ecj/CommentsInterspersed.java | 2 +- .../ConflictingStaticConstructorNames.java | 10 +-- .../transform/resource/after-ecj/Constructors.java | 26 ++++---- .../after-ecj/ConstructorsConfiguration.java | 2 +- .../after-ecj/ConstructorsWithAccessors.java | 4 +- .../resource/after-ecj/DataConfiguration.java | 12 ++-- .../transform/resource/after-ecj/DataExtended.java | 14 ++-- test/transform/resource/after-ecj/DataIgnore.java | 12 ++-- test/transform/resource/after-ecj/DataOnEnum.java | 6 +- .../resource/after-ecj/DataOnLocalClass.java | 42 ++++++------ test/transform/resource/after-ecj/DataPlain.java | 76 +++++++++++----------- .../resource/after-ecj/DataWithGetter.java | 20 +++--- .../resource/after-ecj/DataWithGetterNone.java | 14 ++-- .../resource/after-ecj/DelegateOnGetter.java | 6 +- .../resource/after-ecj/DelegateOnGetterNone.java | 4 +- .../resource/after-ecj/DelegateOnMethods.java | 2 +- .../after-ecj/DelegateTypesAndExcludes.java | 4 +- .../resource/after-ecj/DelegateWithDeprecated.java | 6 +- .../resource/after-ecj/DelegateWithVarargs.java | 8 +-- .../resource/after-ecj/EqualsAndHashCode.java | 22 +++---- .../after-ecj/EqualsAndHashCodeConfigKeys1.java | 12 ++-- .../after-ecj/EqualsAndHashCodeConfigKeys2.java | 18 ++--- .../after-ecj/EqualsAndHashCodeNestedShadow.java | 12 ++-- .../after-ecj/EqualsAndHashCodeOfAndExclude.java | 8 +-- .../EqualsAndHashCodeWithExistingMethods.java | 4 +- .../after-ecj/EqualsAndHashCodeWithOnParam.java | 6 +- ...efaultsViaConfigAndRequiredArgsConstructor.java | 2 +- .../after-ecj/GenerateSuppressFBWarnings.java | 2 +- .../resource/after-ecj/GetterAccessLevel.java | 18 ++--- .../resource/after-ecj/GetterAlreadyExists.java | 20 +++--- .../resource/after-ecj/GetterBoolean.java | 8 +-- .../resource/after-ecj/GetterDeprecated.java | 4 +- test/transform/resource/after-ecj/GetterEnum.java | 6 +- test/transform/resource/after-ecj/GetterLazy.java | 2 +- .../resource/after-ecj/GetterLazyBoolean.java | 12 ++-- .../resource/after-ecj/GetterLazyEahcToString.java | 12 ++-- .../resource/after-ecj/GetterLazyInvalid.java | 2 +- .../resource/after-ecj/GetterLazyNative.java | 18 ++--- .../resource/after-ecj/GetterLazyTransient.java | 4 +- test/transform/resource/after-ecj/GetterNone.java | 2 +- .../resource/after-ecj/GetterOnClass.java | 16 ++--- .../resource/after-ecj/GetterOnMethod.java | 6 +- .../resource/after-ecj/GetterOnMethodErrors.java | 2 +- .../resource/after-ecj/GetterOnMethodErrors2.java | 16 ++--- .../resource/after-ecj/GetterOnStatic.java | 4 +- test/transform/resource/after-ecj/GetterPlain.java | 4 +- .../resource/after-ecj/GetterSetterJavadoc.java | 30 ++++----- .../resource/after-ecj/GetterWithDollar.java | 6 +- .../transform/resource/after-ecj/MixGetterVal.java | 2 +- .../resource/after-ecj/MultiFieldGetter.java | 8 +-- .../resource/after-ecj/NoArgsConstructorForce.java | 2 +- .../transform/resource/after-ecj/NonNullPlain.java | 14 ++-- .../after-ecj/NonNullWithAlternateException.java | 2 +- .../resource/after-ecj/OnXJava7Style.java | 10 +-- .../resource/after-ecj/OnXJava7StyleOn8.java | 10 +-- .../resource/after-ecj/OnXJava8Style.java | 10 +-- .../resource/after-ecj/OnXJava8StyleOn7.java | 10 +-- .../resource/after-ecj/SetterAccessLevel.java | 10 +-- .../resource/after-ecj/SetterAlreadyExists.java | 4 +- .../resource/after-ecj/SetterDeprecated.java | 4 +- .../resource/after-ecj/SetterOnClass.java | 16 ++--- .../resource/after-ecj/SetterOnMethod.java | 12 ++-- .../resource/after-ecj/SetterOnMethodOnParam.java | 6 +- .../resource/after-ecj/SetterOnParam.java | 12 ++-- .../after-ecj/SetterOnParamAndOnMethod.java | 2 +- .../resource/after-ecj/SetterOnStatic.java | 4 +- test/transform/resource/after-ecj/SetterPlain.java | 4 +- .../resource/after-ecj/SetterWithDollar.java | 6 +- .../resource/after-ecj/SimpleTypeResolution.java | 2 +- .../resource/after-ecj/ToStringConfiguration.java | 10 +-- .../resource/after-ecj/ToStringInner.java | 8 +-- .../resource/after-ecj/ToStringPlain.java | 4 +- test/transform/resource/after-ecj/Tolerate.java | 10 +-- .../resource/after-ecj/TrickyTypeResolution.java | 2 +- .../transform/resource/after-ecj/UtilityClass.java | 8 +-- .../resource/after-ecj/ValueCallSuper.java | 10 +-- .../resource/after-ecj/ValueExperimental.java | 16 ++--- .../after-ecj/ValueExperimentalStarImport.java | 8 +-- test/transform/resource/after-ecj/ValuePlain.java | 38 +++++------ .../resource/after-ecj/ValueStaticField.java | 8 +-- .../resource/after-ecj/WitherAccessLevel.java | 10 +-- .../resource/after-ecj/WitherAlreadyExists.java | 4 +- .../after-ecj/WitherAndAllArgsConstructor.java | 6 +- .../resource/after-ecj/WitherDeprecated.java | 4 +- .../resource/after-ecj/WitherOnClass.java | 12 ++-- test/transform/resource/after-ecj/WitherPlain.java | 4 +- .../resource/after-ecj/WitherWithAbstract.java | 2 +- .../resource/after-ecj/WitherWithGenerics.java | 6 +- .../messages-idempotent/NonNullPlain.java.messages | 4 +- 234 files changed, 819 insertions(+), 1667 deletions(-) diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java index 426b3863..2773a17b 100644 --- a/test/transform/resource/after-delombok/Accessors.java +++ b/test/transform/resource/after-delombok/Accessors.java @@ -1,12 +1,10 @@ class AccessorsFluent { private String fieldName = ""; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -16,17 +14,14 @@ class AccessorsFluentOnClass { private String fieldName = ""; private String otherFieldWithOverride = ""; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -35,7 +30,6 @@ class AccessorsFluentOnClass { class AccessorsChain { private boolean isRunning; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; @@ -45,7 +39,6 @@ class AccessorsPrefix { private String fieldName; private String fActualField; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -54,12 +47,10 @@ class AccessorsPrefix2 { private String fieldName; private String fActualField; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setFieldName(final String fieldName) { this.fieldName = fieldName; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -71,13 +62,11 @@ class AccessorsPrefix3 { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "AccessorsPrefix3(fName=" + this.getName() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof AccessorsPrefix3)) return false; @@ -89,13 +78,11 @@ class AccessorsPrefix3 { return true; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof AccessorsPrefix3; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -107,7 +94,6 @@ class AccessorsPrefix3 { class AccessorsFluentGenerics { private String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public AccessorsFluentGenerics name(final String name) { this.name = name; return this; @@ -116,7 +102,6 @@ class AccessorsFluentGenerics { class AccessorsFluentNoChaining { private String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void name(final String name) { this.name = name; } @@ -124,7 +109,6 @@ class AccessorsFluentNoChaining { class AccessorsFluentStatic { private static String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static void name(final String name) { AccessorsFluentStatic.name = name; } diff --git a/test/transform/resource/after-delombok/AccessorsConfiguration.java b/test/transform/resource/after-delombok/AccessorsConfiguration.java index 0094c55c..f6604970 100644 --- a/test/transform/resource/after-delombok/AccessorsConfiguration.java +++ b/test/transform/resource/after-delombok/AccessorsConfiguration.java @@ -1,12 +1,10 @@ class AccessorsConfiguration { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String fieldName() { return this.m_FieldName; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void fieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -14,7 +12,6 @@ class AccessorsConfiguration { class AccessorsConfiguration2 { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setM_FieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -22,7 +19,6 @@ class AccessorsConfiguration2 { class AccessorsConfiguration3 { private String fFieldName = ""; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public AccessorsConfiguration3 setFieldName(final String fFieldName) { this.fFieldName = fFieldName; return this; diff --git a/test/transform/resource/after-delombok/BuilderChainAndFluent.java b/test/transform/resource/after-delombok/BuilderChainAndFluent.java index 9a93ab7d..f9833be6 100644 --- a/test/transform/resource/after-delombok/BuilderChainAndFluent.java +++ b/test/transform/resource/after-delombok/BuilderChainAndFluent.java @@ -1,40 +1,31 @@ class BuilderChainAndFluent { private final int yes; - @java.beans.ConstructorProperties({"yes"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderChainAndFluent(final int yes) { this.yes = yes; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderChainAndFluentBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int yes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderChainAndFluentBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setYes(final int yes) { this.yes = yes; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderChainAndFluent build() { return new BuilderChainAndFluent(yes); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderChainAndFluentBuilder builder() { return new BuilderChainAndFluentBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java index 937628f9..a89d7114 100644 --- a/test/transform/resource/after-delombok/BuilderComplex.java +++ b/test/transform/resource/after-delombok/BuilderComplex.java @@ -3,62 +3,49 @@ class BuilderComplex { private static void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class VoidBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private T number; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int arg2; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String arg3; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private BuilderComplex selfRef; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") VoidBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public VoidBuilder number(final T number) { this.number = number; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public VoidBuilder arg2(final int arg2) { this.arg2 = arg2; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public VoidBuilder arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public VoidBuilder selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void execute() { BuilderComplex.testVoidWithGenerics(number, arg2, arg3, selfRef); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderComplex.VoidBuilder(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static VoidBuilder builder() { return new VoidBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java index 475b7558..02fb9727 100644 --- a/test/transform/resource/after-delombok/BuilderDefaults.java +++ b/test/transform/resource/after-delombok/BuilderDefaults.java @@ -3,100 +3,79 @@ public final class BuilderDefaults { private final String name; private final long z; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static int $default$x() { return 10; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static long $default$z() { return System.currentTimeMillis(); } - @java.beans.ConstructorProperties({"x", "name", "z"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderDefaults(final int x, final String name, final long z) { this.x = x; this.name = name; this.z = z; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderDefaultsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private boolean x$set; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int x; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private boolean z$set; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private long z; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderDefaultsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderDefaultsBuilder x(final int x) { this.x = x; x$set = true; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderDefaultsBuilder name(final String name) { this.name = name; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderDefaultsBuilder z(final long z) { this.z = z; z$set = true; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderDefaults build() { return new BuilderDefaults(x$set ? x : BuilderDefaults.$default$x(), name, z$set ? z : BuilderDefaults.$default$z()); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderDefaults.BuilderDefaultsBuilder(x=" + this.x + ", name=" + this.name + ", z=" + this.z + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderDefaultsBuilder builder() { return new BuilderDefaultsBuilder(); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getName() { return this.name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public long getZ() { return this.z; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderDefaults)) return false; @@ -110,7 +89,6 @@ public final class BuilderDefaults { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -123,7 +101,6 @@ public final class BuilderDefaults { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderDefaults(x=" + this.getX() + ", name=" + this.getName() + ", z=" + this.getZ() + ")"; } diff --git a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java index 97c94137..7e645dc1 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java @@ -3,64 +3,51 @@ public class BuilderDefaultsWarnings { final int y = 5; int z; java.util.List items; - @java.beans.ConstructorProperties({"x", "z", "items"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderDefaultsWarnings(final long x, final int z, final java.util.List items) { this.x = x; this.z = z; this.items = items; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderDefaultsWarningsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private long x; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int z; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList items; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderDefaultsWarningsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderDefaultsWarningsBuilder x(final long x) { this.x = x; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderDefaultsWarningsBuilder z(final int z) { this.z = z; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderDefaultsWarningsBuilder item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderDefaultsWarningsBuilder items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderDefaultsWarningsBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderDefaultsWarnings build() { java.util.List items; switch (this.items == null ? 0 : this.items.size()) { @@ -77,13 +64,11 @@ public class BuilderDefaultsWarnings { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(x=" + this.x + ", z=" + this.z + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderDefaultsWarningsBuilder builder() { return new BuilderDefaultsWarningsBuilder(); } @@ -93,26 +78,21 @@ class NoBuilderButHasDefaults { public NoBuilderButHasDefaults() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class NoBuilderButHasDefaultsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") NoBuilderButHasDefaultsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public NoBuilderButHasDefaults build() { return new NoBuilderButHasDefaults(); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder()"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static NoBuilderButHasDefaultsBuilder builder() { return new NoBuilderButHasDefaultsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java index 61e237d0..12b76a8f 100644 --- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java +++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java @@ -4,62 +4,49 @@ class BuilderInstanceMethod { return "" + show + yes + also + $andMe; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public class StringBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int show; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int yes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private List also; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int $andMe; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") StringBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StringBuilder show(final int show) { this.show = show; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StringBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StringBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String build() { return BuilderInstanceMethod.this.create(show, yes, also, $andMe); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderInstanceMethod.StringBuilder(show=" + this.show + ", yes=" + this.yes + ", also=" + this.also + ", $andMe=" + this.$andMe + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StringBuilder builder() { return new StringBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java index 138127b6..e3821c9a 100644 --- a/test/transform/resource/after-delombok/BuilderSimple.java +++ b/test/transform/resource/after-delombok/BuilderSimple.java @@ -4,52 +4,41 @@ class BuilderSimple { private final int yes; private List also; private int $butNotMe; - @java.beans.ConstructorProperties({"yes", "also"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSimple(final int yes, final List also) { this.yes = yes; this.also = also; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSimpleBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int yes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private List also; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSimpleBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSimpleBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSimple build() { return new BuilderSimple(yes, also); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSimpleBuilder builder() { return new BuilderSimpleBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java index a6c475f3..cf90e883 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java @@ -10,9 +10,7 @@ class BuilderSingularGuavaListsSets { private ImmutableSet rawSet; private ImmutableSortedSet passes; private ImmutableTable users; - @java.beans.ConstructorProperties({"cards", "frogs", "rawSet", "passes", "users"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { this.cards = cards; this.frogs = frogs; @@ -21,129 +19,106 @@ class BuilderSingularGuavaListsSets { this.users = users; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularGuavaListsSetsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder cards; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder frogs; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSet.Builder rawSet; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedSet.Builder passes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableTable.Builder users; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder card(final T card) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder clearCards() { this.cards = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder clearFrogs() { this.frogs = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder clearRawSet() { this.rawSet = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder pass(final String pass) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder clearPasses() { this.passes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder user(final Number rowKey, final Number columnKey, final String value) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.put(rowKey, columnKey, value); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder users(final com.google.common.collect.Table users) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.putAll(users); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder clearUsers() { this.users = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSets build() { com.google.common.collect.ImmutableList cards = this.cards == null ? com.google.common.collect.ImmutableList.of() : this.cards.build(); com.google.common.collect.ImmutableCollection frogs = this.frogs == null ? com.google.common.collect.ImmutableList.of() : this.frogs.build(); @@ -154,13 +129,11 @@ class BuilderSingularGuavaListsSets { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularGuavaListsSetsBuilder builder() { return new BuilderSingularGuavaListsSetsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java index 7d7f996e..e29c7e94 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java @@ -6,92 +6,75 @@ class BuilderSingularGuavaMaps { private ImmutableSortedMap vertices; @SuppressWarnings("all") private ImmutableBiMap rawMap; - @java.beans.ConstructorProperties({"battleaxes", "vertices", "rawMap"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { this.battleaxes = battleaxes; this.vertices = vertices; this.rawMap = rawMap; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularGuavaMapsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableMap.Builder battleaxes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedMap.Builder vertices; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableBiMap.Builder rawMap; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder battleaxe(final K key, final V value) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.put(key, value); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.putAll(battleaxes); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder clearBattleaxes() { this.battleaxes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder vertex(final Integer key, final V value) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.put(key, value); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.putAll(vertices); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder clearVertices() { this.vertices = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder rawMap(final java.lang.Object key, final java.lang.Object value) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.put(key, value); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.putAll(rawMap); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder clearRawMap() { this.rawMap = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMaps build() { com.google.common.collect.ImmutableMap battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.of() : this.battleaxes.build(); com.google.common.collect.ImmutableSortedMap vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.of() : this.vertices.build(); @@ -100,13 +83,11 @@ class BuilderSingularGuavaMaps { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularGuavaMapsBuilder builder() { return new BuilderSingularGuavaMapsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java index 6df4d2b9..a0be0c12 100644 --- a/test/transform/resource/after-delombok/BuilderSingularLists.java +++ b/test/transform/resource/after-delombok/BuilderSingularLists.java @@ -5,92 +5,75 @@ class BuilderSingularLists { private Collection scarves; @SuppressWarnings("all") private List rawList; - @java.beans.ConstructorProperties({"children", "scarves", "rawList"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularLists(final List children, final Collection scarves, final List rawList) { this.children = children; this.scarves = scarves; this.rawList = rawList; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularListsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList children; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList scarves; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawList; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder child(final T child) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.add(child); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder children(final java.util.Collection children) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.addAll(children); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder scarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.addAll(scarves); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.addAll(rawList); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularLists build() { java.util.List children; switch (this.children == null ? 0 : this.children.size()) { @@ -129,13 +112,11 @@ class BuilderSingularLists { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularListsBuilder builder() { return new BuilderSingularListsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularMaps.java b/test/transform/resource/after-delombok/BuilderSingularMaps.java index 90e97d8f..6520568b 100644 --- a/test/transform/resource/after-delombok/BuilderSingularMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularMaps.java @@ -6,7 +6,6 @@ class BuilderSingularMaps { @SuppressWarnings("all") private Map rawMap; private Map stringMap; - @java.beans.ConstructorProperties({"women", "men", "rawMap", "stringMap"}) @SuppressWarnings("all") BuilderSingularMaps(Map women, SortedMap men, Map rawMap, Map stringMap) { this.women = women; diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java index 973f024a..189408da 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java @@ -3,92 +3,75 @@ class BuilderSingularNoAuto { private List things; private List widgets; private List items; - @java.beans.ConstructorProperties({"things", "widgets", "items"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularNoAuto(final List things, final List widgets, final List items) { this.things = things; this.widgets = widgets; this.items = items; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularNoAutoBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList things; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList widgets; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList items; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder things(final String things) { if (this.things == null) this.things = new java.util.ArrayList(); this.things.add(things); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder things(final java.util.Collection things) { if (this.things == null) this.things = new java.util.ArrayList(); this.things.addAll(things); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder widget(final String widget) { if (this.widgets == null) this.widgets = new java.util.ArrayList(); this.widgets.add(widget); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder widgets(final java.util.Collection widgets) { if (this.widgets == null) this.widgets = new java.util.ArrayList(); this.widgets.addAll(widgets); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder items(final String items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(items); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAuto build() { java.util.List things; switch (this.things == null ? 0 : this.things.size()) { @@ -127,13 +110,11 @@ class BuilderSingularNoAuto { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAutoBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java index d0ad06f6..938f3bbc 100644 --- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java @@ -5,92 +5,75 @@ class BuilderSingularRedirectToGuava { private Set dangerMice; private NavigableMap things; private Collection> doohickeys; - @java.beans.ConstructorProperties({"dangerMice", "things", "doohickeys"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { this.dangerMice = dangerMice; this.things = things; this.doohickeys = doohickeys; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularRedirectToGuavaBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSet.Builder dangerMice; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedMap.Builder things; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder> doohickeys; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable dangerMice) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.addAll(dangerMice); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder thing(final Integer key, final Number value) { if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.put(key, value); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map things) { if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.putAll(things); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder doohickey(final Class doohickey) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable> doohickeys) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.addAll(doohickeys); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuava build() { java.util.Set dangerMice = this.dangerMice == null ? com.google.common.collect.ImmutableSet.of() : this.dangerMice.build(); java.util.NavigableMap things = this.things == null ? com.google.common.collect.ImmutableSortedMap.of() : this.things.build(); @@ -99,13 +82,11 @@ class BuilderSingularRedirectToGuava { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuavaBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java index 8afdf5d0..2d75b294 100644 -