From 70f77f928ac7a6edf3ef91a41399c9a79561c871 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Thu, 9 Feb 2017 22:45:45 +0100 Subject: [i1014] Only add lombok.Generated if it is explicitly turned on --- .../resource/after-delombok/Accessors.java | 18 +---- .../after-delombok/AccessorsConfiguration.java | 6 +- .../after-delombok/BuilderChainAndFluent.java | 10 +-- .../resource/after-delombok/BuilderComplex.java | 15 +---- .../after-delombok/BuilderInstanceMethod.java | 13 ---- .../resource/after-delombok/BuilderSimple.java | 10 --- .../BuilderSingularGuavaListsSets.java | 28 +------- .../after-delombok/BuilderSingularGuavaMaps.java | 20 +----- .../after-delombok/BuilderSingularLists.java | 18 ----- .../after-delombok/BuilderSingularNoAuto.java | 20 +----- .../BuilderSingularRedirectToGuava.java | 20 +----- .../after-delombok/BuilderSingularSets.java | 24 +------ .../BuilderSingularWithPrefixes.java | 12 +--- .../resource/after-delombok/BuilderValueData.java | 21 ------ .../after-delombok/BuilderWithAccessors.java | 16 +---- .../BuilderWithExistingBuilderClass.java | 10 +-- .../after-delombok/BuilderWithToBuilder.java | 37 ----------- .../after-delombok/BuilderWithTolerate.java | 9 +-- .../after-delombok/ClassNamedAfterGetter.java | 1 - .../after-delombok/CommentsInterspersed.java | 1 - .../ConflictingStaticConstructorNames.java | 7 +- .../resource/after-delombok/Constructors.java | 13 ---- .../after-delombok/ConstructorsConfiguration.java | 2 - .../after-delombok/ConstructorsWithAccessors.java | 1 - .../resource/after-delombok/DataConfiguration.java | 6 -- .../resource/after-delombok/DataExtended.java | 9 +-- .../resource/after-delombok/DataIgnore.java | 8 +-- .../resource/after-delombok/DataOnEnum.java | 5 +- .../resource/after-delombok/DataOnLocalClass.java | 23 +------ .../resource/after-delombok/DataPlain.java | 40 +----------- .../resource/after-delombok/DataWithGetter.java | 12 +--- .../after-delombok/DataWithGetterNone.java | 9 +-- .../resource/after-delombok/DelegateOnGetter.java | 5 +- .../after-delombok/DelegateOnGetterNone.java | 4 +- .../resource/after-delombok/DelegateOnMethods.java | 3 +- .../after-delombok/DelegateTypesAndExcludes.java | 4 +- .../after-delombok/DelegateWithDeprecated.java | 5 +- .../after-delombok/DelegateWithVarargs.java | 4 -- .../resource/after-delombok/EncodingUsAscii.java | 3 +- .../resource/after-delombok/EncodingUtf8.java | 3 +- .../resource/after-delombok/EqualsAndHashCode.java | 13 +--- .../EqualsAndHashCodeConfigKeys1.java | 6 -- .../EqualsAndHashCodeConfigKeys2.java | 6 -- .../EqualsAndHashCodeWithExistingMethods.java | 4 +- .../EqualsAndHashCodeWithOnParam.java | 5 +- .../after-delombok/EqualsAndHashcodeOfExclude.java | 6 +- .../after-delombok/ExtensionMethodPlain.java | 2 +- .../resource/after-delombok/FieldDefaults.java | 2 +- .../resource/after-delombok/FieldDefaultsNoop.java | 2 +- .../after-delombok/FieldDefaultsViaConfig.java | 2 +- ...efaultsViaConfigAndRequiredArgsConstructor.java | 3 +- .../after-delombok/GenerateSuppressFBWarnings.java | 3 +- .../after-delombok/GeneratedGlobalOff.java | 7 -- .../after-delombok/GeneratedGlobalOffJavaxOn.java | 8 --- .../after-delombok/GeneratedGlobalOffLombokOn.java | 8 --- .../resource/after-delombok/GeneratedJavaxOff.java | 3 +- .../after-delombok/GeneratedJavaxOnLombokOn.java | 9 +++ .../after-delombok/GeneratedLombokOff.java | 8 --- .../resource/after-delombok/GeneratedOff.java | 7 ++ .../after-delombok/GeneratedOffJavaxOn.java | 8 +++ .../after-delombok/GeneratedOffLombokOn.java | 8 +++ .../resource/after-delombok/GetterAccessLevel.java | 11 +--- .../after-delombok/GetterAlreadyExists.java | 12 +--- .../resource/after-delombok/GetterBoolean.java | 6 +- .../resource/after-delombok/GetterDeprecated.java | 4 +- .../resource/after-delombok/GetterEnum.java | 5 +- .../resource/after-delombok/GetterLazy.java | 1 - .../resource/after-delombok/GetterLazyBoolean.java | 6 -- .../after-delombok/GetterLazyEahcToString.java | 8 +-- .../resource/after-delombok/GetterLazyInvalid.java | 3 +- .../resource/after-delombok/GetterLazyNative.java | 9 --- .../after-delombok/GetterLazyTransient.java | 2 - .../resource/after-delombok/GetterNone.java | 3 +- .../resource/after-delombok/GetterOnClass.java | 10 +-- .../resource/after-delombok/GetterOnMethod.java | 3 - .../after-delombok/GetterOnMethodErrors.java | 3 +- .../after-delombok/GetterOnMethodErrors2.java | 8 --- .../resource/after-delombok/GetterOnStatic.java | 2 - .../resource/after-delombok/GetterPlain.java | 4 +- .../after-delombok/GetterSetterJavadoc.java | 15 ----- .../resource/after-delombok/GetterWithDollar.java | 5 +- .../resource/after-delombok/InjectField.java | 8 +-- .../resource/after-delombok/LoggerCommons.java | 5 +- .../resource/after-delombok/LoggerConfig.java | 3 +- .../resource/after-delombok/LoggerJBossLog.java | 6 +- .../resource/after-delombok/LoggerJul.java | 5 +- .../resource/after-delombok/LoggerLog4j.java | 5 +- .../resource/after-delombok/LoggerLog4j2.java | 5 +- .../resource/after-delombok/LoggerSlf4j.java | 6 +- .../after-delombok/LoggerSlf4jAlreadyExists.java | 2 +- .../resource/after-delombok/LoggerSlf4jTypes.java | 5 +- .../after-delombok/LoggerSlf4jWithPackage.java | 2 - .../resource/after-delombok/LoggerXSlf4j.java | 5 +- .../resource/after-delombok/MixGetterVal.java | 3 +- .../resource/after-delombok/MultiFieldGetter.java | 6 +- .../after-delombok/NoArgsConstructorForce.java | 3 +- .../after-delombok/NonNullOnParameterAbstract.java | 2 +- .../resource/after-delombok/NonNullPlain.java | 7 -- .../NonNullWithAlternateException.java | 3 +- .../after-delombok/NonNullWithSneakyThrows.java | 2 +- .../resource/after-delombok/SetterAccessLevel.java | 7 +- .../after-delombok/SetterAlreadyExists.java | 4 +- .../resource/after-delombok/SetterDeprecated.java | 4 +- .../resource/after-delombok/SetterOnClass.java | 10 +-- .../after-delombok/SetterOnMethodOnParam.java | 3 - .../resource/after-delombok/SetterOnStatic.java | 2 - .../resource/after-delombok/SetterPlain.java | 4 +- .../resource/after-delombok/SetterWithDollar.java | 5 +- .../after-delombok/SimpleTypeResolution.java | 1 - .../after-delombok/SneakyThrowsMultiple.java | 2 +- .../resource/after-delombok/SneakyThrowsPlain.java | 2 +- .../after-delombok/SneakyThrowsSingle.java | 2 +- .../resource/after-delombok/SynchronizedName.java | 2 +- .../SynchronizedNameNoSuchField.java | 2 +- .../SynchronizedNameStaticToInstanceRef.java | 2 +- .../resource/after-delombok/SynchronizedPlain.java | 4 +- .../after-delombok/ToStringConfiguration.java | 7 +- .../resource/after-delombok/ToStringInner.java | 6 +- .../resource/after-delombok/ToStringPlain.java | 4 +- .../resource/after-delombok/Tolerate.java | 5 -- .../after-delombok/TrickyTypeResolution.java | 1 - .../resource/after-delombok/UtilityClass.java | 6 +- .../after-delombok/UtilityClassErrors.java | 2 +- .../resource/after-delombok/ValComplex.java | 2 +- .../resource/after-delombok/ValDefault.java | 2 +- .../resource/after-delombok/ValErrors.java | 2 +- .../resource/after-delombok/ValFinal.java | 2 +- .../resource/after-delombok/ValInBasicFor.java | 2 +- .../resource/after-delombok/ValInFor.java | 2 +- .../after-delombok/ValInMultiDeclaration.java | 2 +- .../resource/after-delombok/ValLambda.java | 2 +- .../resource/after-delombok/ValLessSimple.java | 2 +- test/transform/resource/after-delombok/ValLub.java | 2 +- .../resource/after-delombok/ValNullInit.java | 2 +- .../resource/after-delombok/ValRawType.java | 2 +- .../resource/after-delombok/ValWeirdTypes.java | 2 +- .../resource/after-delombok/ValWithLabel.java | 2 +- .../resource/after-delombok/ValueCallSuper.java | 5 -- .../resource/after-delombok/ValueExperimental.java | 10 +-- .../ValueExperimentalStarImport.java | 6 +- .../resource/after-delombok/ValuePlain.java | 19 ------ .../resource/after-delombok/ValueStaticField.java | 6 +- .../resource/after-delombok/VarComplex.java | 2 +- .../resource/after-delombok/VarInFor.java | 2 +- .../resource/after-delombok/VarInForOld.java | 2 +- .../resource/after-delombok/VarModifier.java | 2 +- .../resource/after-delombok/VarNullInit.java | 2 +- .../after-delombok/WithInnerAnnotation.java | 2 +- .../resource/after-delombok/WitherAccessLevel.java | 7 +- .../after-delombok/WitherAlreadyExists.java | 4 +- .../WitherAndAllArgsConstructor.java | 5 +- .../resource/after-delombok/WitherDeprecated.java | 4 +- .../resource/after-delombok/WitherOnClass.java | 6 -- .../resource/after-delombok/WitherPlain.java | 2 - .../after-delombok/WitherWithAbstract.java | 3 +- .../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/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 ++++---- .../after-ecj/BuilderWithExistingBuilderClass.java | 16 ++--- .../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 | 4 +- .../after-ecj/ConstructorsWithAccessors.java | 2 +- .../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 | 12 ++-- .../EqualsAndHashCodeWithExistingMethods.java | 4 +- .../after-ecj/EqualsAndHashCodeWithOnParam.java | 6 +- .../after-ecj/EqualsAndHashcodeOfExclude.java | 8 +-- ...efaultsViaConfigAndRequiredArgsConstructor.java | 2 +- .../after-ecj/GenerateSuppressFBWarnings.java | 2 +- .../resource/after-ecj/GeneratedGlobalOff.java | 9 --- .../after-ecj/GeneratedGlobalOffJavaxOn.java | 9 --- .../after-ecj/GeneratedGlobalOffLombokOn.java | 9 --- .../resource/after-ecj/GeneratedJavaxOff.java | 2 +- .../after-ecj/GeneratedJavaxOnLombokOn.java | 9 +++ .../resource/after-ecj/GeneratedLombokOff.java | 9 --- .../transform/resource/after-ecj/GeneratedOff.java | 9 +++ .../resource/after-ecj/GeneratedOffJavaxOn.java | 9 +++ .../resource/after-ecj/GeneratedOffLombokOn.java | 9 +++ .../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/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 +- .../resource/before/GeneratedGlobalOff.java | 5 -- .../resource/before/GeneratedGlobalOffJavaxOn.java | 6 -- .../before/GeneratedGlobalOffLombokOn.java | 6 -- .../resource/before/GeneratedJavaxOnLombokOn.java | 6 ++ .../resource/before/GeneratedLombokOff.java | 5 -- test/transform/resource/before/GeneratedOff.java | 5 ++ .../resource/before/GeneratedOffJavaxOn.java | 6 ++ .../resource/before/GeneratedOffLombokOn.java | 6 ++ .../messages-idempotent/NonNullPlain.java.messages | 4 +- 277 files changed, 921 insertions(+), 1633 deletions(-) delete mode 100644 test/transform/resource/after-delombok/GeneratedGlobalOff.java delete mode 100644 test/transform/resource/after-delombok/GeneratedGlobalOffJavaxOn.java delete mode 100644 test/transform/resource/after-delombok/GeneratedGlobalOffLombokOn.java create mode 100644 test/transform/resource/after-delombok/GeneratedJavaxOnLombokOn.java delete mode 100644 test/transform/resource/after-delombok/GeneratedLombokOff.java create mode 100644 test/transform/resource/after-delombok/GeneratedOff.java create mode 100644 test/transform/resource/after-delombok/GeneratedOffJavaxOn.java create mode 100644 test/transform/resource/after-delombok/GeneratedOffLombokOn.java delete mode 100644 test/transform/resource/after-ecj/GeneratedGlobalOff.java delete mode 100644 test/transform/resource/after-ecj/GeneratedGlobalOffJavaxOn.java delete mode 100644 test/transform/resource/after-ecj/GeneratedGlobalOffLombokOn.java create mode 100644 test/transform/resource/after-ecj/GeneratedJavaxOnLombokOn.java delete mode 100644 test/transform/resource/after-ecj/GeneratedLombokOff.java create mode 100644 test/transform/resource/after-ecj/GeneratedOff.java create mode 100644 test/transform/resource/after-ecj/GeneratedOffJavaxOn.java create mode 100644 test/transform/resource/after-ecj/GeneratedOffLombokOn.java delete mode 100644 test/transform/resource/before/GeneratedGlobalOff.java delete mode 100644 test/transform/resource/before/GeneratedGlobalOffJavaxOn.java delete mode 100644 test/transform/resource/before/GeneratedGlobalOffLombokOn.java create mode 100644 test/transform/resource/before/GeneratedJavaxOnLombokOn.java delete mode 100644 test/transform/resource/before/GeneratedLombokOff.java create mode 100644 test/transform/resource/before/GeneratedOff.java create mode 100644 test/transform/resource/before/GeneratedOffJavaxOn.java create mode 100644 test/transform/resource/before/GeneratedOffLombokOn.java (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java index 8dee33ad..426b3863 100644 --- a/test/transform/resource/after-delombok/Accessors.java +++ b/test/transform/resource/after-delombok/Accessors.java @@ -2,13 +2,11 @@ class AccessorsFluent { private String fieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -19,19 +17,16 @@ class AccessorsFluentOnClass { private String otherFieldWithOverride = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -41,7 +36,6 @@ class AccessorsChain { private boolean isRunning; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; @@ -52,7 +46,6 @@ class AccessorsPrefix { private String fActualField; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -62,13 +55,11 @@ class AccessorsPrefix2 { private String fActualField; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public void setFieldName(final String fieldName) { this.fieldName = fieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -81,14 +72,12 @@ class AccessorsPrefix3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public java.lang.String toString() { return "AccessorsPrefix3(fName=" + this.getName() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof AccessorsPrefix3)) return false; @@ -101,14 +90,12 @@ class AccessorsPrefix3 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof AccessorsPrefix3; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -121,7 +108,6 @@ class AccessorsFluentGenerics { private String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public AccessorsFluentGenerics name(final String name) { this.name = name; return this; @@ -131,7 +117,6 @@ class AccessorsFluentNoChaining { private String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public void name(final String name) { this.name = name; } @@ -140,8 +125,7 @@ class AccessorsFluentStatic { private static String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static void name(final String name) { AccessorsFluentStatic.name = name; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/AccessorsConfiguration.java b/test/transform/resource/after-delombok/AccessorsConfiguration.java index f98b7939..0094c55c 100644 --- a/test/transform/resource/after-delombok/AccessorsConfiguration.java +++ b/test/transform/resource/after-delombok/AccessorsConfiguration.java @@ -2,13 +2,11 @@ class AccessorsConfiguration { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public String fieldName() { return this.m_FieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public void fieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -17,7 +15,6 @@ class AccessorsConfiguration2 { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public void setM_FieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -26,9 +23,8 @@ class AccessorsConfiguration3 { private String fFieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public AccessorsConfiguration3 setFieldName(final String fFieldName) { this.fFieldName = fFieldName; return this; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderChainAndFluent.java b/test/transform/resource/after-delombok/BuilderChainAndFluent.java index 7a1f487e..2475a998 100644 --- a/test/transform/resource/after-delombok/BuilderChainAndFluent.java +++ b/test/transform/resource/after-delombok/BuilderChainAndFluent.java @@ -2,47 +2,39 @@ class BuilderChainAndFluent { private final int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderChainAndFluent(final int yes) { this.yes = yes; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static class BuilderChainAndFluentBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderChainAndFluentBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public void setYes(final int yes) { this.yes = yes; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderChainAndFluent build() { return new BuilderChainAndFluent(yes); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public java.lang.String toString() { return "BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static BuilderChainAndFluentBuilder builder() { return new BuilderChainAndFluentBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java index 15d4e25c..937628f9 100644 --- a/test/transform/resource/after-delombok/BuilderComplex.java +++ b/test/transform/resource/after-delombok/BuilderComplex.java @@ -4,75 +4,62 @@ class BuilderComplex { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static class VoidBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private T number; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private int arg2; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private String arg3; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private BuilderComplex selfRef; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated VoidBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public VoidBuilder number(final T number) { this.number = number; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public VoidBuilder arg2(final int arg2) { this.arg2 = arg2; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public VoidBuilder arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public VoidBuilder selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public void execute() { BuilderComplex.testVoidWithGenerics(number, arg2, arg3, selfRef); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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") - @lombok.Generated public static VoidBuilder builder() { return new VoidBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java index 668977ab..61e237d0 100644 --- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java +++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java @@ -5,74 +5,61 @@ class BuilderInstanceMethod { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public class StringBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private int show; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private List also; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private int $andMe; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated StringBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public StringBuilder show(final int show) { this.show = show; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public StringBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public StringBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public String build() { return BuilderInstanceMethod.this.create(show, yes, also, $andMe); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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") - @lombok.Generated 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 ecf74aa3..a12ad047 100644 --- a/test/transform/resource/after-delombok/BuilderSimple.java +++ b/test/transform/resource/after-delombok/BuilderSimple.java @@ -6,59 +6,49 @@ class BuilderSimple { private int $butNotMe; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSimple(final int yes, final List also) { this.yes = yes; this.also = also; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static class BuilderSimpleBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private List also; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSimpleBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSimpleBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSimple build() { return new BuilderSimple(yes, also); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public java.lang.String toString() { return "BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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 851fc3db..08becf6b 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java @@ -12,7 +12,6 @@ class BuilderSingularGuavaListsSets { private ImmutableTable users; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { this.cards = cards; this.frogs = frogs; @@ -22,36 +21,28 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static class BuilderSingularGuavaListsSetsBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableList.Builder cards; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableList.Builder frogs; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableSet.Builder rawSet; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableSortedSet.Builder passes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableTable.Builder users; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder card(final T card) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); @@ -59,7 +50,6 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); @@ -67,14 +57,12 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder clearCards() { this.cards = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); @@ -82,7 +70,6 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); @@ -90,14 +77,12 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder clearFrogs() { this.frogs = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); @@ -105,7 +90,6 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); @@ -113,14 +97,12 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder clearRawSet() { this.rawSet = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder pass(final String pass) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); @@ -128,7 +110,6 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); @@ -136,14 +117,12 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder clearPasses() { this.passes = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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); @@ -151,7 +130,6 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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); @@ -159,14 +137,12 @@ class BuilderSingularGuavaListsSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaListsSetsBuilder clearUsers() { this.users = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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(); @@ -178,15 +154,13 @@ class BuilderSingularGuavaListsSets { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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") - @lombok.Generated public static BuilderSingularGuavaListsSetsBuilder builder() { return new BuilderSingularGuavaListsSetsBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java index 22a4a750..d6c38790 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java @@ -8,7 +8,6 @@ class BuilderSingularGuavaMaps { private ImmutableBiMap rawMap; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { this.battleaxes = battleaxes; this.vertices = vertices; @@ -16,28 +15,22 @@ class BuilderSingularGuavaMaps { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static class BuilderSingularGuavaMapsBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableMap.Builder battleaxes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableSortedMap.Builder vertices; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableBiMap.Builder rawMap; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularGuavaMapsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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); @@ -45,7 +38,6 @@ class BuilderSingularGuavaMaps { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.putAll(battleaxes); @@ -53,14 +45,12 @@ class BuilderSingularGuavaMaps { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaMapsBuilder clearBattleaxes() { this.battleaxes = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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); @@ -68,7 +58,6 @@ class BuilderSingularGuavaMaps { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.putAll(vertices); @@ -76,14 +65,12 @@ class BuilderSingularGuavaMaps { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaMapsBuilder clearVertices() { this.vertices = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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); @@ -91,7 +78,6 @@ class BuilderSingularGuavaMaps { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.putAll(rawMap); @@ -99,14 +85,12 @@ class BuilderSingularGuavaMaps { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularGuavaMapsBuilder clearRawMap() { this.rawMap = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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(); @@ -116,15 +100,13 @@ class BuilderSingularGuavaMaps { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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") - @lombok.Generated public static BuilderSingularGuavaMapsBuilder builder() { return new BuilderSingularGuavaMapsBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java index 03b6ced7..9b409404 100644 --- a/test/transform/resource/after-delombok/BuilderSingularLists.java +++ b/test/transform/resource/after-delombok/BuilderSingularLists.java @@ -7,7 +7,6 @@ class BuilderSingularLists { private List rawList; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularLists(final List children, final Collection scarves, final List rawList) { this.children = children; this.scarves = scarves; @@ -15,28 +14,22 @@ class BuilderSingularLists { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static class BuilderSingularListsBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private java.util.ArrayList children; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private java.util.ArrayList scarves; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private java.util.ArrayList rawList; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularListsBuilder child(final T child) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.add(child); @@ -44,7 +37,6 @@ class BuilderSingularLists { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularListsBuilder children(final java.util.Collection children) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.addAll(children); @@ -52,14 +44,12 @@ class BuilderSingularLists { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularListsBuilder clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularListsBuilder scarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); @@ -67,7 +57,6 @@ class BuilderSingularLists { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.addAll(scarves); @@ -75,14 +64,12 @@ class BuilderSingularLists { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularListsBuilder clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); @@ -90,7 +77,6 @@ class BuilderSingularLists { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.addAll(rawList); @@ -98,14 +84,12 @@ class BuilderSingularLists { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularListsBuilder clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularLists build() { java.util.List children; switch (this.children == null ? 0 : this.children.size()) { @@ -145,14 +129,12 @@ class BuilderSingularLists { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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") - @lombok.Generated public static BuilderSingularListsBuilder builder() { return new BuilderSingularListsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java index 7e9e1680..71ec0c7a 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java @@ -5,7 +5,6 @@ class BuilderSingularNoAuto { private List items; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularNoAuto(final List things, final List widgets, final List items) { this.things = things; this.widgets = widgets; @@ -13,28 +12,22 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static class BuilderSingularNoAutoBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private java.util.ArrayList things; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private java.util.ArrayList widgets; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularNoAutoBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularNoAutoBuilder things(final String things) { if (this.things == null) this.things = new java.util.ArrayList(); this.things.add(things); @@ -42,7 +35,6 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularNoAutoBuilder things(final java.util.Collection things) { if (this.things == null) this.things = new java.util.ArrayList(); this.things.addAll(things); @@ -50,14 +42,12 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularNoAutoBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularNoAutoBuilder widget(final String widget) { if (this.widgets == null) this.widgets = new java.util.ArrayList(); this.widgets.add(widget); @@ -65,7 +55,6 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularNoAutoBuilder widgets(final java.util.Collection widgets) { if (this.widgets == null) this.widgets = new java.util.ArrayList(); this.widgets.addAll(widgets); @@ -73,14 +62,12 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularNoAutoBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularNoAutoBuilder items(final String items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(items); @@ -88,7 +75,6 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularNoAutoBuilder items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); @@ -96,14 +82,12 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularNoAutoBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularNoAuto build() { java.util.List things; switch (this.things == null ? 0 : this.things.size()) { @@ -143,15 +127,13 @@ class BuilderSingularNoAuto { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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") - @lombok.Generated public static BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAutoBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java index e9228db6..ff194b47 100644 --- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java @@ -7,7 +7,6 @@ class BuilderSingularRedirectToGuava { private Collection> doohickeys; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { this.dangerMice = dangerMice; this.things = things; @@ -15,28 +14,22 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static class BuilderSingularRedirectToGuavaBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableSet.Builder dangerMice; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableSortedMap.Builder things; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private com.google.common.collect.ImmutableList.Builder> doohickeys; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularRedirectToGuavaBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); @@ -44,7 +37,6 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable dangerMice) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.addAll(dangerMice); @@ -52,14 +44,12 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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); @@ -67,7 +57,6 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map things) { if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.putAll(things); @@ -75,14 +64,12 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularRedirectToGuavaBuilder doohickey(final Class doohickey) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); @@ -90,7 +77,6 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable> doohickeys) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.addAll(doohickeys); @@ -98,14 +84,12 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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(); @@ -115,15 +99,13 @@ class BuilderSingularRedirectToGuava { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated 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") - @lombok.Generated public static BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuavaBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderSingularSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java index 4c4e64e1..2461d2fd 100644 --- a/test/transform/resource/after-delombok/BuilderSingularSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularSets.java @@ -8,7 +8,6 @@ class BuilderSingularSets { private Set stringSet; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated BuilderSingularSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { this.dangerMice = dangerMice; this.octopodes = octopodes; @@ -17,32 +16,25 @@ class BuilderSingularSets { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated public static class BuilderSingularSetsBuilder { @java.lang.SuppressWa