From fc1c0186755fbc0d7d356ff697681feb7b2a18e7 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Mon, 18 Mar 2024 00:03:01 +0100 Subject: [PATCH 001/118] Use jdk22 GA instead of EA --- docker/provision/jdk/java-22.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/provision/jdk/java-22.sh b/docker/provision/jdk/java-22.sh index c442a6dc1a..69135bfd3a 100755 --- a/docker/provision/jdk/java-22.sh +++ b/docker/provision/jdk/java-22.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget -wget https://download.java.net/java/early_access/jdk22/31/GPL/openjdk-22-ea+31_linux-x64_bin.tar.gz -O jdk.tar.gz +wget https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz -O jdk.tar.gz tar -xzf jdk.tar.gz -C /opt/ mv /opt/jdk-22 /opt/jdk From 566ef729491977adfd091bea3b59c8e1d8cc3189 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Fri, 1 Mar 2024 20:08:02 +0100 Subject: [PATCH 002/118] [fixes #3225] Handle ambiguous extension methods --- .../eclipse/agent/PatchExtensionMethod.java | 8 +++++--- .../ExtensionMethodAmbiguousFunctional.java | 17 ++++++++++++++++ .../ExtensionMethodAmbiguousFunctional.java | 20 +++++++++++++++++++ .../ExtensionMethodAmbiguousFunctional.java | 20 +++++++++++++++++++ ...ionMethodAmbiguousFunctional.java.messages | 1 + ...ionMethodAmbiguousFunctional.java.messages | 1 + 6 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 test/transform/resource/after-delombok/ExtensionMethodAmbiguousFunctional.java create mode 100644 test/transform/resource/after-ecj/ExtensionMethodAmbiguousFunctional.java create mode 100644 test/transform/resource/before/ExtensionMethodAmbiguousFunctional.java create mode 100644 test/transform/resource/messages-delombok/ExtensionMethodAmbiguousFunctional.java.messages create mode 100644 test/transform/resource/messages-ecj/ExtensionMethodAmbiguousFunctional.java.messages diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java b/src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java index 3b89c0af02..555c84b0c2 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2023 The Project Lombok Authors. + * Copyright (C) 2012-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -321,9 +321,11 @@ public static TypeBinding resolveType(TypeBinding resolvedType, MessageSend meth MethodBinding fixedBinding = scope.getMethod(extensionMethod.declaringClass, methodCall.selector, argumentTypes.toArray(new TypeBinding[0]), methodCall); if (fixedBinding instanceof ProblemMethodBinding) { methodCall.arguments = originalArgs; - if (fixedBinding.declaringClass != null) { - PostponedInvalidMethodError.invoke(scope.problemReporter(), methodCall, fixedBinding, scope); + // Sometimes the declaring class is null, in that case we have to create a new ProblemMethodBinding using the extension method's declaring class + if (fixedBinding.declaringClass == null) { + fixedBinding = new ProblemMethodBinding(fixedBinding.selector, fixedBinding.parameters, extensionMethod.declaringClass, fixedBinding.problemId()); } + PostponedInvalidMethodError.invoke(scope.problemReporter(), methodCall, fixedBinding, scope); } else { // If the extension method uses varargs, the last fixed binding parameter is an array but // the method arguments are not. Even thought we already know that the method is fine we still diff --git a/test/transform/resource/after-delombok/ExtensionMethodAmbiguousFunctional.java b/test/transform/resource/after-delombok/ExtensionMethodAmbiguousFunctional.java new file mode 100644 index 0000000000..8c93c03dbc --- /dev/null +++ b/test/transform/resource/after-delombok/ExtensionMethodAmbiguousFunctional.java @@ -0,0 +1,17 @@ +//skip-idempotent +import java.util.function.Consumer; +import java.util.function.Function; + +class ExtensionMethodAmbiguousFunctional { + public void test() { + ExtensionMethodAmbiguousFunctional.Extensions.ambiguous("", System.out::println); + } + + static class Extensions { + public static void ambiguous(T t, Function function) { + } + + public static void ambiguous(T t, Consumer function) { + } + } +} diff --git a/test/transform/resource/after-ecj/ExtensionMethodAmbiguousFunctional.java b/test/transform/resource/after-ecj/ExtensionMethodAmbiguousFunctional.java new file mode 100644 index 0000000000..80d216b265 --- /dev/null +++ b/test/transform/resource/after-ecj/ExtensionMethodAmbiguousFunctional.java @@ -0,0 +1,20 @@ +import java.util.function.Consumer; +import java.util.function.Function; +import lombok.experimental.ExtensionMethod; +@ExtensionMethod({ExtensionMethodAmbiguousFunctional.Extensions.class}) class ExtensionMethodAmbiguousFunctional { + static class Extensions { + Extensions() { + super(); + } + public static void ambiguous(T t, Function function) { + } + public static void ambiguous(T t, Consumer function) { + } + } + ExtensionMethodAmbiguousFunctional() { + super(); + } + public void test() { + "".ambiguous(System.out::println); + } +} diff --git a/test/transform/resource/before/ExtensionMethodAmbiguousFunctional.java b/test/transform/resource/before/ExtensionMethodAmbiguousFunctional.java new file mode 100644 index 0000000000..65c08404d8 --- /dev/null +++ b/test/transform/resource/before/ExtensionMethodAmbiguousFunctional.java @@ -0,0 +1,20 @@ +//version 8: +import java.util.function.Consumer; +import java.util.function.Function; + +import lombok.experimental.ExtensionMethod; + +@ExtensionMethod({ExtensionMethodAmbiguousFunctional.Extensions.class}) +class ExtensionMethodAmbiguousFunctional { + public void test() { + "".ambiguous(System.out::println); + } + + static class Extensions { + public static void ambiguous(T t, Function function) { + } + + public static void ambiguous(T t, Consumer function) { + } + } +} diff --git a/test/transform/resource/messages-delombok/ExtensionMethodAmbiguousFunctional.java.messages b/test/transform/resource/messages-delombok/ExtensionMethodAmbiguousFunctional.java.messages new file mode 100644 index 0000000000..9fa3414f76 --- /dev/null +++ b/test/transform/resource/messages-delombok/ExtensionMethodAmbiguousFunctional.java.messages @@ -0,0 +1 @@ +9 reference to ambiguous is ambiguous both method ambiguous(T,java.util.function.Function) in ExtensionMethodAmbiguousFunctional.Extensions and method ambiguous(T,java.util.function.Consumer) in ExtensionMethodAmbiguousFunctional.Extensions match diff --git a/test/transform/resource/messages-ecj/ExtensionMethodAmbiguousFunctional.java.messages b/test/transform/resource/messages-ecj/ExtensionMethodAmbiguousFunctional.java.messages new file mode 100644 index 0000000000..63e76c93ad --- /dev/null +++ b/test/transform/resource/messages-ecj/ExtensionMethodAmbiguousFunctional.java.messages @@ -0,0 +1 @@ +10 The method ambiguous(String, Function) is ambiguous for the type ExtensionMethodAmbiguousFunctional.Extensions From 03201f2431705f8964f8b219df9405e486dd0997 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Fri, 1 Mar 2024 20:28:35 +0100 Subject: [PATCH 003/118] Always use maven to download ecj --- buildScripts/ivy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index aa2643ed90..c981c5fe92 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -76,7 +76,7 @@ - + From e9c8c37566815de813f656adf763319e339a4e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Schl=C3=B6mer?= Date: Fri, 19 Jan 2024 14:35:54 +0100 Subject: [PATCH 004/118] [website] Fix typo on GetterSetter page --- website/templates/features/GetterSetter.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/features/GetterSetter.html b/website/templates/features/GetterSetter.html index 8b16d34d00..8cf25ee4e3 100644 --- a/website/templates/features/GetterSetter.html +++ b/website/templates/features/GetterSetter.html @@ -28,7 +28,7 @@
lombok.accessors.fluent = [true | false] (default: false)
- If set to true, generated getters and setters will not be prefixed with the bean-standard 'get, is or set; instead, the methods will use the same name as the field (minus prefixes). An explicitly configured chain parameter of an @Accessors annotation takes precedence over this setting. + If set to true, generated getters and setters will not be prefixed with the bean-standard 'get, is or set; instead, the methods will use the same name as the field (minus prefixes). An explicitly configured fluent parameter of an @Accessors annotation takes precedence over this setting.
lombok.accessors.prefix += a field prefix (default: empty list)
From a54ec7005ed253d480621f042d923f3353e6a1d0 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Mon, 18 Mar 2024 00:29:47 +0100 Subject: [PATCH 005/118] Document using jdk22 GA --- docker/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/readme.md b/docker/readme.md index deb482f555..7bd05c64fc 100644 --- a/docker/readme.md +++ b/docker/readme.md @@ -13,7 +13,7 @@ By default, this is the latest released version. You can download a specific ver ### `ARG jdk=21` The jdk version to be used. Supported values: -- `22`(experimental, based on openjdk early access) +- `22`(based on openjdk GA) - `21` (default)(based on openjdk instead of adoptium) - `17` - `11` From 23307eb8d137d7e4a3f645552135ab7354ca1e6e Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Thu, 14 Mar 2024 20:28:26 +0100 Subject: [PATCH 006/118] [jdk22] Adds support for unnamed variables (JEP 456) --- .../lombok/delombok/PrettyPrinter.java | 12 +++- .../resource/after/UnnamedVariables.java | 70 +++++++++++++++++++ .../resource/before/UnnamedVariables.java | 70 +++++++++++++++++++ 3 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 test/pretty/resource/after/UnnamedVariables.java create mode 100644 test/pretty/resource/before/UnnamedVariables.java diff --git a/src/delombok/lombok/delombok/PrettyPrinter.java b/src/delombok/lombok/delombok/PrettyPrinter.java index d74344544d..85598d3202 100644 --- a/src/delombok/lombok/delombok/PrettyPrinter.java +++ b/src/delombok/lombok/delombok/PrettyPrinter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2021 The Project Lombok Authors. + * Copyright (C) 2016-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -263,6 +263,14 @@ private boolean suppress(JCTree tree) { return false; } + private void print(Name name) { + if (name.isEmpty()) { + print("_"); + } else { + print(name.toString()); + } + } + private void print(CharSequence s) { boolean align = needsAlign; if (needsNewLine && !onNewLine) println(); @@ -1722,6 +1730,8 @@ public void visitTypeBoundKind(TypeBoundKind tree) { printPatternCaseLabel(tree); } else if (className.endsWith("$JCRecordPattern")) { // Introduced in JDK19 printRecordPattern(tree); + } else if (className.endsWith("$JCAnyPattern")) { // Introduced in JDK22 + print("_"); } else { throw new AssertionError("Unhandled tree type: " + tree.getClass() + ": " + tree); } diff --git a/test/pretty/resource/after/UnnamedVariables.java b/test/pretty/resource/after/UnnamedVariables.java new file mode 100644 index 0000000000..f95b29caeb --- /dev/null +++ b/test/pretty/resource/after/UnnamedVariables.java @@ -0,0 +1,70 @@ +// version 22: +import java.util.Arrays; +import java.util.Scanner; +import java.util.stream.Stream; + +record Box(T content) { +} + +record Pair(T first, U second) { +} + +public class UnnamedVariables { + void enhancedLoop() { + for (String _ : Arrays.asList("")) { + } + } + + void initializationInForLoop() { + for (int i = 0, _ = Integer.MAX_VALUE; i < 10; i++) { + } + } + + void assignment() { + var _ = 1; + } + + void catchBlock() { + try { + } catch (Exception _) { + } + } + + void tryWithResources() { + try (var _ = new Scanner("")) { + } + } + + void lambda() { + Stream.of(1).forEach(_ -> { + }); + } + + Object switchStatement(Object o) { + return switch (o) { + case String _, Integer _ -> o; + case Long _ -> o; + default -> o; + }; + } + + void recordPattern(Object o) { + if (o instanceof Pair(Box _, Box(Integer _))) { + } + if (o instanceof Box(String _)) { + } + if (o instanceof Box(var _)) { + } + if (o instanceof Box(_)) { + } + } + + Object recordPatternSwitch(Object o) { + return switch (o) { + case Box(String _), Box(Integer _) -> o; + case Box(Long _) -> o; + case Box(_) -> o; + default -> o; + }; + } +} diff --git a/test/pretty/resource/before/UnnamedVariables.java b/test/pretty/resource/before/UnnamedVariables.java new file mode 100644 index 0000000000..f95b29caeb --- /dev/null +++ b/test/pretty/resource/before/UnnamedVariables.java @@ -0,0 +1,70 @@ +// version 22: +import java.util.Arrays; +import java.util.Scanner; +import java.util.stream.Stream; + +record Box(T content) { +} + +record Pair(T first, U second) { +} + +public class UnnamedVariables { + void enhancedLoop() { + for (String _ : Arrays.asList("")) { + } + } + + void initializationInForLoop() { + for (int i = 0, _ = Integer.MAX_VALUE; i < 10; i++) { + } + } + + void assignment() { + var _ = 1; + } + + void catchBlock() { + try { + } catch (Exception _) { + } + } + + void tryWithResources() { + try (var _ = new Scanner("")) { + } + } + + void lambda() { + Stream.of(1).forEach(_ -> { + }); + } + + Object switchStatement(Object o) { + return switch (o) { + case String _, Integer _ -> o; + case Long _ -> o; + default -> o; + }; + } + + void recordPattern(Object o) { + if (o instanceof Pair(Box _, Box(Integer _))) { + } + if (o instanceof Box(String _)) { + } + if (o instanceof Box(var _)) { + } + if (o instanceof Box(_)) { + } + } + + Object recordPatternSwitch(Object o) { + return switch (o) { + case Box(String _), Box(Integer _) -> o; + case Box(Long _) -> o; + case Box(_) -> o; + default -> o; + }; + } +} From c93400d9f44b1e06aa3763c4a2818e43b70f3630 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sun, 14 Jan 2024 10:58:47 +0100 Subject: [PATCH 007/118] [fixes #2917] Use $value instead of value in lazy getter --- .../lombok/eclipse/handlers/HandleGetter.java | 4 +- .../lombok/javac/handlers/HandleGetter.java | 4 +- .../after-delombok/DelegateOnGetter.java | 14 +- .../resource/after-delombok/GetterLazy.java | 14 +- .../after-delombok/GetterLazyArguments.java | 84 ++++++------ .../after-delombok/GetterLazyBoolean.java | 28 ++-- .../GetterLazyEahcToString.java | 14 +- .../GetterLazyErrorPosition.java | 14 +- .../after-delombok/GetterLazyGenerics.java | 28 ++-- .../GetterLazyInAnonymousClass.java | 14 +- .../after-delombok/GetterLazyNative.java | 126 +++++++++--------- .../after-delombok/GetterLazyTransient.java | 14 +- .../after-delombok/SkipSuppressWarnings.java | 14 +- .../resource/after-ecj/DelegateOnGetter.java | 14 +- .../resource/after-ecj/GetterLazy.java | 14 +- .../after-ecj/GetterLazyArguments.java | 84 ++++++------ .../resource/after-ecj/GetterLazyBoolean.java | 28 ++-- .../after-ecj/GetterLazyEahcToString.java | 14 +- .../after-ecj/GetterLazyGenerics.java | 28 ++-- .../after-ecj/GetterLazyInAnonymousClass.java | 14 +- .../resource/after-ecj/GetterLazyNative.java | 126 +++++++++--------- .../after-ecj/GetterLazyTransient.java | 14 +- .../after-ecj/SkipSuppressWarnings.java | 14 +- 23 files changed, 361 insertions(+), 361 deletions(-) diff --git a/src/core/lombok/eclipse/handlers/HandleGetter.java b/src/core/lombok/eclipse/handlers/HandleGetter.java index 2d8b112f47..5ed2c2d94f 100644 --- a/src/core/lombok/eclipse/handlers/HandleGetter.java +++ b/src/core/lombok/eclipse/handlers/HandleGetter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2022 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -323,7 +323,7 @@ public Statement[] createSimpleGetterBody(ASTNode source, EclipseNode fieldNode) TYPE_MAP = Collections.unmodifiableMap(m); } - private static char[] valueName = "value".toCharArray(); + private static char[] valueName = "$value".toCharArray(); private static char[] actualValueName = "actualValue".toCharArray(); private static final int PARENTHESIZED = (1 << ASTNode.ParenthesizedSHIFT) & ASTNode.ParenthesizedMASK; diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index 153a220134..dac524dd3b 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2022 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -358,7 +358,7 @@ public List createLazyGetterBody(JavacTreeMaker maker, JavacNode fi } if (copyOfBoxedFieldType == null) copyOfBoxedFieldType = copyType(maker, field, source); - Name valueName = fieldNode.toName("value"); + Name valueName = fieldNode.toName("$value"); Name actualValueName = fieldNode.toName("actualValue"); /* java.lang.Object value = this.fieldName.get();*/ { diff --git a/test/transform/resource/after-delombok/DelegateOnGetter.java b/test/transform/resource/after-delombok/DelegateOnGetter.java index edf1641bfd..76794085e3 100644 --- a/test/transform/resource/after-delombok/DelegateOnGetter.java +++ b/test/transform/resource/after-delombok/DelegateOnGetter.java @@ -6,11 +6,11 @@ private interface Bar { } @java.lang.SuppressWarnings({"all", "unchecked"}) public Bar getBar() { - java.lang.Object value = this.bar.get(); - if (value == null) { + java.lang.Object $value = this.bar.get(); + if ($value == null) { synchronized (this.bar) { - value = this.bar.get(); - if (value == null) { + $value = this.bar.get(); + if ($value == null) { final Bar actualValue = new Bar() { public void setList(java.util.ArrayList list) { } @@ -18,12 +18,12 @@ public int getInt() { return 42; } }; - value = actualValue == null ? this.bar : actualValue; - this.bar.set(value); + $value = actualValue == null ? this.bar : actualValue; + this.bar.set($value); } } } - return (Bar) (value == this.bar ? null : value); + return (Bar) ($value == this.bar ? null : $value); } @java.lang.SuppressWarnings("all") public void setList(final java.util.ArrayList list) { diff --git a/test/transform/resource/after-delombok/GetterLazy.java b/test/transform/resource/after-delombok/GetterLazy.java index 1e30f94b44..8e1300be1b 100644 --- a/test/transform/resource/after-delombok/GetterLazy.java +++ b/test/transform/resource/after-delombok/GetterLazy.java @@ -4,17 +4,17 @@ static class ValueType { private final java.util.concurrent.atomic.AtomicReference fieldName = new java.util.concurrent.atomic.AtomicReference(); @java.lang.SuppressWarnings({"all", "unchecked"}) public ValueType getFieldName() { - java.lang.Object value = this.fieldName.get(); - if (value == null) { + java.lang.Object $value = this.fieldName.get(); + if ($value == null) { synchronized (this.fieldName) { - value = this.fieldName.get(); - if (value == null) { + $value = this.fieldName.get(); + if ($value == null) { final ValueType actualValue = new ValueType(); - value = actualValue == null ? this.fieldName : actualValue; - this.fieldName.set(value); + $value = actualValue == null ? this.fieldName : actualValue; + this.fieldName.set($value); } } } - return (ValueType) (value == this.fieldName ? null : value); + return (ValueType) ($value == this.fieldName ? null : $value); } } diff --git a/test/transform/resource/after-delombok/GetterLazyArguments.java b/test/transform/resource/after-delombok/GetterLazyArguments.java index ef3f341c31..00b17f5c80 100644 --- a/test/transform/resource/after-delombok/GetterLazyArguments.java +++ b/test/transform/resource/after-delombok/GetterLazyArguments.java @@ -21,99 +21,99 @@ static String stringRunnable(String arg1, Runnable arg2) { @java.lang.SuppressWarnings({"all", "unchecked"}) public String getField1() { - java.lang.Object value = this.field1.get(); - if (value == null) { + java.lang.Object $value = this.field1.get(); + if ($value == null) { synchronized (this.field1) { - value = this.field1.get(); - if (value == null) { + $value = this.field1.get(); + if ($value == null) { final String actualValue = stringInt(("a"), (1)); - value = actualValue == null ? this.field1 : actualValue; - this.field1.set(value); + $value = actualValue == null ? this.field1 : actualValue; + this.field1.set($value); } } } - return (String) (value == this.field1 ? null : value); + return (String) ($value == this.field1 ? null : $value); } @java.lang.SuppressWarnings({"all", "unchecked"}) public String getField2() { - java.lang.Object value = this.field2.get(); - if (value == null) { + java.lang.Object $value = this.field2.get(); + if ($value == null) { synchronized (this.field2) { - value = this.field2.get(); - if (value == null) { + $value = this.field2.get(); + if ($value == null) { final String actualValue = stringInt(true ? "a" : "b", true ? 1 : 0); - value = actualValue == null ? this.field2 : actualValue; - this.field2.set(value); + $value = actualValue == null ? this.field2 : actualValue; + this.field2.set($value); } } } - return (String) (value == this.field2 ? null : value); + return (String) ($value == this.field2 ? null : $value); } @java.lang.SuppressWarnings({"all", "unchecked"}) public String getField3() { - java.lang.Object value = this.field3.get(); - if (value == null) { + java.lang.Object $value = this.field3.get(); + if ($value == null) { synchronized (this.field3) { - value = this.field3.get(); - if (value == null) { + $value = this.field3.get(); + if ($value == null) { final String actualValue = stringInt(("a"), true ? 1 : 0); - value = actualValue == null ? this.field3 : actualValue; - this.field3.set(value); + $value = actualValue == null ? this.field3 : actualValue; + this.field3.set($value); } } } - return (String) (value == this.field3 ? null : value); + return (String) ($value == this.field3 ? null : $value); } @java.lang.SuppressWarnings({"all", "unchecked"}) public String getField4() { - java.lang.Object value = this.field4.get(); - if (value == null) { + java.lang.Object $value = this.field4.get(); + if ($value == null) { synchronized (this.field4) { - value = this.field4.get(); - if (value == null) { + $value = this.field4.get(); + if ($value == null) { final String actualValue = stringRunnable(fun(), () -> { }); - value = actualValue == null ? this.field4 : actualValue; - this.field4.set(value); + $value = actualValue == null ? this.field4 : actualValue; + this.field4.set($value); } } } - return (String) (value == this.field4 ? null : value); + return (String) ($value == this.field4 ? null : $value); } @java.lang.SuppressWarnings({"all", "unchecked"}) public String getField5() { - java.lang.Object value = this.field5.get(); - if (value == null) { + java.lang.Object $value = this.field5.get(); + if ($value == null) { synchronized (this.field5) { - value = this.field5.get(); - if (value == null) { + $value = this.field5.get(); + if ($value == null) { final String actualValue = stringRunnable(("a"), () -> { }); - value = actualValue == null ? this.field5 : actualValue; - this.field5.set(value); + $value = actualValue == null ? this.field5 : actualValue; + this.field5.set($value); } } } - return (String) (value == this.field5 ? null : value); + return (String) ($value == this.field5 ? null : $value); } @java.lang.SuppressWarnings({"all", "unchecked"}) public String getField6() { - java.lang.Object value = this.field6.get(); - if (value == null) { + java.lang.Object $value = this.field6.get(); + if ($value == null) { synchronized (this.field6) { - value = this.field6.get(); - if (value == null) { + $value = this.field6.get(); + if ($value == null) { final String actualValue = true ? stringInt(true ? "a" : "b", true ? 1 : 0) : ""; - value = actualValue == null ? this.field6 : actualValue; - this.field6.set(value); + $value = actualValue == null ? this.field6 : actualValue; + this.field6.set($value); } } } - return (String) (value == this.field6 ? null : value); + return (String) ($value == this.field6 ? null : $value); } } \ No newline at end of file diff --git a/test/transform/resource/after-delombok/GetterLazyBoolean.java b/test/transform/resource/after-delombok/GetterLazyBoolean.java index 5b1f19dcc4..495e6b9254 100644 --- a/test/transform/resource/after-delombok/GetterLazyBoolean.java +++ b/test/transform/resource/after-delombok/GetterLazyBoolean.java @@ -33,32 +33,32 @@ public java.lang.String toString() { } @java.lang.SuppressWarnings({"all", "unchecked"}) public boolean isBooleanValue() { - java.lang.Object value = this.booleanValue.get(); - if (value == null) { + java.lang.Object $value = this.booleanValue.get(); + if ($value == null) { synchronized (this.booleanValue) { - value = this.booleanValue.get(); - if (value == null) { + $value = this.booleanValue.get(); + if ($value == null) { final boolean actualValue = calculateBoolean(); - value = actualValue; - this.booleanValue.set(value); + $value = actualValue; + this.booleanValue.set($value); } } } - return (java.lang.Boolean) value; + return (java.lang.Boolean) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) public boolean isOtherBooleanValue() { - java.lang.Object value = this.otherBooleanValue.get(); - if (value == null) { + java.lang.Object $value = this.otherBooleanValue.get(); + if ($value == null) { synchronized (this.otherBooleanValue) { - value = this.otherBooleanValue.get(); - if (value == null) { + $value = this.otherBooleanValue.get(); + if ($value == null) { final boolean actualValue = !calculateBoolean(); - value = actualValue; - this.otherBooleanValue.set(value); + $value = actualValue; + this.otherBooleanValue.set($value); } } } - return (java.lang.Boolean) value; + return (java.lang.Boolean) $value; } } diff --git a/test/transform/resource/after-delombok/GetterLazyEahcToString.java b/test/transform/resource/after-delombok/GetterLazyEahcToString.java index bec89818fa..3742093ba4 100644 --- a/test/transform/resource/after-delombok/GetterLazyEahcToString.java +++ b/test/transform/resource/after-delombok/GetterLazyEahcToString.java @@ -46,18 +46,18 @@ public java.lang.String toString() { @java.lang.SuppressWarnings({"all", "unchecked"}) public String getValue() { - java.lang.Object value = this.value.get(); - if (value == null) { + java.lang.Object $value = this.value.get(); + if ($value == null) { synchronized (this.value) { - value = this.value.get(); - if (value == null) { + $value = this.value.get(); + if ($value == null) { final String actualValue = ""; - value = actualValue == null ? this.value : actualValue; - this.value.set(value); + $value = actualValue == null ? this.value : actualValue; + this.value.set($value); } } } - return (String) (value == this.value ? null : value); + return (String) ($value == this.value ? null : $value); } @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/GetterLazyErrorPosition.java b/test/transform/resource/after-delombok/GetterLazyErrorPosition.java index 76797d4427..c901387690 100644 --- a/test/transform/resource/after-delombok/GetterLazyErrorPosition.java +++ b/test/transform/resource/after-delombok/GetterLazyErrorPosition.java @@ -3,17 +3,17 @@ class GetterLazyErrorPosition { @java.lang.SuppressWarnings({"all", "unchecked"}) public String getField() { - java.lang.Object value = this.field.get(); - if (value == null) { + java.lang.Object $value = this.field.get(); + if ($value == null) { synchronized (this.field) { - value = this.field.get(); - if (value == null) { + $value = this.field.get(); + if ($value == null) { final String actualValue = true ? "" : new ErrorPosition(); - value = actualValue == null ? this.field : actualValue; - this.field.set(value); + $value = actualValue == null ? this.field : actualValue; + this.field.set($value); } } } - return (String) (value == this.field ? null : value); + return (String) ($value == this.field ? null : $value); } } diff --git a/test/transform/resource/after-delombok/GetterLazyGenerics.java b/test/transform/resource/after-delombok/GetterLazyGenerics.java index 5e92cda7a2..a8b8ff6c34 100644 --- a/test/transform/resource/after-delombok/GetterLazyGenerics.java +++ b/test/transform/resource/after-delombok/GetterLazyGenerics.java @@ -6,32 +6,32 @@ public static E getAny() { } @java.lang.SuppressWarnings({"all", "unchecked"}) public E getField() { - java.lang.Object value = this.field.get(); - if (value == null) { + java.lang.Object $value = this.field.get(); + if ($value == null) { synchronized (this.field) { - value = this.field.get(); - if (value == null) { + $value = this.field.get(); + if ($value == null) { final E actualValue = getAny(); - value = actualValue == null ? this.field : actualValue; - this.field.set(value); + $value = actualValue == null ? this.field : actualValue; + this.field.set($value); } } } - return (E) (value == this.field ? null : value); + return (E) ($value == this.field ? null : $value); } @java.lang.SuppressWarnings({"all", "unchecked"}) public long getField2() { - java.lang.Object value = this.field2.get(); - if (value == null) { + java.lang.Object $value = this.field2.get(); + if ($value == null) { synchronized (this.field2) { - value = this.field2.get(); - if (value == null) { + $value = this.field2.get(); + if ($value == null) { final long actualValue = System.currentTimeMillis(); - value = actualValue; - this.field2.set(value); + $value = actualValue; + this.field2.set($value); } } } - return (java.lang.Long) value; + return (java.lang.Long) $value; } } \ No newline at end of file diff --git a/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java b/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java index 4476e463bd..199437a11d 100644 --- a/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java +++ b/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java @@ -6,18 +6,18 @@ class Inner { @java.lang.SuppressWarnings({"all", "unchecked"}) public String getString() { - java.lang.Object value = this.string.get(); - if (value == null) { + java.lang.Object $value = this.string.get(); + if ($value == null) { synchronized (this.string) { - value = this.string.get(); - if (value == null) { + $value = this.string.get(); + if ($value == null) { final String actualValue = "test"; - value = actualValue == null ? this.string : actualValue; - this.string.set(value); + $value = actualValue == null ? this.string : actualValue; + this.string.set($value); } } } - return (String) (value == this.string ? null : value); + return (String) ($value == this.string ? null : $value); } } }; diff --git a/test/transform/resource/after-delombok/GetterLazyNative.java b/test/transform/resource/after-delombok/GetterLazyNative.java index f43d54907c..a71a0354bc 100644 --- a/test/transform/resource/after-delombok/GetterLazyNative.java +++ b/test/transform/resource/after-delombok/GetterLazyNative.java @@ -10,137 +10,137 @@ class GetterLazyNative { private final java.util.concurrent.atomic.AtomicReference intArrayField = new java.util.concurrent.atomic.AtomicReference(); @java.lang.SuppressWarnings({"all", "unchecked"}) public boolean isBooleanField() { - java.lang.Object value = this.booleanField.get(); - if (value == null) { + java.lang.Object $value = this.booleanField.get(); + if ($value == null) { synchronized (this.booleanField) { - value = this.booleanField.get(); - if (value == null) { + $value = this.booleanField.get(); + if ($value == null) { final boolean actualValue = true; - value = actualValue; - this.booleanField.set(value); + $value = actualValue; + this.booleanField.set($value); } } } - return (java.lang.Boolean) value; + return (java.lang.Boolean) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) public byte getByteField() { - java.lang.Object value = this.byteField.get(); - if (value == null) { + java.lang.Object $value = this.byteField.get(); + if ($value == null) { synchronized (this.byteField) { - value = this.byteField.get(); - if (value == null) { + $value = this.byteField.get(); + if ($value == null) { final byte actualValue = 1; - value = actualValue; - this.byteField.set(value); + $value = actualValue; + this.byteField.set($value); } } } - return (java.lang.Byte) value; + return (java.lang.Byte) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) public short getShortField() { - java.lang.Object value = this.shortField.get(); - if (value == null) { + java.lang.Object $value = this.shortField.get(); + if ($value == null) { synchronized (this.shortField) { - value = this.shortField.get(); - if (value == null) { + $value = this.shortField.get(); + if ($value == null) { final short actualValue = 1; - value = actualValue; - this.shortField.set(value); + $value = actualValue; + this.shortField.set($value); } } } - return (java.lang.Short) value; + return (java.lang.Short) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) public int getIntField() { - java.lang.Object value = this.intField.get(); - if (value == null) { + java.lang.Object $value = this.intField.get(); + if ($value == null) { synchronized (this.intField) { - value = this.intField.get(); - if (value == null) { + $value = this.intField.get(); + if ($value == null) { final int actualValue = 1; - value = actualValue; - this.intField.set(value); + $value = actualValue; + this.intField.set($value); } } } - return (java.lang.Integer) value; + return (java.lang.Integer) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) public long getLongField() { - java.lang.Object value = this.longField.get(); - if (value == null) { + java.lang.Object $value = this.longField.get(); + if ($value == null) { synchronized (this.longField) { - value = this.longField.get(); - if (value == null) { + $value = this.longField.get(); + if ($value == null) { final long actualValue = 1; - value = actualValue; - this.longField.set(value); + $value = actualValue; + this.longField.set($value); } } } - return (java.lang.Long) value; + return (java.lang.Long) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) public float getFloatField() { - java.lang.Object value = this.floatField.get(); - if (value == null) { + java.lang.Object $value = this.floatField.get(); + if ($value == null) { synchronized (this.floatField) { - value = this.floatField.get(); - if (value == null) { + $value = this.floatField.get(); + if ($value == null) { final float actualValue = 1.0F; - value = actualValue; - this.floatField.set(value); + $value = actualValue; + this.floatField.set($value); } } } - return (java.lang.Float) value; + return (java.lang.Float) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) public double getDoubleField() { - java.lang.Object value = this.doubleField.get(); - if (value == null) { + java.lang.Object $value = this.doubleField.get(); + if ($value == null) { synchronized (this.doubleField) { - value = this.doubleField.get(); - if (value == null) { + $value = this.doubleField.get(); + if ($value == null) { final double actualValue = 1.0; - value = actualValue; - this.doubleField.set(value); + $value = actualValue; + this.doubleField.set($value); } } } - return (java.lang.Double) value; + return (java.lang.Double) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) public char getCharField() { - java.lang.Object value = this.charField.get(); - if (value == null) { + java.lang.Object $value = this.charField.get(); + if ($value == null) { synchronized (this.charField) { - value = this.charField.get(); - if (value == null) { + $value = this.charField.get(); + if ($value == null) { final char actualValue = '1'; - value = actualValue; - this.charField.set(value); + $value = actualValue; + this.charField.set($value); } } } - return (java.lang.Character) value; + return (java.lang.Character) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) public int[] getIntArrayField() { - java.lang.Object value = this.intArrayField.get(); - if (value == null) { + java.lang.Object $value = this.intArrayField.get(); + if ($value == null) { synchronized (this.intArrayField) { - value = this.intArrayField.get(); - if (value == null) { + $value = this.intArrayField.get(); + if ($value == null) { final int[] actualValue = new int[] {1}; - value = actualValue == null ? this.intArrayField : actualValue; - this.intArrayField.set(value); + $value = actualValue == null ? this.intArrayField : actualValue; + this.intArrayField.set($value); } } } - return (int[]) (value == this.intArrayField ? null : value); + return (int[]) ($value == this.intArrayField ? null : $value); } } diff --git a/test/transform/resource/after-delombok/GetterLazyTransient.java b/test/transform/resource/after-delombok/GetterLazyTransient.java index 0fd8562138..3d1a2be302 100644 --- a/test/transform/resource/after-delombok/GetterLazyTransient.java +++ b/test/transform/resource/after-delombok/GetterLazyTransient.java @@ -4,18 +4,18 @@ class GetterLazyTransient { private final transient int nonLazyTransientField = 3; @java.lang.SuppressWarnings({"all", "unchecked"}) public int getNonTransientField() { - java.lang.Object value = this.nonTransientField.get(); - if (value == null) { + java.lang.Object $value = this.nonTransientField.get(); + if ($value == null) { synchronized (this.nonTransientField) { - value = this.nonTransientField.get(); - if (value == null) { + $value = this.nonTransientField.get(); + if ($value == null) { final int actualValue = 1; - value = actualValue; - this.nonTransientField.set(value); + $value = actualValue; + this.nonTransientField.set($value); } } } - return (java.lang.Integer) value; + return (java.lang.Integer) $value; } @java.lang.SuppressWarnings("all") public int getNonLazyTransientField() { diff --git a/test/transform/resource/after-delombok/SkipSuppressWarnings.java b/test/transform/resource/after-delombok/SkipSuppressWarnings.java index 151d4e1772..77bfdcc463 100644 --- a/test/transform/resource/after-delombok/SkipSuppressWarnings.java +++ b/test/transform/resource/after-delombok/SkipSuppressWarnings.java @@ -8,17 +8,17 @@ public String getField() { @java.lang.SuppressWarnings({"unchecked"}) public String getField2() { - java.lang.Object value = this.field2.get(); - if (value == null) { + java.lang.Object $value = this.field2.get(); + if ($value == null) { synchronized (this.field2) { - value = this.field2.get(); - if (value == null) { + $value = this.field2.get(); + if ($value == null) { final String actualValue = ""; - value = actualValue == null ? this.field2 : actualValue; - this.field2.set(value); + $value = actualValue == null ? this.field2 : actualValue; + this.field2.set($value); } } } - return (String) (value == this.field2 ? null : value); + return (String) ($value == this.field2 ? null : $value); } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java index f2b9a6cd2f..c23ea91709 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetter.java +++ b/test/transform/resource/after-ecj/DelegateOnGetter.java @@ -10,13 +10,13 @@ private interface Bar { super(); } public @Delegate @java.lang.SuppressWarnings({"all", "unchecked"}) Bar getBar() { - java.lang.Object value = this.bar.get(); - if ((value == null)) + java.lang.Object $value = this.bar.get(); + if (($value == null)) { synchronized (this.bar) { - value = this.bar.get(); - if ((value == null)) + $value = this.bar.get(); + if (($value == null)) { final Bar actualValue = new Bar() { x() { @@ -28,12 +28,12 @@ public int getInt() { return 42; } }; - value = ((actualValue == null) ? this.bar : actualValue); - this.bar.set(value); + $value = ((actualValue == null) ? this.bar : actualValue); + this.bar.set($value); } } } - return (Bar) ((value == this.bar) ? null : value); + return (Bar) (($value == this.bar) ? null : $value); } public @java.lang.SuppressWarnings("all") int getInt() { return this.getBar().getInt(); diff --git a/test/transform/resource/after-ecj/GetterLazy.java b/test/transform/resource/after-ecj/GetterLazy.java index b4567f04f6..7627ab1688 100644 --- a/test/transform/resource/after-ecj/GetterLazy.java +++ b/test/transform/resource/after-ecj/GetterLazy.java @@ -9,20 +9,20 @@ static class ValueType { super(); } public @java.lang.SuppressWarnings({"all", "unchecked"}) ValueType getFieldName() { - java.lang.Object value = this.fieldName.get(); - if ((value == null)) + java.lang.Object $value = this.fieldName.get(); + if (($value == null)) { synchronized (this.fieldName) { - value = this.fieldName.get(); - if ((value == null)) + $value = this.fieldName.get(); + if (($value == null)) { final ValueType actualValue = new ValueType(); - value = ((actualValue == null) ? this.fieldName : actualValue); - this.fieldName.set(value); + $value = ((actualValue == null) ? this.fieldName : actualValue); + this.fieldName.set($value); } } } - return (ValueType) ((value == this.fieldName) ? null : value); + return (ValueType) (($value == this.fieldName) ? null : $value); } } diff --git a/test/transform/resource/after-ecj/GetterLazyArguments.java b/test/transform/resource/after-ecj/GetterLazyArguments.java index 14086d8192..bb51c4fc1f 100644 --- a/test/transform/resource/after-ecj/GetterLazyArguments.java +++ b/test/transform/resource/after-ecj/GetterLazyArguments.java @@ -18,107 +18,107 @@ static String stringRunnable(String arg1, Runnable arg2) { return null; } public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField1() { - java.lang.Object value = this.field1.get(); - if ((value == null)) + java.lang.Object $value = this.field1.get(); + if (($value == null)) { synchronized (this.field1) { - value = this.field1.get(); - if ((value == null)) + $value = this.field1.get(); + if (($value == null)) { final String actualValue = stringInt("a", 1); - value = ((actualValue == null) ? this.field1 : actualValue); - this.field1.set(value); + $value = ((actualValue == null) ? this.field1 : actualValue); + this.field1.set($value); } } } - return (String) ((value == this.field1) ? null : value); + return (String) (($value == this.field1) ? null : $value); } public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField2() { - java.lang.Object value = this.field2.get(); - if ((value == null)) + java.lang.Object $value = this.field2.get(); + if (($value == null)) { synchronized (this.field2) { - value = this.field2.get(); - if ((value == null)) + $value = this.field2.get(); + if (($value == null)) { final String actualValue = stringInt((true ? "a" : "b"), (true ? 1 : 0)); - value = ((actualValue == null) ? this.field2 : actualValue); - this.field2.set(value); + $value = ((actualValue == null) ? this.field2 : actualValue); + this.field2.set($value); } } } - return (String) ((value == this.field2) ? null : value); + return (String) (($value == this.field2) ? null : $value); } public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField3() { - java.lang.Object value = this.field3.get(); - if ((value == null)) + java.lang.Object $value = this.field3.get(); + if (($value == null)) { synchronized (this.field3) { - value = this.field3.get(); - if ((value == null)) + $value = this.field3.get(); + if (($value == null)) { final String actualValue = stringInt("a", (true ? 1 : 0)); - value = ((actualValue == null) ? this.field3 : actualValue); - this.field3.set(value); + $value = ((actualValue == null) ? this.field3 : actualValue); + this.field3.set($value); } } } - return (String) ((value == this.field3) ? null : value); + return (String) (($value == this.field3) ? null : $value); } public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField4() { - java.lang.Object value = this.field4.get(); - if ((value == null)) + java.lang.Object $value = this.field4.get(); + if (($value == null)) { synchronized (this.field4) { - value = this.field4.get(); - if ((value == null)) + $value = this.field4.get(); + if (($value == null)) { final String actualValue = stringRunnable(fun(), () -> { }); - value = ((actualValue == null) ? this.field4 : actualValue); - this.field4.set(value); + $value = ((actualValue == null) ? this.field4 : actualValue); + this.field4.set($value); } } } - return (String) ((value == this.field4) ? null : value); + return (String) (($value == this.field4) ? null : $value); } public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField5() { - java.lang.Object value = this.field5.get(); - if ((value == null)) + java.lang.Object $value = this.field5.get(); + if (($value == null)) { synchronized (this.field5) { - value = this.field5.get(); - if ((value == null)) + $value = this.field5.get(); + if (($value == null)) { final String actualValue = stringRunnable("a", () -> { }); - value = ((actualValue == null) ? this.field5 : actualValue); - this.field5.set(value); + $value = ((actualValue == null) ? this.field5 : actualValue); + this.field5.set($value); } } } - return (String) ((value == this.field5) ? null : value); + return (String) (($value == this.field5) ? null : $value); } public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField6() { - java.lang.Object value = this.field6.get(); - if ((value == null)) + java.lang.Object $value = this.field6.get(); + if (($value == null)) { synchronized (this.field6) { - value = this.field6.get(); - if ((value == null)) + $value = this.field6.get(); + if (($value == null)) { final String actualValue = (true ? stringInt((true ? "a" : "b"), (true ? 1 : 0)) : ""); - value = ((actualValue == null) ? this.field6 : actualValue); - this.field6.set(value); + $value = ((actualValue == null) ? this.field6 : actualValue); + this.field6.set($value); } } } - return (String) ((value == this.field6) ? null : value); + return (String) (($value == this.field6) ? null : $value); } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterLazyBoolean.java b/test/transform/resource/after-ecj/GetterLazyBoolean.java index ad319755fd..40ecb856de 100644 --- a/test/transform/resource/after-ecj/GetterLazyBoolean.java +++ b/test/transform/resource/after-ecj/GetterLazyBoolean.java @@ -8,38 +8,38 @@ private static boolean calculateBoolean() { return true; } public @java.lang.SuppressWarnings({"all", "unchecked"}) boolean isBooleanValue() { - java.lang.Object value = this.booleanValue.get(); - if ((value == null)) + java.lang.Object $value = this.booleanValue.get(); + if (($value == null)) { synchronized (this.booleanValue) { - value = this.booleanValue.get(); - if ((value == null)) + $value = this.booleanValue.get(); + if (($value == null)) { final boolean actualValue = calculateBoolean(); - value = actualValue; - this.booleanValue.set(value); + $value = actualValue; + this.booleanValue.set($value); } } } - return (java.lang.Boolean) value; + return (java.lang.Boolean) $value; } public @java.lang.SuppressWarnings({"all", "unchecked"}) boolean isOtherBooleanValue() { - java.lang.Object value = this.otherBooleanValue.get(); - if ((value == null)) + java.lang.Object $value = this.otherBooleanValue.get(); + if (($value == null)) { synchronized (this.otherBooleanValue) { - value = this.otherBooleanValue.get(); - if ((value == null)) + $value = this.otherBooleanValue.get(); + if (($value == null)) { final boolean actualValue = (! calculateBoolean()); - value = actualValue; - this.otherBooleanValue.set(value); + $value = actualValue; + this.otherBooleanValue.set($value); } } } - return (java.lang.Boolean) value; + return (java.lang.Boolean) $value; } public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { if ((o == this)) diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java index 5197f4e145..f4f4ed37bd 100644 --- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java +++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java @@ -5,21 +5,21 @@ super(); } public @java.lang.SuppressWarnings({"all", "unchecked"}) String getValue() { - java.lang.Object value = this.value.get(); - if ((value == null)) + java.lang.Object $value = this.value.get(); + if (($value == null)) { synchronized (this.value) { - value = this.value.get(); - if ((value == null)) + $value = this.value.get(); + if (($value == null)) { final String actualValue = ""; - value = ((actualValue == null) ? this.value : actualValue); - this.value.set(value); + $value = ((actualValue == null) ? this.value : actualValue); + this.value.set($value); } } } - return (String) ((value == this.value) ? null : value); + return (String) (($value == this.value) ? null : $value); } public @java.lang.SuppressWarnings("all") String getValue2() { return this.value2; diff --git a/test/transform/resource/after-ecj/GetterLazyGenerics.java b/test/transform/resource/after-ecj/GetterLazyGenerics.java index 67ef55434c..3a2a06c1ae 100644 --- a/test/transform/resource/after-ecj/GetterLazyGenerics.java +++ b/test/transform/resource/after-ecj/GetterLazyGenerics.java @@ -8,37 +8,37 @@ public static E getAny() { return null; } public @java.lang.SuppressWarnings({"all", "unchecked"}) E getField() { - java.lang.Object value = this.field.get(); - if ((value == null)) + java.lang.Object $value = this.field.get(); + if (($value == null)) { synchronized (this.field) { - value = this.field.get(); - if ((value == null)) + $value = this.field.get(); + if (($value == null)) { final E actualValue = getAny(); - value = ((actualValue == null) ? this.field : actualValue); - this.field.set(value); + $value = ((actualValue == null) ? this.field : actualValue); + this.field.set($value); } } } - return (E) ((value == this.field) ? null : value); + return (E) (($value == this.field) ? null : $value); } public @java.lang.SuppressWarnings({"all", "unchecked"}) long getField2() { - java.lang.Object value = this.field2.get(); - if ((value == null)) + java.lang.Object $value = this.field2.get(); + if (($value == null)) { synchronized (this.field2) { - value = this.field2.get(); - if ((value == null)) + $value = this.field2.get(); + if (($value == null)) { final long actualValue = System.currentTimeMillis(); - value = actualValue; - this.field2.set(value); + $value = actualValue; + this.field2.set($value); } } } - return (java.lang.Long) value; + return (java.lang.Long) $value; } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java b/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java index ab8bc5997c..dadd8e71ec 100644 --- a/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java +++ b/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java @@ -7,21 +7,21 @@ class Inner { super(); } public @java.lang.SuppressWarnings({"all", "unchecked"}) String getString() { - java.lang.Object value = this.string.get(); - if ((value == null)) + java.lang.Object $value = this.string.get(); + if (($value == null)) { synchronized (this.string) { - value = this.string.get(); - if ((value == null)) + $value = this.string.get(); + if (($value == null)) { final String actualValue = "test"; - value = ((actualValue == null) ? this.string : actualValue); - this.string.set(value); + $value = ((actualValue == null) ? this.string : actualValue); + this.string.set($value); } } } - return (String) ((value == this.string) ? null : value); + return (String) (($value == this.string) ? null : $value); } } x() { diff --git a/test/transform/resource/after-ecj/GetterLazyNative.java b/test/transform/resource/after-ecj/GetterLazyNative.java index 7808068e59..c2769c5123 100644 --- a/test/transform/resource/after-ecj/GetterLazyNative.java +++ b/test/transform/resource/after-ecj/GetterLazyNative.java @@ -12,156 +12,156 @@ class GetterLazyNative { super(); } public @java.lang.SuppressWarnings({"all", "unchecked"}) boolean isBooleanField() { - java.lang.Object value = this.booleanField.get(); - if ((value == null)) + java.lang.Object $value = this.booleanField.get(); + if (($value == null)) { synchronized (this.booleanField) { - value = this.booleanField.get(); - if ((value == null)) + $value = this.booleanField.get(); + if (($value == null)) { final boolean actualValue = true; - value = actualValue; - this.booleanField.set(value); + $value = actualValue; + this.booleanField.set($value); } } } - return (java.lang.Boolean) value; + return (java.lang.Boolean) $value; } public @java.lang.SuppressWarnings({"all", "unchecked"}) byte getByteField() { - java.lang.Object value = this.byteField.get(); - if ((value == null)) + java.lang.Object $value = this.byteField.get(); + if (($value == null)) { synchronized (this.byteField) { - value = this.byteField.get(); - if ((value == null)) + $value = this.byteField.get(); + if (($value == null)) { final byte actualValue = 1; - value = actualValue; - this.byteField.set(value); + $value = actualValue; + this.byteField.set($value); } } } - return (java.lang.Byte) value; + return (java.lang.Byte) $value; } public @java.lang.SuppressWarnings({"all", "unchecked"}) short getShortField() { - java.lang.Object value = this.shortField.get(); - if ((value == null)) + java.lang.Object $value = this.shortField.get(); + if (($value == null)) { synchronized (this.shortField) { - value = this.shortField.get(); - if ((value == null)) + $value = this.shortField.get(); + if (($value == null)) { final short actualValue = 1; - value = actualValue; - this.shortField.set(value); + $value = actualValue; + this.shortField.set($value); } } } - return (java.lang.Short) value; + return (java.lang.Short) $value; } public @java.lang.SuppressWarnings({"all", "unchecked"}) int getIntField() { - java.lang.Object value = this.intField.get(); - if ((value == null)) + java.lang.Object $value = this.intField.get(); + if (($value == null)) { synchronized (this.intField) { - value = this.intField.get(); - if ((value == null)) + $value = this.intField.get(); + if (($value == null)) { final int actualValue = 1; - value = actualValue; - this.intField.set(value); + $value = actualValue; + this.intField.set($value); } } } - return (java.lang.Integer) value; + return (java.lang.Integer) $value; } public @java.lang.SuppressWarnings({"all", "unchecked"}) long getLongField() { - java.lang.Object value = this.longField.get(); - if ((value == null)) + java.lang.Object $value = this.longField.get(); + if (($value == null)) { synchronized (this.longField) { - value = this.longField.get(); - if ((value == null)) + $value = this.longField.get(); + if (($value == null)) { final long actualValue = 1; - value = actualValue; - this.longField.set(value); + $value = actualValue; + this.longField.set($value); } } } - return (java.lang.Long) value; + return (java.lang.Long) $value; } public @java.lang.SuppressWarnings({"all", "unchecked"}) float getFloatField() { - java.lang.Object value = this.floatField.get(); - if ((value == null)) + java.lang.Object $value = this.floatField.get(); + if (($value == null)) { synchronized (this.floatField) { - value = this.floatField.get(); - if ((value == null)) + $value = this.floatField.get(); + if (($value == null)) { final float actualValue = 1.0f; - value = actualValue; - this.floatField.set(value); + $value = actualValue; + this.floatField.set($value); } } } - return (java.lang.Float) value; + return (java.lang.Float) $value; } public @java.lang.SuppressWarnings({"all", "unchecked"}) double getDoubleField() { - java.lang.Object value = this.doubleField.get(); - if ((value == null)) + java.lang.Object $value = this.doubleField.get(); + if (($value == null)) { synchronized (this.doubleField) { - value = this.doubleField.get(); - if ((value == null)) + $value = this.doubleField.get(); + if (($value == null)) { final double actualValue = 1.0; - value = actualValue; - this.doubleField.set(value); + $value = actualValue; + this.doubleField.set($value); } } } - return (java.lang.Double) value; + return (java.lang.Double) $value; } public @java.lang.SuppressWarnings({"all", "unchecked"}) char getCharField() { - java.lang.Object value = this.charField.get(); - if ((value == null)) + java.lang.Object $value = this.charField.get(); + if (($value == null)) { synchronized (this.charField) { - value = this.charField.get(); - if ((value == null)) + $value = this.charField.get(); + if (($value == null)) { final char actualValue = '1'; - value = actualValue; - this.charField.set(value); + $value = actualValue; + this.charField.set($value); } } } - return (java.lang.Character) value; + return (java.lang.Character) $value; } public @java.lang.SuppressWarnings({"all", "unchecked"}) int[] getIntArrayField() { - java.lang.Object value = this.intArrayField.get(); - if ((value == null)) + java.lang.Object $value = this.intArrayField.get(); + if (($value == null)) { synchronized (this.intArrayField) { - value = this.intArrayField.get(); - if ((value == null)) + $value = this.intArrayField.get(); + if (($value == null)) { final int[] actualValue = new int[]{1}; - value = ((actualValue == null) ? this.intArrayField : actualValue); - this.intArrayField.set(value); + $value = ((actualValue == null) ? this.intArrayField : actualValue); + this.intArrayField.set($value); } } } - return (int[]) ((value == this.intArrayField) ? null : value); + return (int[]) (($value == this.intArrayField) ? null : $value); } } diff --git a/test/transform/resource/after-ecj/GetterLazyTransient.java b/test/transform/resource/after-ecj/GetterLazyTransient.java index 7e5f4a416f..b97fe53315 100644 --- a/test/transform/resource/after-ecj/GetterLazyTransient.java +++ b/test/transform/resource/after-ecj/GetterLazyTransient.java @@ -6,21 +6,21 @@ class GetterLazyTransient { super(); } public @java.lang.SuppressWarnings({"all", "unchecked"}) int getNonTransientField() { - java.lang.Object value = this.nonTransientField.get(); - if ((value == null)) + java.lang.Object $value = this.nonTransientField.get(); + if (($value == null)) { synchronized (this.nonTransientField) { - value = this.nonTransientField.get(); - if ((value == null)) + $value = this.nonTransientField.get(); + if (($value == null)) { final int actualValue = 1; - value = actualValue; - this.nonTransientField.set(value); + $value = actualValue; + this.nonTransientField.set($value); } } } - return (java.lang.Integer) value; + return (java.lang.Integer) $value; } public @java.lang.SuppressWarnings("all") int getNonLazyTransientField() { return this.nonLazyTransientField; diff --git a/test/transform/resource/after-ecj/SkipSuppressWarnings.java b/test/transform/resource/after-ecj/SkipSuppressWarnings.java index 5303251987..76b79fe2ad 100644 --- a/test/transform/resource/after-ecj/SkipSuppressWarnings.java +++ b/test/transform/resource/after-ecj/SkipSuppressWarnings.java @@ -8,20 +8,20 @@ public String getField() { return this.field; } public @java.lang.SuppressWarnings({"unchecked"}) String getField2() { - java.lang.Object value = this.field2.get(); - if ((value == null)) + java.lang.Object $value = this.field2.get(); + if (($value == null)) { synchronized (this.field2) { - value = this.field2.get(); - if ((value == null)) + $value = this.field2.get(); + if (($value == null)) { final String actualValue = ""; - value = ((actualValue == null) ? this.field2 : actualValue); - this.field2.set(value); + $value = ((actualValue == null) ? this.field2 : actualValue); + this.field2.set($value); } } } - return (String) ((value == this.field2) ? null : value); + return (String) (($value == this.field2) ? null : $value); } } \ No newline at end of file From e4824cbe1405fd665f289f7178d6149a8fcdd7b5 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sun, 3 Mar 2024 12:18:53 +0100 Subject: [PATCH 008/118] Fix Javadoc in Eclipse --- .../lombok/eclipse/agent/PatchJavadoc.java | 7 +-- .../lombok/launch/PatchFixesHider.java | 11 ---- .../javadoc/getterSetter/Javadoc.java | 25 +++++++++ .../src/lombok/eclipse/EclipseTests.java | 3 +- .../src/lombok/eclipse/misc/JavadocTest.java | 54 +++++++++++++++++++ 5 files changed, 82 insertions(+), 18 deletions(-) create mode 100644 test/eclipse/resource/javadoc/getterSetter/Javadoc.java create mode 100644 test/eclipse/src/lombok/eclipse/misc/JavadocTest.java diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchJavadoc.java b/src/eclipseAgent/lombok/eclipse/agent/PatchJavadoc.java index f270e19ff2..38b69bf7f0 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchJavadoc.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchJavadoc.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 The Project Lombok Authors. + * Copyright (C) 2020-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,20 +24,15 @@ import static lombok.eclipse.EcjAugments.CompilationUnit_javadoc; import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; import java.util.Map; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMember; -import org.eclipse.jdt.internal.compiler.ast.ASTNode; -import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; -import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; import org.eclipse.jdt.internal.core.CompilationUnit; import org.eclipse.jdt.internal.core.SourceMethod; import org.eclipse.jdt.internal.ui.text.javadoc.JavadocContentAccess2; -import lombok.eclipse.handlers.EclipseHandlerUtil; import lombok.permit.Permit; public class PatchJavadoc { diff --git a/src/eclipseAgent/lombok/launch/PatchFixesHider.java b/src/eclipseAgent/lombok/launch/PatchFixesHider.java index 3bdf7974f1..74bb0b8abd 100755 --- a/src/eclipseAgent/lombok/launch/PatchFixesHider.java +++ b/src/eclipseAgent/lombok/launch/PatchFixesHider.java @@ -432,26 +432,15 @@ public static Object modifyMethodPattern(Object original) { /** Contains patch code to support Javadoc for generated methods */ public static final class Javadoc { private static final Method GET_HTML; - private static final Method PRINT_METHOD_OLD; - private static final Method PRINT_METHOD_NEW; static { Class shadowed = Util.shadowLoadClass("lombok.eclipse.agent.PatchJavadoc"); GET_HTML = Util.findMethod(shadowed, "getHTMLContentFromSource", String.class, Object.class); - PRINT_METHOD_NEW = Util.findMethod(shadowed, "printMethod", AbstractMethodDeclaration.class, Integer.class, StringBuilder.class, TypeDeclaration.class); - PRINT_METHOD_OLD = Util.findMethod(shadowed, "printMethod", AbstractMethodDeclaration.class, Integer.class, StringBuffer.class, TypeDeclaration.class); } public static String getHTMLContentFromSource(String original, IJavaElement member) { return (String) Util.invokeMethod(GET_HTML, original, member); } - - public static StringBuilder printMethod(AbstractMethodDeclaration methodDeclaration, int tab, StringBuilder output, TypeDeclaration type) { - return (StringBuilder) Util.invokeMethod(PRINT_METHOD_NEW, methodDeclaration, tab, output, type); - } - public static StringBuffer printMethod(AbstractMethodDeclaration methodDeclaration, int tab, StringBuffer output, TypeDeclaration type) { - return (StringBuffer) Util.invokeMethod(PRINT_METHOD_OLD, methodDeclaration, tab, output, type); - } } /** diff --git a/test/eclipse/resource/javadoc/getterSetter/Javadoc.java b/test/eclipse/resource/javadoc/getterSetter/Javadoc.java new file mode 100644 index 0000000000..9f07e9e08f --- /dev/null +++ b/test/eclipse/resource/javadoc/getterSetter/Javadoc.java @@ -0,0 +1,25 @@ +package pkg; + +import lombok.Getter; +import lombok.Setter; + +public class Javadoc { + /** + * Some text + * + * **SETTER** + * Setter section + * @param fieldName Hello, World3 + * **GETTER** + * Getter section + * @return Sky is blue3 + */ + @Getter + @Setter + private int field; + + public void usage() { + getField(); + setField(0); + } +} \ No newline at end of file diff --git a/test/eclipse/src/lombok/eclipse/EclipseTests.java b/test/eclipse/src/lombok/eclipse/EclipseTests.java index 04f78f0f71..e09313dd61 100644 --- a/test/eclipse/src/lombok/eclipse/EclipseTests.java +++ b/test/eclipse/src/lombok/eclipse/EclipseTests.java @@ -28,13 +28,14 @@ import lombok.eclipse.cleanup.CleanupTest; import lombok.eclipse.compile.NoErrorsTest; import lombok.eclipse.edit.SelectTest; +import lombok.eclipse.misc.JavadocTest; import lombok.eclipse.refactoring.ExtractInterfaceTest; import lombok.eclipse.refactoring.InlineTest; import lombok.eclipse.refactoring.RenameTest; import lombok.eclipse.references.FindReferencesTest; @RunWith(Suite.class) -@SuiteClasses({ExtractInterfaceTest.class, RenameTest.class, SelectTest.class, CleanupTest.class, FindReferencesTest.class, InlineTest.class, NoErrorsTest.class}) +@SuiteClasses({ExtractInterfaceTest.class, RenameTest.class, SelectTest.class, CleanupTest.class, FindReferencesTest.class, InlineTest.class, NoErrorsTest.class, JavadocTest.class}) public class EclipseTests { } diff --git a/test/eclipse/src/lombok/eclipse/misc/JavadocTest.java b/test/eclipse/src/lombok/eclipse/misc/JavadocTest.java new file mode 100644 index 0000000000..bbd731258d --- /dev/null +++ b/test/eclipse/src/lombok/eclipse/misc/JavadocTest.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2024 The Project Lombok Authors. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok.eclipse.misc; + +import static org.junit.Assert.assertEquals; + +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.internal.ui.text.javadoc.JavadocContentAccess2; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import lombok.eclipse.EclipseRunner; +import lombok.eclipse.SetupSingleFileTest; + +@RunWith(EclipseRunner.class) +public class JavadocTest { + + @Rule + public SetupSingleFileTest setup = new SetupSingleFileTest(); + + @Test + public void getterSetter() throws Exception { + ICompilationUnit cu = setup.getPackageFragment().getCompilationUnit("Javadoc.java"); + + IJavaElement getterInvocation = cu.codeSelect(306, 0)[0]; + String getterHtmlContent = JavadocContentAccess2.getHTMLContent(getterInvocation, true); + assertEquals("Getter section
Returns:
Sky is blue3
", getterHtmlContent); + + IJavaElement setterInvocation = cu.codeSelect(320, 0)[0]; + String setterHtmlContent = JavadocContentAccess2.getHTMLContent(setterInvocation, true); + assertEquals("Setter section
Parameters:
fieldName Hello, World3
field
", setterHtmlContent); + } +} From 98cdf67ed6846580e8e4e77391fd48f3293603f6 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sat, 9 Mar 2024 11:39:23 +0100 Subject: [PATCH 009/118] Javadoc support for eclipse 2024-03 --- .../lombok/eclipse/agent/EclipsePatcher.java | 8 +++++ .../lombok/eclipse/agent/PatchJavadoc.java | 32 +++++++++++++------ .../lombok/launch/PatchFixesHider.java | 8 +++-- .../src/lombok/eclipse/misc/JavadocTest.java | 13 ++++++-- 4 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index c176f51591..12060ffbd8 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -967,6 +967,14 @@ private static void patchNullCheck(ScriptManager sm) { } private static void patchJavadoc(ScriptManager sm) { + // Moved to new package and changed to instance method in 2024-03 + sm.addScriptIfWitness(OSGI_TYPES, ScriptBuilder.wrapMethodCall() + .target(new MethodTarget("org.eclipse.jdt.core.manipulation.internal.javadoc.CoreJavadocAccess", "getHTMLContent", "java.lang.String", "org.eclipse.jdt.core.IJavaElement", "boolean")) + .methodToWrap(new Hook("org.eclipse.jdt.core.manipulation.internal.javadoc.CoreJavadocAccess", "getHTMLContentFromSource", "java.lang.String", "org.eclipse.jdt.core.IJavaElement")) + .wrapMethod(new Hook("lombok.launch.PatchFixesHider$Javadoc", "getHTMLContentFromSource", "java.lang.String", "java.lang.String", "java.lang.Object", "org.eclipse.jdt.core.IJavaElement")) + .requestExtra(StackRequest.THIS, StackRequest.PARAM1) + .build()); + sm.addScriptIfWitness(OSGI_TYPES, ScriptBuilder.wrapMethodCall() .target(new MethodTarget("org.eclipse.jdt.internal.ui.text.javadoc.JavadocContentAccess2", "getHTMLContent", "java.lang.String", "org.eclipse.jdt.core.IJavaElement", "boolean")) .methodToWrap(new Hook("org.eclipse.jdt.internal.ui.text.javadoc.JavadocContentAccess2", "getHTMLContentFromSource", "java.lang.String", "org.eclipse.jdt.core.IJavaElement")) diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchJavadoc.java b/src/eclipseAgent/lombok/eclipse/agent/PatchJavadoc.java index 38b69bf7f0..caa94e2f1f 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchJavadoc.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchJavadoc.java @@ -37,7 +37,7 @@ public class PatchJavadoc { - public static String getHTMLContentFromSource(String original, Object member) { + public static String getHTMLContentFromSource(Object instance, String original, Object member) { if (original != null) { return original; } @@ -54,7 +54,7 @@ public static String getHTMLContentFromSource(String original, Object member) { String rawJavadoc = docs.get(signature); if (rawJavadoc == null) return null; - return Reflection.javadoc2HTML((IMember) member, (IJavaElement) member, rawJavadoc); + return Reflection.javadoc2HTML(instance, (IMember) member, (IJavaElement) member, rawJavadoc); } } @@ -85,9 +85,10 @@ static final String getSignature(SourceMethod sourceMethod) { private static class Reflection { private static final Method javadoc2HTML; private static final Method oldJavadoc2HTML; + private static final Method reallyOldJavadoc2HTML; private static final Method lsJavadoc2HTML; static { - Method a = null, b = null, c = null; + Method a = null, b = null, c = null, d = null; try { a = Permit.getMethod(JavadocContentAccess2.class, "javadoc2HTML", IMember.class, IJavaElement.class, String.class); @@ -98,30 +99,41 @@ private static class Reflection { try { c = Permit.getMethod(Class.forName("org.eclipse.jdt.ls.core.internal.javadoc.JavadocContentAccess2"), "javadoc2HTML", IMember.class, IJavaElement.class, String.class); } catch (Throwable t) {} + try { + d = Permit.getMethod(Class.forName("org.eclipse.jdt.core.manipulation.internal.javadoc.CoreJavadocAccess"), "javadoc2HTML", IMember.class, IJavaElement.class, String.class); + } catch (Throwable t) {} - javadoc2HTML = a; - oldJavadoc2HTML = b; + oldJavadoc2HTML = a; + reallyOldJavadoc2HTML = b; lsJavadoc2HTML = c; + javadoc2HTML = d; } - private static String javadoc2HTML(IMember member, IJavaElement element, String rawJavadoc) { + private static String javadoc2HTML(Object instance, IMember member, IJavaElement element, String rawJavadoc) { if (javadoc2HTML != null) { try { - return (String) javadoc2HTML.invoke(null, member, element, rawJavadoc); + return (String) javadoc2HTML.invoke(instance, member, element, rawJavadoc); + } catch (Throwable t) { + return null; + } + } + if (oldJavadoc2HTML != null) { + try { + return (String) oldJavadoc2HTML.invoke(instance, member, element, rawJavadoc); } catch (Throwable t) { return null; } } if (lsJavadoc2HTML != null) { try { - return (String) lsJavadoc2HTML.invoke(null, member, element, rawJavadoc); + return (String) lsJavadoc2HTML.invoke(instance, member, element, rawJavadoc); } catch (Throwable t) { return null; } } - if (oldJavadoc2HTML != null) { + if (reallyOldJavadoc2HTML != null) { try { - return (String) oldJavadoc2HTML.invoke(null, member, rawJavadoc); + return (String) reallyOldJavadoc2HTML.invoke(instance, member, rawJavadoc); } catch (Throwable t) { return null; } diff --git a/src/eclipseAgent/lombok/launch/PatchFixesHider.java b/src/eclipseAgent/lombok/launch/PatchFixesHider.java index 74bb0b8abd..84a0cf3d8e 100755 --- a/src/eclipseAgent/lombok/launch/PatchFixesHider.java +++ b/src/eclipseAgent/lombok/launch/PatchFixesHider.java @@ -435,11 +435,15 @@ public static final class Javadoc { static { Class shadowed = Util.shadowLoadClass("lombok.eclipse.agent.PatchJavadoc"); - GET_HTML = Util.findMethod(shadowed, "getHTMLContentFromSource", String.class, Object.class); + GET_HTML = Util.findMethod(shadowed, "getHTMLContentFromSource", Object.class, String.class, Object.class); } public static String getHTMLContentFromSource(String original, IJavaElement member) { - return (String) Util.invokeMethod(GET_HTML, original, member); + return (String) Util.invokeMethod(GET_HTML, null, original, member); + } + + public static String getHTMLContentFromSource(String original, Object instance, IJavaElement member) { + return (String) Util.invokeMethod(GET_HTML, instance, original, member); } } diff --git a/test/eclipse/src/lombok/eclipse/misc/JavadocTest.java b/test/eclipse/src/lombok/eclipse/misc/JavadocTest.java index bbd731258d..fd7a5daaea 100644 --- a/test/eclipse/src/lombok/eclipse/misc/JavadocTest.java +++ b/test/eclipse/src/lombok/eclipse/misc/JavadocTest.java @@ -21,11 +21,12 @@ */ package lombok.eclipse.misc; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.internal.ui.text.javadoc.JavadocContentAccess2; +import org.hamcrest.CoreMatchers; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -45,10 +46,16 @@ public void getterSetter() throws Exception { IJavaElement getterInvocation = cu.codeSelect(306, 0)[0]; String getterHtmlContent = JavadocContentAccess2.getHTMLContent(getterInvocation, true); - assertEquals("Getter section
Returns:
Sky is blue3
", getterHtmlContent); + assertThat(getterHtmlContent, CoreMatchers.containsString("Getter section")); + assertThat(getterHtmlContent, CoreMatchers.containsString("Returns:")); + assertThat(getterHtmlContent, CoreMatchers.containsString("Sky is blue3")); IJavaElement setterInvocation = cu.codeSelect(320, 0)[0]; String setterHtmlContent = JavadocContentAccess2.getHTMLContent(setterInvocation, true); - assertEquals("Setter section
Parameters:
fieldName Hello, World3
field
", setterHtmlContent); + assertThat(setterHtmlContent, CoreMatchers.containsString("Setter section")); + assertThat(setterHtmlContent, CoreMatchers.containsString("Parameters:")); + assertThat(setterHtmlContent, CoreMatchers.containsString("fieldName")); + assertThat(setterHtmlContent, CoreMatchers.containsString("Hello, World3")); + assertThat(setterHtmlContent, CoreMatchers.containsString("field")); } } From 3b20b70363fe85f354934fcfb47fdcfd0701a31e Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Tue, 12 Mar 2024 22:12:22 +0100 Subject: [PATCH 010/118] Support @Delegate in eclipse 2024-03 --- .../lombok/eclipse/agent/EclipsePatcher.java | 7 ++ .../lombok/eclipse/agent/PatchDelegate.java | 14 +++- .../lombok/launch/PatchFixesHider.java | 19 +++++- .../delegate/model/DelegateModel.java | 9 +++ .../src/lombok/eclipse/EclipseTests.java | 3 +- .../src/lombok/eclipse/misc/DelegateTest.java | 66 +++++++++++++++++++ 6 files changed, 112 insertions(+), 6 deletions(-) create mode 100644 test/eclipse/resource/delegate/model/DelegateModel.java create mode 100644 test/eclipse/src/lombok/eclipse/misc/DelegateTest.java diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index 12060ffbd8..e3a52ba125 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -771,6 +771,13 @@ private static void addPatchesForDelegate(ScriptManager sm) { .request(StackRequest.RETURN_VALUE, StackRequest.THIS) .wrapMethod(new Hook("lombok.launch.PatchFixesHider$Delegate", "addGeneratedDelegateMethods", "java.lang.Object[]", "java.lang.Object", "java.lang.Object")) .build()); + + sm.addScriptIfWitness(OSGI_TYPES, ScriptBuilder.exitEarly() + .target(new MethodTarget("org.eclipse.jdt.internal.core.JavaElement", "getElementInfo", "org.eclipse.jdt.internal.compiler.env.IElementInfo")) + .request(StackRequest.THIS) + .decisionMethod(new Hook("lombok.launch.PatchFixesHider$Delegate", "isDelegateSourceMethod", "boolean", "java.lang.Object")) + .valueMethod(new Hook("lombok.launch.PatchFixesHider$Delegate", "returnElementInfo", "java.lang.Object", "java.lang.Object")) + .build()); } private static void addPatchesForValEclipse(ScriptManager sm) { diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java b/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java index d7b1759839..fee6db43cf 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2021 The Project Lombok Authors. + * Copyright (C) 2010-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,10 +21,11 @@ */ package lombok.eclipse.agent; -import static lombok.eclipse.Eclipse.*; import static lombok.eclipse.EcjAugments.*; +import static lombok.eclipse.Eclipse.*; import static lombok.eclipse.handlers.EclipseHandlerUtil.*; +import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -726,6 +727,15 @@ public static Object[] addGeneratedDelegateMethods(Object[] returnValue, Object return EclipseOnlyMethods.addGeneratedDelegateMethodsToChildren(returnValue, javaElement); } + public static Object returnElementInfo(Object delegateSourceMethod) { + Field field = Permit.permissiveGetField(delegateSourceMethod.getClass(), "sourceMethodInfo"); + return Permit.permissiveReadField(Object.class, field, delegateSourceMethod); + } + + public static boolean isDelegateSourceMethod(Object sourceMethod) { + return sourceMethod.getClass().getName().equals("lombok.eclipse.agent.PatchDelegate$EclipseOnlyMethods$DelegateSourceMethod"); + } + public static class EclipseOnlyMethods { private static void cleanupDelegateMethods(CompilationUnitDeclaration cud) { CompilationUnit compilationUnit = getCompilationUnit(cud); diff --git a/src/eclipseAgent/lombok/launch/PatchFixesHider.java b/src/eclipseAgent/lombok/launch/PatchFixesHider.java index 84a0cf3d8e..7ba663ccf4 100755 --- a/src/eclipseAgent/lombok/launch/PatchFixesHider.java +++ b/src/eclipseAgent/lombok/launch/PatchFixesHider.java @@ -277,11 +277,16 @@ public static void transform_swapped(Object ast, Object parser) throws IOExcepti public static final class Delegate { private static final Method HANDLE_DELEGATE_FOR_TYPE; private static final Method ADD_GENERATED_DELEGATE_METHODS; + public static final Method IS_DELEGATE_SOURCE_METHOD; + public static final Method RETURN_ELEMENT_INFO; static { - Class shadowed = Util.shadowLoadClass("lombok.eclipse.agent.PatchDelegatePortal"); - HANDLE_DELEGATE_FOR_TYPE = Util.findMethod(shadowed, "handleDelegateForType", Object.class); - ADD_GENERATED_DELEGATE_METHODS = Util.findMethod(shadowed, "addGeneratedDelegateMethods", Object.class, Object.class); + Class shadowedPortal = Util.shadowLoadClass("lombok.eclipse.agent.PatchDelegatePortal"); + HANDLE_DELEGATE_FOR_TYPE = Util.findMethod(shadowedPortal, "handleDelegateForType", Object.class); + ADD_GENERATED_DELEGATE_METHODS = Util.findMethod(shadowedPortal, "addGeneratedDelegateMethods", Object.class, Object.class); + Class shadowed = Util.shadowLoadClass("lombok.eclipse.agent.PatchDelegate"); + IS_DELEGATE_SOURCE_METHOD = Util.findMethod(shadowed, "isDelegateSourceMethod", Object.class); + RETURN_ELEMENT_INFO = Util.findMethod(shadowed, "returnElementInfo", Object.class); } public static boolean handleDelegateForType(Object classScope) { @@ -291,6 +296,14 @@ public static boolean handleDelegateForType(Object classScope) { public static Object[] addGeneratedDelegateMethods(Object returnValue, Object javaElement) { return (Object[]) Util.invokeMethod(ADD_GENERATED_DELEGATE_METHODS, returnValue, javaElement); } + + public static boolean isDelegateSourceMethod(Object sourceMethod) { + return (Boolean) Util.invokeMethod(IS_DELEGATE_SOURCE_METHOD, sourceMethod); + } + + public static Object returnElementInfo(Object delegateSourceMethod) { + return Util.invokeMethod(RETURN_ELEMENT_INFO, delegateSourceMethod); + } } /** Contains patch code to support {@code val} (eclipse specific) */ diff --git a/test/eclipse/resource/delegate/model/DelegateModel.java b/test/eclipse/resource/delegate/model/DelegateModel.java new file mode 100644 index 0000000000..4c1700e952 --- /dev/null +++ b/test/eclipse/resource/delegate/model/DelegateModel.java @@ -0,0 +1,9 @@ +package pkg; + +import lombok.experimental.Delegate; + +public class DelegateModel { + + @Delegate + private Runnable run; +} \ No newline at end of file diff --git a/test/eclipse/src/lombok/eclipse/EclipseTests.java b/test/eclipse/src/lombok/eclipse/EclipseTests.java index e09313dd61..66f5d9faf5 100644 --- a/test/eclipse/src/lombok/eclipse/EclipseTests.java +++ b/test/eclipse/src/lombok/eclipse/EclipseTests.java @@ -28,6 +28,7 @@ import lombok.eclipse.cleanup.CleanupTest; import lombok.eclipse.compile.NoErrorsTest; import lombok.eclipse.edit.SelectTest; +import lombok.eclipse.misc.DelegateTest; import lombok.eclipse.misc.JavadocTest; import lombok.eclipse.refactoring.ExtractInterfaceTest; import lombok.eclipse.refactoring.InlineTest; @@ -35,7 +36,7 @@ import lombok.eclipse.references.FindReferencesTest; @RunWith(Suite.class) -@SuiteClasses({ExtractInterfaceTest.class, RenameTest.class, SelectTest.class, CleanupTest.class, FindReferencesTest.class, InlineTest.class, NoErrorsTest.class, JavadocTest.class}) +@SuiteClasses({ExtractInterfaceTest.class, RenameTest.class, SelectTest.class, CleanupTest.class, FindReferencesTest.class, InlineTest.class, NoErrorsTest.class, JavadocTest.class, DelegateTest.class}) public class EclipseTests { } diff --git a/test/eclipse/src/lombok/eclipse/misc/DelegateTest.java b/test/eclipse/src/lombok/eclipse/misc/DelegateTest.java new file mode 100644 index 0000000000..899dc9f941 --- /dev/null +++ b/test/eclipse/src/lombok/eclipse/misc/DelegateTest.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2024 The Project Lombok Authors. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok.eclipse.misc; + +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; + +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.ISourceRange; +import org.eclipse.jdt.core.WorkingCopyOwner; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import lombok.eclipse.EclipseRunner; +import lombok.eclipse.SetupSingleFileTest; + +@RunWith(EclipseRunner.class) +public class DelegateTest { + + @Rule + public SetupSingleFileTest setup = new SetupSingleFileTest(); + + @Test + public void model() throws Exception { + ICompilationUnit cu = setup.getPackageFragment().getCompilationUnit("DelegateModel.java"); + + WorkingCopyOwner workingCopyOwner = new WorkingCopyOwner() {}; + ICompilationUnit workingCopy = cu.getWorkingCopy(workingCopyOwner, null); + try { + workingCopy.reconcile(ICompilationUnit.NO_AST, true, true, workingCopy.getOwner(), null); + + assertThat(workingCopy.findPrimaryType().getMethods().length, is(not(0))); + + IMethod runMethod = workingCopy.findPrimaryType().getMethods()[0]; + assertEquals(runMethod.getElementName(), "run"); + + ISourceRange sourceRange = runMethod.getSourceRange(); + assertNotNull(sourceRange); + assertEquals(sourceRange.getOffset(), 84); + assertEquals(sourceRange.getLength(), 9); + } finally { + workingCopy.discardWorkingCopy(); + } + } +} From 521be03be45887ea738e005b5f317e04ca6196d2 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Tue, 12 Mar 2024 23:24:38 +0100 Subject: [PATCH 011/118] Remove unused string literal code This code was never used because StringLiteralConcatenation and ExtendedStringLiteral extend StringLiterals and get handled a few lines above. We might need to add it back and fix it if we want to copy annotations like @Annotation("a" + "b") without transforming them to @Annotation("ab") --- .../eclipse/handlers/EclipseHandlerUtil.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 1e4c4f23ba..ef7a7c3a3c 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -22,8 +22,8 @@ package lombok.eclipse.handlers; import static lombok.core.handlers.HandlerUtil.*; -import static lombok.eclipse.Eclipse.*; import static lombok.eclipse.EcjAugments.*; +import static lombok.eclipse.Eclipse.*; import static lombok.eclipse.handlers.EclipseHandlerUtil.EclipseReflectiveMembers.*; import java.lang.reflect.Array; @@ -60,7 +60,6 @@ import org.eclipse.jdt.internal.compiler.ast.DoubleLiteral; import org.eclipse.jdt.internal.compiler.ast.EqualExpression; import org.eclipse.jdt.internal.compiler.ast.Expression; -import org.eclipse.jdt.internal.compiler.ast.ExtendedStringLiteral; import org.eclipse.jdt.internal.compiler.ast.FalseLiteral; import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration; import org.eclipse.jdt.internal.compiler.ast.FieldReference; @@ -86,7 +85,6 @@ import org.eclipse.jdt.internal.compiler.ast.SingleTypeReference; import org.eclipse.jdt.internal.compiler.ast.Statement; import org.eclipse.jdt.internal.compiler.ast.StringLiteral; -import org.eclipse.jdt.internal.compiler.ast.StringLiteralConcatenation; import org.eclipse.jdt.internal.compiler.ast.ThisReference; import org.eclipse.jdt.internal.compiler.ast.ThrowStatement; import org.eclipse.jdt.internal.compiler.ast.TrueLiteral; @@ -123,6 +121,7 @@ import lombok.core.debug.ProblemReporter; import lombok.core.handlers.HandlerUtil; import lombok.core.handlers.HandlerUtil.FieldAccess; +import lombok.core.handlers.HandlerUtil.JavadocTag; import lombok.eclipse.EcjAugments; import lombok.eclipse.Eclipse; import lombok.eclipse.EclipseAST; @@ -416,20 +415,6 @@ private static Expression copyAnnotationMemberValue0(Expression in) { if (in instanceof LongLiteral) return LongLiteral.buildLongLiteral(((Literal) in).source(), s, e); if (in instanceof StringLiteral) return new StringLiteral(((Literal) in).source(), s, e, reflectInt(STRING_LITERAL__LINE_NUMBER, in) + 1); - if (in instanceof ExtendedStringLiteral) { - StringLiteral str = new StringLiteral(((Literal) in).source(), s, e, reflectInt(STRING_LITERAL__LINE_NUMBER, in) + 1); - StringLiteral empty = new StringLiteral(new char[0], s, e, reflectInt(STRING_LITERAL__LINE_NUMBER, in) + 1); - return new ExtendedStringLiteral(str, empty); - } - if (in instanceof StringLiteralConcatenation) { - Expression[] literals = ((StringLiteralConcatenation) in).literals; - // 0 and 1 len shouldn't happen. - if (literals.length == 0) return new StringLiteral(new char[0], s, e, 0); - if (literals.length == 1) return copyAnnotationMemberValue0(literals[0]); - StringLiteralConcatenation c = new StringLiteralConcatenation((StringLiteral) literals[0], (StringLiteral) literals[1]); - for (int i = 2; i < literals.length; i++) c = c.extendsWith((StringLiteral) literals[i]); - return c; - } // enums and field accesses (as long as those are references to compile time constant literals that's also acceptable) From 1b713add959430ee22145050a638f01102d158c5 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Thu, 14 Mar 2024 21:24:07 +0100 Subject: [PATCH 012/118] Add eclipse 2024-03 as test target --- .github/workflows/ant.yml | 2 ++ buildScripts/ivy.xml | 14 ++++++++++++++ buildScripts/setup.ant.xml | 4 ++++ buildScripts/tests.ant.xml | 9 +++++++++ 4 files changed, 29 insertions(+) diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 2022b3a6b6..278f9752cd 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -106,11 +106,13 @@ jobs: - eclipse-202212 - eclipse-202309 - eclipse-202312 + - eclipse-202403 - eclipse-I-build - eclipse-oxygen-full - eclipse-2022-03-full - eclipse-2023-09-full - eclipse-2023-12-full + - eclipse-2024-03-full - eclipse-I-build-full - ecj11 - ecj14 diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index c981c5fe92..c3687cb802 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -33,6 +33,7 @@ + @@ -146,6 +147,19 @@ + + + + + + + + + + + + + diff --git a/buildScripts/setup.ant.xml b/buildScripts/setup.ant.xml index 4f73f956dd..2a25a9ba7d 100644 --- a/buildScripts/setup.ant.xml +++ b/buildScripts/setup.ant.xml @@ -172,6 +172,10 @@ This buildfile is part of projectlombok.org. It sets up the build itself. + + + + diff --git a/buildScripts/tests.ant.xml b/buildScripts/tests.ant.xml index ade6fbffe1..8f7023db2d 100644 --- a/buildScripts/tests.ant.xml +++ b/buildScripts/tests.ant.xml @@ -223,6 +223,11 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn + + + + + @@ -295,6 +300,10 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn + + + + From 5719fde58e1faf04d436e85c86ae50acf8ede272 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Mon, 18 Mar 2024 19:21:29 +0100 Subject: [PATCH 013/118] Update changelog in preparation for the upcoming release --- doc/changelog.markdown | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index a3b3a48add..a8375ac7c0 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -2,12 +2,18 @@ Lombok Changelog ---------------- ### v1.18.31 "Edgy Guinea Pig" +* PLATFORM: Initial JDK22 support added. +* PLAFTORM Added support for Eclipse 2024-03. [Issue #3620](https://github.com/projectlombok/lombok/issues/3620). * PLATFORM: Added support for recent versions of eclipse (released Q4 2023 or later or so) which would cause failures in the eclipse logs such as `java.lang.NoSuchMethodError: 'java.lang.StringBuffer org.eclipse.jdt…`. [Issue #3564](https://github.com/projectlombok/lombok/issues/3564). * FEATURE: `@Locked` has been introduced. Like `@Synchronized` but with `java.util.concurrent.locks` locks instead of the `synchronized` primitive. Thanks, Pim van der Loos for the PR! [Issue #3506](https://github.com/projectlombok/lombok/issues/3506). * NECROMANCY: Inlining a generated getter in eclipse would result in eclipse incorrectly replacing calls with `@Getter` instead of the actual field's name. [Issue #562](https://github.com/projectlombok/lombok/issues/562). This issue is almost old enough to drink. Points for dedication go to Rawi for fixing this one. +* BUGFIX: When `@SuperBuilder` was used on a type with an annotated generic type, it would error `wrong number of type arguments`. [Issue #3592](https://github.com/projectlombok/lombok/issues/3592). +* BUGFIX: It was possible to create an infinite build loop using `@ExtensionMethod`. [Issue #3225](https://github.com/projectlombok/lombok/issues/3225). +* BUGFIX: Using `@Getter(lazy=true)` would fail if the expression contained a variable called `value`. [Issue #2917](https://github.com/projectlombok/lombok/issues/2917). * BUGFIX: Many lombok features wouldn't work properly on records contained within an outer type unless you explicitly marked it `static`. [Issue #3497](https://github.com/projectlombok/lombok/issues/3497) [Issue #3559](https://github.com/projectlombok/lombok/issues/3559). * BUGFIX: Eclipse projects using the `com.pro-crafting.tools:jasperreports-plugin` will now compile. * BUGFIX: `@FieldNameConstants` now works when generated fields are involved. [Issue #3529](https://github.com/projectlombok/lombok/issues/3529). +* IMPROBABLE BREAKING CHANGE: For JSpecify, the package name changed from `org.jspecify.nullness` to `org.jspecify.annotations`, which might lead to a different null analysis. [Issue #3608](https://github.com/projectlombok/lombok/pull/3608). ### v1.18.30 (September 20th, 2023) * PLATFORM: Initial JDK21 support added. [Issue #3393](https://github.com/projectlombok/lombok/issues/3393). From 7957b6f3b2baf1379f04da4b4f794e961c51064b Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Mon, 18 Mar 2024 17:58:20 +0100 Subject: [PATCH 014/118] Support for new CaseStatement constructor --- src/utils/lombok/eclipse/Eclipse.java | 59 ++++++++++++++++++++------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/src/utils/lombok/eclipse/Eclipse.java b/src/utils/lombok/eclipse/Eclipse.java index 624e521a49..e5afa7fd7b 100644 --- a/src/utils/lombok/eclipse/Eclipse.java +++ b/src/utils/lombok/eclipse/Eclipse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2021 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,6 +21,7 @@ */ package lombok.eclipse; +import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; @@ -279,22 +280,50 @@ private static boolean ecjSupportsJava7Features() { } } - private static boolean caseStatementInit = false; - private static Field caseStatementConstantExpressions = null; + private static final Field CASE_STATEMENT_CONSTANT_EXPRESSIONS = Permit.permissiveGetField(CaseStatement.class, "constantExpressions"); + private static final Constructor CASE_STATEMENT_CONSTRUCTOR_SINGLE; + private static final Constructor CASE_STATEMENT_CONSTRUCTOR_ARRAY; + private static final Expression[] EMPTY_EXPRESSIONS; + static { + Constructor constructorSingle = null, constructorArray = null; + Expression[] emptyExpressions = new Expression[0]; + + try { + constructorSingle = Permit.getConstructor(CaseStatement.class, Expression.class, int.class, int.class); + } catch (NoSuchMethodException ignore) { + } + + try { + constructorArray = Permit.getConstructor(CaseStatement.class, Expression[].class, int.class, int.class); + } catch (NoSuchMethodException ignore) { + } + + try { + emptyExpressions = Permit.get(Permit.permissiveGetField(Expression.class, "NO_EXPRESSIONS"), null); + } catch (Throwable ignore) { + } + + CASE_STATEMENT_CONSTRUCTOR_SINGLE = constructorSingle; + CASE_STATEMENT_CONSTRUCTOR_ARRAY = constructorArray; + EMPTY_EXPRESSIONS = emptyExpressions; + } public static CaseStatement createCaseStatement(Expression expr) { - CaseStatement stat = new CaseStatement(expr, 0, 0); - if (expr == null) return stat; - if (!caseStatementInit) { - try { - caseStatementConstantExpressions = Permit.getField(CaseStatement.class, "constantExpressions"); - caseStatementConstantExpressions.setAccessible(true); - } catch (NoSuchFieldException ignore) {} - caseStatementInit = true; + final CaseStatement stat; + if (CASE_STATEMENT_CONSTRUCTOR_SINGLE != null) { + stat = Permit.newInstanceSneaky(CASE_STATEMENT_CONSTRUCTOR_SINGLE, expr, 0, 0); + if (stat != null && expr != null && CASE_STATEMENT_CONSTANT_EXPRESSIONS != null) { + try { + Permit.set(CASE_STATEMENT_CONSTANT_EXPRESSIONS, stat, new Expression[] {expr}); + } catch (IllegalAccessException ignore) { + } + } + } else { + Expression[] expressions = EMPTY_EXPRESSIONS; + if (expr != null) { + expressions = new Expression[] {expr}; + } + stat = Permit.newInstanceSneaky(CASE_STATEMENT_CONSTRUCTOR_ARRAY, expressions, 0, 0); } - if (caseStatementConstantExpressions != null) try { - caseStatementConstantExpressions.set(stat, new Expression[] {expr}); - } catch (IllegalArgumentException ignore) { - } catch (IllegalAccessException ignore) {} return stat; } } From c341304c18c10b510979546c8e991e36b41d98f6 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Tue, 19 Mar 2024 17:43:05 +0100 Subject: [PATCH 015/118] Add dynamic selection of eclipse class in CleanupTest --- .../src/lombok/eclipse/cleanup/CleanupTest.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/test/eclipse/src/lombok/eclipse/cleanup/CleanupTest.java b/test/eclipse/src/lombok/eclipse/cleanup/CleanupTest.java index 76956aff5f..ba29926e36 100644 --- a/test/eclipse/src/lombok/eclipse/cleanup/CleanupTest.java +++ b/test/eclipse/src/lombok/eclipse/cleanup/CleanupTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Project Lombok Authors. + * Copyright (C) 2022-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,6 +23,8 @@ import static lombok.eclipse.RefactoringUtils.performRefactoring; +import java.lang.reflect.Constructor; +import java.util.Map; import java.util.Map.Entry; import org.eclipse.jdt.core.ICompilationUnit; @@ -30,8 +32,8 @@ import org.eclipse.jdt.internal.corext.fix.CleanUpRefactoring; import org.eclipse.jdt.internal.corext.fix.CleanUpRegistry; import org.eclipse.jdt.internal.ui.JavaPlugin; -import org.eclipse.jdt.internal.ui.fix.CodeStyleCleanUp; import org.eclipse.jdt.internal.ui.fix.MapCleanUpOptions; +import org.eclipse.jdt.ui.cleanup.ICleanUp; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -59,7 +61,16 @@ public void useThis() throws Exception { CleanUpRefactoring ref = new CleanUpRefactoring(); ref.addCompilationUnit(cu); - ref.addCleanUp(new CodeStyleCleanUp(options.getMap())); + + // Load the class dynamically to avoid compile errors when running with older versions of Eclipse + Class cleanUpClass; + try { + cleanUpClass = Class.forName("org.eclipse.jdt.internal.ui.fix.CodeStyleCleanUp"); + } catch (ClassNotFoundException e) { + cleanUpClass = Class.forName("org.eclipse.jdt.internal.ui.fix.CodeStyleCleanUpCore"); + } + Constructor cleanUpConstructor = cleanUpClass.getConstructor(Map.class); + ref.addCleanUp((ICleanUp) cleanUpConstructor.newInstance(options.getMap())); performRefactoring(ref); } From 2618848385de2ec4b79677e01eb8045714de1110 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 20 Mar 2024 01:09:17 +0100 Subject: [PATCH 016/118] [release] pre-release version bump --- doc/changelog.markdown | 2 +- src/core/lombok/core/Version.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index a8375ac7c0..08111c00cc 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -1,7 +1,7 @@ Lombok Changelog ---------------- -### v1.18.31 "Edgy Guinea Pig" +### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. * PLAFTORM Added support for Eclipse 2024-03. [Issue #3620](https://github.com/projectlombok/lombok/issues/3620). * PLATFORM: Added support for recent versions of eclipse (released Q4 2023 or later or so) which would cause failures in the eclipse logs such as `java.lang.NoSuchMethodError: 'java.lang.StringBuffer org.eclipse.jdt…`. [Issue #3564](https://github.com/projectlombok/lombok/issues/3564). diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java index c84718791e..fa8c6c25e3 100644 --- a/src/core/lombok/core/Version.java +++ b/src/core/lombok/core/Version.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -30,9 +30,9 @@ public class Version { // ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries). // Note: In 'X.Y.Z', if Z is odd, its a snapshot build built from the repository, so many different 0.10.3 versions can exist, for example. // Official builds always end in an even number. (Since 0.10.2). - private static final String VERSION = "1.18.31"; - private static final String RELEASE_NAME = "Edgy Guinea Pig"; -// private static final String RELEASE_NAME = "Envious Ferret"; + private static final String VERSION = "1.18.32"; +// private static final String RELEASE_NAME = "Edgy Guinea Pig"; + private static final String RELEASE_NAME = "Envious Ferret"; // Named version history: // Angry Butterfly From 0023c598c7699a74b2c8893be104568997c6bf6e Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 20 Mar 2024 01:11:52 +0100 Subject: [PATCH 017/118] [docs] Locked.html had a wrong import --- website/templates/features/Locked.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/features/Locked.html b/website/templates/features/Locked.html index 105bf6dc4b..fa041975e9 100644 --- a/website/templates/features/Locked.html +++ b/website/templates/features/Locked.html @@ -1,4 +1,4 @@ -<#import "../_features.html" as f> +<#import "_features.html" as f> <@f.scaffold title="@Locked" logline="Pop it and lock it! ReentrantLock, now with less hassle."> <@f.history> From d2a18ebf757ba3bdc550a00114fb64f99adb2baa Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 20 Mar 2024 01:13:12 +0100 Subject: [PATCH 018/118] [docs] Locked example needed its usage examples moved --- website/usageExamples/{experimental => }/LockedExample_post.jpage | 0 website/usageExamples/{experimental => }/LockedExample_pre.jpage | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename website/usageExamples/{experimental => }/LockedExample_post.jpage (100%) rename website/usageExamples/{experimental => }/LockedExample_pre.jpage (100%) diff --git a/website/usageExamples/experimental/LockedExample_post.jpage b/website/usageExamples/LockedExample_post.jpage similarity index 100% rename from website/usageExamples/experimental/LockedExample_post.jpage rename to website/usageExamples/LockedExample_post.jpage diff --git a/website/usageExamples/experimental/LockedExample_pre.jpage b/website/usageExamples/LockedExample_pre.jpage similarity index 100% rename from website/usageExamples/experimental/LockedExample_pre.jpage rename to website/usageExamples/LockedExample_pre.jpage From 9dc7e7f0cf55554c90ae59f00e73d810d4cce22b Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 20 Mar 2024 01:21:03 +0100 Subject: [PATCH 019/118] [release] post-release version bump --- doc/changelog.markdown | 3 +++ src/core/lombok/core/Version.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 08111c00cc..7303de1742 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -1,6 +1,9 @@ Lombok Changelog ---------------- +### v1.18.33 "Edgy Guinea Pig" +* We recently released v1.18.32; there is no edge release since then. + ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. * PLAFTORM Added support for Eclipse 2024-03. [Issue #3620](https://github.com/projectlombok/lombok/issues/3620). diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java index fa8c6c25e3..7caf52da9f 100644 --- a/src/core/lombok/core/Version.java +++ b/src/core/lombok/core/Version.java @@ -30,9 +30,9 @@ public class Version { // ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries). // Note: In 'X.Y.Z', if Z is odd, its a snapshot build built from the repository, so many different 0.10.3 versions can exist, for example. // Official builds always end in an even number. (Since 0.10.2). - private static final String VERSION = "1.18.32"; -// private static final String RELEASE_NAME = "Edgy Guinea Pig"; - private static final String RELEASE_NAME = "Envious Ferret"; + private static final String VERSION = "1.18.33"; + private static final String RELEASE_NAME = "Edgy Guinea Pig"; +// private static final String RELEASE_NAME = "Envious Ferret"; // Named version history: // Angry Butterfly From 3e57b2a0b485c26b0e4fa7b4fa91976b7da46b66 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Thu, 21 Mar 2024 20:29:56 +0100 Subject: [PATCH 020/118] [fixes #2848] Support onX.flagUsage configuration key --- .../eclipse/handlers/HandleConstructor.java | 65 +++++++++++-------- .../lombok/eclipse/handlers/HandleGetter.java | 3 + .../lombok/eclipse/handlers/HandleSetter.java | 8 ++- .../javac/handlers/HandleConstructor.java | 59 ++++++++++------- .../lombok/javac/handlers/HandleGetter.java | 3 + .../lombok/javac/handlers/HandleSetter.java | 8 ++- .../resource/before/OnXFlagUsage.java | 21 ++++++ .../OnXFlagUsage.java.messages | 6 ++ .../messages-ecj/OnXFlagUsage.java.messages | 6 ++ 9 files changed, 124 insertions(+), 55 deletions(-) create mode 100644 test/transform/resource/before/OnXFlagUsage.java create mode 100644 test/transform/resource/messages-delombok/OnXFlagUsage.java.messages create mode 100644 test/transform/resource/messages-ecj/OnXFlagUsage.java.messages diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java index 522138468b..8d9c5f7be8 100755 --- a/src/core/lombok/eclipse/handlers/HandleConstructor.java +++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2021 The Project Lombok Authors. + * Copyright (C) 2010-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -101,6 +101,9 @@ public static class HandleNoArgsConstructor extends EclipseAnnotationHandler onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@NoArgsConstructor(onConstructor", annotationNode); + if (!onConstructor.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@NoArgsConstructor(onConstructor=...)"); + } handleConstructor.generateConstructor(typeNode, level, Collections.emptyList(), force, staticName, SkipIfConstructorExists.NO, onConstructor, annotationNode); } @@ -125,6 +128,9 @@ public static class HandleRequiredArgsConstructor extends EclipseAnnotationHandl } List onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@RequiredArgsConstructor(onConstructor", annotationNode); + if (!onConstructor.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@RequiredArgsConstructor(onConstructor=...)"); + } handleConstructor.generateConstructor( typeNode, level, findRequiredFields(typeNode), false, staticName, SkipIfConstructorExists.NO, @@ -132,6 +138,36 @@ typeNode, level, findRequiredFields(typeNode), false, staticName, SkipIfConstruc } } + @Provides + public static class HandleAllArgsConstructor extends EclipseAnnotationHandler { + private static final String NAME = AllArgsConstructor.class.getSimpleName(); + + private HandleConstructor handleConstructor = new HandleConstructor(); + + @Override public void handle(AnnotationValues annotation, Annotation ast, EclipseNode annotationNode) { + handleFlagUsage(annotationNode, ConfigurationKeys.ALL_ARGS_CONSTRUCTOR_FLAG_USAGE, "@AllArgsConstructor", ConfigurationKeys.ANY_CONSTRUCTOR_FLAG_USAGE, "any @xArgsConstructor"); + + EclipseNode typeNode = annotationNode.up(); + if (!checkLegality(typeNode, annotationNode, NAME)) return; + AllArgsConstructor ann = annotation.getInstance(); + AccessLevel level = ann.access(); + if (level == AccessLevel.NONE) return; + String staticName = ann.staticName(); + if (annotation.isExplicit("suppressConstructorProperties")) { + annotationNode.addError("This deprecated feature is no longer supported. Remove it; you can create a lombok.config file with 'lombok.anyConstructor.suppressConstructorProperties = true'."); + } + + List onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@AllArgsConstructor(onConstructor", annotationNode); + if (!onConstructor.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@AllArgsConstructor(onConstructor=...)"); + } + + handleConstructor.generateConstructor( + typeNode, level, findAllFields(typeNode), false, staticName, SkipIfConstructorExists.NO, + onConstructor, annotationNode); + } + } + private static List findRequiredFields(EclipseNode typeNode) { return findFields(typeNode, true); } @@ -167,33 +203,6 @@ static List findAllFields(EclipseNode typeNode, boolean evenFinalIn return fields; } - @Provides - public static class HandleAllArgsConstructor extends EclipseAnnotationHandler { - private static final String NAME = AllArgsConstructor.class.getSimpleName(); - - private HandleConstructor handleConstructor = new HandleConstructor(); - - @Override public void handle(AnnotationValues annotation, Annotation ast, EclipseNode annotationNode) { - handleFlagUsage(annotationNode, ConfigurationKeys.ALL_ARGS_CONSTRUCTOR_FLAG_USAGE, "@AllArgsConstructor", ConfigurationKeys.ANY_CONSTRUCTOR_FLAG_USAGE, "any @xArgsConstructor"); - - EclipseNode typeNode = annotationNode.up(); - if (!checkLegality(typeNode, annotationNode, NAME)) return; - AllArgsConstructor ann = annotation.getInstance(); - AccessLevel level = ann.access(); - if (level == AccessLevel.NONE) return; - String staticName = ann.staticName(); - if (annotation.isExplicit("suppressConstructorProperties")) { - annotationNode.addError("This deprecated feature is no longer supported. Remove it; you can create a lombok.config file with 'lombok.anyConstructor.suppressConstructorProperties = true'."); - } - - List onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@AllArgsConstructor(onConstructor", annotationNode); - - handleConstructor.generateConstructor( - typeNode, level, findAllFields(typeNode), false, staticName, SkipIfConstructorExists.NO, - onConstructor, annotationNode); - } - } - static boolean checkLegality(EclipseNode typeNode, EclipseNode errorNode, String name) { if (!isClassOrEnum(typeNode)) { errorNode.addError(name + " is only supported on a class or an enum."); diff --git a/src/core/lombok/eclipse/handlers/HandleGetter.java b/src/core/lombok/eclipse/handlers/HandleGetter.java index 5ed2c2d94f..dbe8cc92c3 100644 --- a/src/core/lombok/eclipse/handlers/HandleGetter.java +++ b/src/core/lombok/eclipse/handlers/HandleGetter.java @@ -147,6 +147,9 @@ public void handle(AnnotationValues annotation, Annotation ast, EclipseN if (node == null) return; List onMethod = unboxAndRemoveAnnotationParameter(ast, "onMethod", "@Getter(onMethod", annotationNode); + if (!onMethod.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@Getter(onMethod=...)"); + } switch (node.getKind()) { case FIELD: diff --git a/src/core/lombok/eclipse/handlers/HandleSetter.java b/src/core/lombok/eclipse/handlers/HandleSetter.java index f09f148579..99552efcf1 100644 --- a/src/core/lombok/eclipse/handlers/HandleSetter.java +++ b/src/core/lombok/eclipse/handlers/HandleSetter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2022 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -120,7 +120,13 @@ public void generateSetterForField(EclipseNode fieldNode, EclipseNode sourceNode if (level == AccessLevel.NONE || node == null) return; List onMethod = unboxAndRemoveAnnotationParameter(ast, "onMethod", "@Setter(onMethod", annotationNode); + if (!onMethod.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@Setter(onMethod=...)"); + } List onParam = unboxAndRemoveAnnotationParameter(ast, "onParam", "@Setter(onParam", annotationNode); + if (!onParam.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@Setter(onParam=...)"); + } switch (node.getKind()) { case FIELD: diff --git a/src/core/lombok/javac/handlers/HandleConstructor.java b/src/core/lombok/javac/handlers/HandleConstructor.java index 6a5dad1b0a..372bc57d21 100644 --- a/src/core/lombok/javac/handlers/HandleConstructor.java +++ b/src/core/lombok/javac/handlers/HandleConstructor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2021 The Project Lombok Authors. + * Copyright (C) 2010-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -73,6 +73,9 @@ public static class HandleNoArgsConstructor extends JavacAnnotationHandler onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@NoArgsConstructor(onConstructor", annotationNode); + if (!onConstructor.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@NoArgsConstructor(onConstructor=...)"); + } NoArgsConstructor ann = annotation.getInstance(); AccessLevel level = ann.access(); if (level == AccessLevel.NONE) return; @@ -95,6 +98,9 @@ public static class HandleRequiredArgsConstructor extends JavacAnnotationHandler JavacNode typeNode = annotationNode.up(); if (!checkLegality(typeNode, annotationNode, NAME)) return; List onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@RequiredArgsConstructor(onConstructor", annotationNode); + if (!onConstructor.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@RequiredArgsConstructor(onConstructor=...)"); + } RequiredArgsConstructor ann = annotation.getInstance(); AccessLevel level = ann.access(); if (level == AccessLevel.NONE) return; @@ -107,6 +113,33 @@ public static class HandleRequiredArgsConstructor extends JavacAnnotationHandler } } + @Provides + public static class HandleAllArgsConstructor extends JavacAnnotationHandler { + private static final String NAME = AllArgsConstructor.class.getSimpleName(); + private HandleConstructor handleConstructor = new HandleConstructor(); + + @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { + handleFlagUsage(annotationNode, ConfigurationKeys.ALL_ARGS_CONSTRUCTOR_FLAG_USAGE, "@AllArgsConstructor", ConfigurationKeys.ANY_CONSTRUCTOR_FLAG_USAGE, "any @xArgsConstructor"); + + deleteAnnotationIfNeccessary(annotationNode, AllArgsConstructor.class); + deleteImportFromCompilationUnit(annotationNode, "lombok.AccessLevel"); + JavacNode typeNode = annotationNode.up(); + if (!checkLegality(typeNode, annotationNode, NAME)) return; + List onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@AllArgsConstructor(onConstructor", annotationNode); + if (!onConstructor.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@AllArgsConstructor(onConstructor=...)"); + } + AllArgsConstructor ann = annotation.getInstance(); + AccessLevel level = ann.access(); + if (level == AccessLevel.NONE) return; + String staticName = ann.staticName(); + if (annotation.isExplicit("suppressConstructorProperties")) { + annotationNode.addError("This deprecated feature is no longer supported. Remove it; you can create a lombok.config file with 'lombok.anyConstructor.suppressConstructorProperties = true'."); + } + handleConstructor.generateConstructor(typeNode, level, onConstructor, findAllFields(typeNode), false, staticName, SkipIfConstructorExists.NO, annotationNode); + } + } + public static List findRequiredFields(JavacNode typeNode) { return findFields(typeNode, true); } @@ -132,30 +165,6 @@ public static List findFields(JavacNode typeNode, boolean nullMarked) return fields.toList(); } - @Provides - public static class HandleAllArgsConstructor extends JavacAnnotationHandler { - private static final String NAME = AllArgsConstructor.class.getSimpleName(); - private HandleConstructor handleConstructor = new HandleConstructor(); - - @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { - handleFlagUsage(annotationNode, ConfigurationKeys.ALL_ARGS_CONSTRUCTOR_FLAG_USAGE, "@AllArgsConstructor", ConfigurationKeys.ANY_CONSTRUCTOR_FLAG_USAGE, "any @xArgsConstructor"); - - deleteAnnotationIfNeccessary(annotationNode, AllArgsConstructor.class); - deleteImportFromCompilationUnit(annotationNode, "lombok.AccessLevel"); - JavacNode typeNode = annotationNode.up(); - if (!checkLegality(typeNode, annotationNode, NAME)) return; - List onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@AllArgsConstructor(onConstructor", annotationNode); - AllArgsConstructor ann = annotation.getInstance(); - AccessLevel level = ann.access(); - if (level == AccessLevel.NONE) return; - String staticName = ann.staticName(); - if (annotation.isExplicit("suppressConstructorProperties")) { - annotationNode.addError("This deprecated feature is no longer supported. Remove it; you can create a lombok.config file with 'lombok.anyConstructor.suppressConstructorProperties = true'."); - } - handleConstructor.generateConstructor(typeNode, level, onConstructor, findAllFields(typeNode), false, staticName, SkipIfConstructorExists.NO, annotationNode); - } - } - public static List findAllFields(JavacNode typeNode) { return findAllFields(typeNode, false); } diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index dac524dd3b..cdd3153172 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.java @@ -144,6 +144,9 @@ public void generateGetterForField(JavacNode fieldNode, DiagnosticPosition pos, if (node == null) return; List onMethod = unboxAndRemoveAnnotationParameter(ast, "onMethod", "@Getter(onMethod", annotationNode); + if (!onMethod.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@Getter(onMethod=...)"); + } switch (node.getKind()) { case FIELD: diff --git a/src/core/lombok/javac/handlers/HandleSetter.java b/src/core/lombok/javac/handlers/HandleSetter.java index 04fa8b771a..380f71ca21 100644 --- a/src/core/lombok/javac/handlers/HandleSetter.java +++ b/src/core/lombok/javac/handlers/HandleSetter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2022 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -123,7 +123,13 @@ public void generateSetterForField(JavacNode fieldNode, JavacNode sourceNode, Ac if (level == AccessLevel.NONE || node == null) return; List onMethod = unboxAndRemoveAnnotationParameter(ast, "onMethod", "@Setter(onMethod", annotationNode); + if (!onMethod.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@Setter(onMethod=...)"); + } List onParam = unboxAndRemoveAnnotationParameter(ast, "onParam", "@Setter(onParam", annotationNode); + if (!onParam.isEmpty()) { + handleFlagUsage(annotationNode, ConfigurationKeys.ON_X_FLAG_USAGE, "@Setter(onParam=...)"); + } switch (node.getKind()) { case FIELD: diff --git a/test/transform/resource/before/OnXFlagUsage.java b/test/transform/resource/before/OnXFlagUsage.java new file mode 100644 index 0000000000..8f7f4632f0 --- /dev/null +++ b/test/transform/resource/before/OnXFlagUsage.java @@ -0,0 +1,21 @@ +//conf: lombok.onX.flagUsage = warning +//skip compare content: We're just checking if the flagUsage key works. +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; +import lombok.Setter; + +@Getter(onMethod_ = @Deprecated) +@Setter(onMethod_ = @Deprecated, onParam_ = @Deprecated) +@NoArgsConstructor(onConstructor_ = @Deprecated) +@AllArgsConstructor(onConstructor_ = @Deprecated) +public class OnXFlagUsage { + private final String a = ""; + private String b; +} + +@RequiredArgsConstructor(onConstructor_ = @Deprecated) +class OnXFlagUsage2 { + private final String a = ""; +} \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/OnXFlagUsage.java.messages b/test/transform/resource/messages-delombok/OnXFlagUsage.java.messages new file mode 100644 index 0000000000..c4187b9fd0 --- /dev/null +++ b/test/transform/resource/messages-delombok/OnXFlagUsage.java.messages @@ -0,0 +1,6 @@ +9 Use of @Getter(onMethod=...) is flagged according to lombok configuration. +10 Use of @Setter(onMethod=...) is flagged according to lombok configuration. +10 Use of @Setter(onParam=...) is flagged according to lombok configuration. +11 Use of @NoArgsConstructor(onConstructor=...) is flagged according to lombok configuration. +12 Use of @AllArgsConstructor(onConstructor=...) is flagged according to lombok configuration. +18 Use of @RequiredArgsConstructor(onConstructor=...) is flagged according to lombok configuration. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/OnXFlagUsage.java.messages b/test/transform/resource/messages-ecj/OnXFlagUsage.java.messages new file mode 100644 index 0000000000..c4187b9fd0 --- /dev/null +++ b/test/transform/resource/messages-ecj/OnXFlagUsage.java.messages @@ -0,0 +1,6 @@ +9 Use of @Getter(onMethod=...) is flagged according to lombok configuration. +10 Use of @Setter(onMethod=...) is flagged according to lombok configuration. +10 Use of @Setter(onParam=...) is flagged according to lombok configuration. +11 Use of @NoArgsConstructor(onConstructor=...) is flagged according to lombok configuration. +12 Use of @AllArgsConstructor(onConstructor=...) is flagged according to lombok configuration. +18 Use of @RequiredArgsConstructor(onConstructor=...) is flagged according to lombok configuration. \ No newline at end of file From 16c42065227e8ace833aeff60de621808c5b4c62 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Thu, 21 Mar 2024 20:37:12 +0100 Subject: [PATCH 021/118] Exclude test for JDK < 8 --- test/transform/resource/before/OnXFlagUsage.java | 1 + 1 file changed, 1 insertion(+) diff --git a/test/transform/resource/before/OnXFlagUsage.java b/test/transform/resource/before/OnXFlagUsage.java index 8f7f4632f0..7e7a48bf71 100644 --- a/test/transform/resource/before/OnXFlagUsage.java +++ b/test/transform/resource/before/OnXFlagUsage.java @@ -1,3 +1,4 @@ +//version 8: //conf: lombok.onX.flagUsage = warning //skip compare content: We're just checking if the flagUsage key works. import lombok.AllArgsConstructor; From 102001b6c674caaac30f58c507d2cff813c8a031 Mon Sep 17 00:00:00 2001 From: Serg Vasylchak Date: Thu, 4 Apr 2024 15:02:03 +0200 Subject: [PATCH 022/118] Update Javadoc for `@Data` --- src/core/lombok/Data.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/lombok/Data.java b/src/core/lombok/Data.java index ffa968c176..081ade3be8 100644 --- a/src/core/lombok/Data.java +++ b/src/core/lombok/Data.java @@ -28,7 +28,8 @@ /** * Generates getters for all fields, a useful toString method, and hashCode and equals implementations that check - * all non-transient fields. Will also generate setters for all non-final fields, as well as a constructor. + * all non-transient fields. Will also generate setters for all non-final fields, as well as a constructor + * (except that no constructor will be generated if any explicitly written constructors already exist). *

* Equivalent to {@code @Getter @Setter @RequiredArgsConstructor @ToString @EqualsAndHashCode}. *

From 6b51348e397278913144e201e3198df7b6fc9c67 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 14 May 2024 02:11:21 +0200 Subject: [PATCH 023/118] [changelog] [#3638] Reflect fix of issue in previous commit --- doc/changelog.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 7303de1742..68bf748288 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -2,7 +2,7 @@ Lombok Changelog ---------------- ### v1.18.33 "Edgy Guinea Pig" -* We recently released v1.18.32; there is no edge release since then. +* PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. From c8f82f12559037489938e5f101df674792e944f2 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 01:18:38 +0200 Subject: [PATCH 024/118] [trivial] toss out an unused import --- test/bytecode/src/lombok/bytecode/TestPostCompiler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/test/bytecode/src/lombok/bytecode/TestPostCompiler.java b/test/bytecode/src/lombok/bytecode/TestPostCompiler.java index 3814e00df8..02185f7e56 100644 --- a/test/bytecode/src/lombok/bytecode/TestPostCompiler.java +++ b/test/bytecode/src/lombok/bytecode/TestPostCompiler.java @@ -24,7 +24,6 @@ import static org.junit.Assert.*; import java.io.File; -import java.io.IOException; import lombok.core.DiagnosticsReceiver; import lombok.core.PostCompiler; From 0e05959de6a90a355b6c143a2734893480831f9c Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 01:44:14 +0200 Subject: [PATCH 025/118] [test-framework] Allow deity decrees when testing: We _know_ lombok is correct, it is the tests that are wrong: Useful for small refactors that cause big test file changes. --- test/core/src/lombok/AbstractRunTests.java | 126 ++++++++++++--------- test/core/src/lombok/DirectoryRunner.java | 13 ++- test/core/src/lombok/LombokTestSource.java | 30 +++-- 3 files changed, 103 insertions(+), 66 deletions(-) diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java index 0cb379ff7f..6877bcfadd 100644 --- a/test/core/src/lombok/AbstractRunTests.java +++ b/test/core/src/lombok/AbstractRunTests.java @@ -25,10 +25,12 @@ import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.io.InputStreamReader; import java.net.URI; import java.util.ArrayList; import java.util.Collection; @@ -49,13 +51,7 @@ import lombok.transform.TestSourceFiles; public abstract class AbstractRunTests { - private final File dumpActualFilesHere; - - public AbstractRunTests() { - this.dumpActualFilesHere = findPlaceToDumpActualFiles(); - } - - public final FileTester createTester(final DirectoryRunner.TestParams params, final File file, String platform, int version) throws IOException { + public final FileTester createTester(final DirectoryRunner.TestParams params, final File file, String platform, int version, boolean copyToSource) throws IOException { ConfigurationKeysLoader.LoaderLoader.loadAllConfigurationKeys(); AssertionError directiveFailure = null; LombokTestSource sourceDirectives = null; @@ -107,7 +103,7 @@ public final FileTester createTester(final DirectoryRunner.TestParams params, fi if (params.expectChanges() && !forceUnchanged && !changed) result.addMessage(new CompilerMessage(-1, -1, true, "not flagged modified")); if (!params.expectChanges() && changed) result.addMessage(new CompilerMessage(-1, -1, true, "unexpected modification")); - compare(file.getName(), expected, result, params.printErrors(), sourceDirectives_.isSkipCompareContent() || expected.isSkipCompareContent()); + compare(file.getName(), expected, result, params.printErrors(), sourceDirectives_.isSkipCompareContent() || expected.isSkipCompareContent(), copyToSource); } }; } @@ -131,20 +127,34 @@ protected String readFile(File file) throws IOException { return result.toString(); } - private static File findPlaceToDumpActualFiles() { - String location = System.getProperty("lombok.tests.dump_actual_files"); - if (location != null) { - File dumpActualFilesHere = new File(location); - dumpActualFilesHere.mkdirs(); - return dumpActualFilesHere; - } - return null; - } - private static void dumpToFile(File file, String content) throws IOException { + List directives = new ArrayList(); + + if (file.exists()) { + BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8")); + try { + while (true) { + String line = br.readLine(); + if (line == null) break; + if (line.startsWith("//")) directives.add(line); + else if (!line.isEmpty()) break; + } + } finally { + br.close(); + } + } + FileOutputStream fos = new FileOutputStream(file); try { - fos.write(content.getBytes("UTF-8")); + for (String directive : directives) fos.write((directive + "\n").getBytes("UTF-8")); + + boolean atStart = true; + for (String line : content.split("(\\r?\\n)")) { + if (line.isEmpty()) continue; + if (atStart && line.startsWith("//")) continue; + atStart = false; + fos.write((line + "\n").getBytes("UTF-8")); + } } finally { fos.close(); } @@ -152,6 +162,7 @@ private static void dumpToFile(File file, String content) throws IOException { private static void dumpToFile(File file, Collection content) throws IOException { FileOutputStream fos = new FileOutputStream(file); + System.err.println(">>> DUMPING ERR MSG: " + file.getAbsolutePath()); try { for (CompilerMessage message : content) { fos.write(CompilerMessageMatcher.asCompilerMessageMatcher(message).toString().getBytes("UTF-8")); @@ -162,56 +173,67 @@ private static void dumpToFile(File file, Collection content) t } } - private void compare(String name, LombokTestSource expected, TransformationResult result, boolean printErrors, boolean skipCompareContent) throws Throwable { + private void compare(String name, LombokTestSource expected, TransformationResult result, boolean printErrors, boolean skipCompareContent, boolean copyToSource) throws Throwable { String actualFile = result.getOutput(); LinkedHashSet actualMessages = result.getMessages(); if (!skipCompareContent) try { compareContent(name, expected.getContent(), actualFile); } catch (Throwable e) { - if (printErrors) { - System.out.println("***** " + name + " *****"); - System.out.println(e.getMessage()); - System.out.println("**** Expected ******"); - System.out.println(expected.getContent()); - System.out.println("**** Actual ******"); - System.out.println(actualFile); - if (actualMessages != null && !actualMessages.isEmpty()) { - System.out.println("**** Actual Errors *****"); - for (CompilerMessage actualMessage : actualMessages) { - System.out.println(actualMessage); + if (copyToSource) { + dumpToFile(expected.getSourceFile(), actualFile); + System.out.println("UPDATED: " + expected.getSourceFile()); + } else { + if (printErrors) { + System.out.println("***** " + name + " *****"); + System.out.println(e.getMessage()); + System.out.println("**** Expected ******"); + System.out.println(expected.getContent()); + System.out.println("**** Actual ******"); + System.out.println(actualFile); + if (actualMessages != null && !actualMessages.isEmpty()) { + System.out.println("**** Actual Errors *****"); + for (CompilerMessage actualMessage : actualMessages) { + System.out.println(actualMessage); + } } + System.out.println("*******************"); } - System.out.println("*******************"); - } - if (dumpActualFilesHere != null) { - dumpToFile(new File(dumpActualFilesHere, name), actualFile); + throw e; } - throw e; } try { compareMessages(name, expected.getMessages(), actualMessages); } catch (Throwable e) { - if (printErrors) { - System.out.println("***** " + name + " *****"); - System.out.println(e.getMessage()); - System.out.println("**** Expected ******"); - for (CompilerMessageMatcher expectedMessage : expected.getMessages()) { - System.out.println(expectedMessage); + if (copyToSource) { + if (actualMessages.isEmpty()) { + if (expected.getMessagesFile().exists()) { + expected.getMessagesFile().delete(); + System.out.println("DELETED: " + expected.getMessagesFile()); + } + } else { + dumpToFile(expected.getMessagesFile(), actualMessages); + System.out.println("UPDATED: " + expected.getMessagesFile()); } - System.out.println("**** Actual ******"); - for (CompilerMessage actualMessage : actualMessages) { - System.out.println(actualMessage); + } else { + if (printErrors) { + System.out.println("***** " + name + " *****"); + System.out.println(e.getMessage()); + System.out.println("**** Expected ******"); + for (CompilerMessageMatcher expectedMessage : expected.getMessages()) { + System.out.println(expectedMessage); + } + System.out.println("**** Actual ******"); + for (CompilerMessage actualMessage : actualMessages) { + System.out.println(actualMessage); + } + System.out.println("**** Actual File ******"); + System.out.println(lineNumber(actualFile)); + System.out.println("*******************"); } - System.out.println("**** Actual File ******"); - System.out.println(lineNumber(actualFile)); - System.out.println("*******************"); - } - if (dumpActualFilesHere != null) { - dumpToFile(new File(dumpActualFilesHere, name + ".messages"), actualMessages); + throw e; } - throw e; } } diff --git a/test/core/src/lombok/DirectoryRunner.java b/test/core/src/lombok/DirectoryRunner.java index 53347e2426..1ed462069d 100644 --- a/test/core/src/lombok/DirectoryRunner.java +++ b/test/core/src/lombok/DirectoryRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2021 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -42,6 +42,13 @@ public class DirectoryRunner extends Runner { private static final List DEBUG_FOCUS_ON_FILE = Arrays.asList( ); + /* + * If this is set to true, you are decreeing that all tests pass, and that any test that dares to say it does not, means the test is wrong and not lombok: The framework will update the 'target' so that it now passes. + * This is, naturally, an exceedingly dangerous tool. The general way to use it is: First ensure all tests pass, then, do some minor refactor that massively impacts the tests, then, enable this, run the tests, then turn this off again, + * then, thoroughly review your commit diff. + */ + private static final boolean ITS_ALL_GOOD = false; + public enum Compiler { DELOMBOK { @Override public int getVersion() { @@ -181,10 +188,10 @@ private FileTester createTester(String fileName) throws IOException { File file = new File(params.getBeforeDirectory(), fileName); switch (params.getCompiler()) { case DELOMBOK: - return new RunTestsViaDelombok().createTester(params, file, "javac", params.getVersion()); + return new RunTestsViaDelombok().createTester(params, file, "javac", params.getVersion(), ITS_ALL_GOOD); case ECJ: String platform = RunTestsViaEcj.eclipseAvailable() ? "eclipse" : "ecj"; - return new RunTestsViaEcj().createTester(params, file, platform, params.getVersion()); + return new RunTestsViaEcj().createTester(params, file, platform, params.getVersion(), ITS_ALL_GOOD); default: case JAVAC: throw new UnsupportedOperationException(); diff --git a/test/core/src/lombok/LombokTestSource.java b/test/core/src/lombok/LombokTestSource.java index 92bc53eab6..79203cd0b5 100644 --- a/test/core/src/lombok/LombokTestSource.java +++ b/test/core/src/lombok/LombokTestSource.java @@ -50,7 +50,8 @@ import lombok.core.configuration.SingleConfigurationSource; public class LombokTestSource { - private final File file; + private final File sourceFile; + private final File messagesFile; private final String content; private final LombokImmutableList messages; private final Map formatPreferences; @@ -86,8 +87,12 @@ public boolean versionWithinLimit(int version) { return version >= versionLowerLimit && version <= versionUpperLimit; } - public File getFile() { - return file; + public File getSourceFile() { + return sourceFile; + } + + public File getMessagesFile() { + return messagesFile; } public String getContent() { @@ -169,8 +174,9 @@ private int[] parseVersionLimit(String spec) { private static final Pattern ISSUE_REF_PATTERN = Pattern.compile("^\\s*issue #?\\d+(:?\\s+.*)?$", Pattern.CASE_INSENSITIVE); private static final Pattern VERIFY_DIET_PATTERN = Pattern.compile("^\\s*eclipse:\\s*verify[- ]?diet\\s*(?:[-:].*)?$", Pattern.CASE_INSENSITIVE); - private LombokTestSource(File file, String content, List messages, List directives) { - this.file = file; + private LombokTestSource(File sourceFile, File messagesFile, String content, List messages, List directives) { + this.sourceFile = sourceFile; + this.messagesFile = messagesFile; this.content = content; this.messages = messages == null ? LombokImmutableList.of() : LombokImmutableList.copyOf(messages); @@ -227,7 +233,7 @@ private LombokTestSource(File file, String content, List if (lc.startsWith("version ")) { int[] limits = parseVersionLimit(lc.substring(7).trim()); if (limits == null) { - Assert.fail("Directive line \"" + directive + "\" in '" + file.getAbsolutePath() + "' invalid: version must be followed by a single integer."); + Assert.fail("Directive line \"" + directive + "\" in '" + sourceFile.getAbsolutePath() + "' invalid: version must be followed by a single integer."); throw new RuntimeException(); } versionLower = limits[0]; @@ -258,7 +264,7 @@ private LombokTestSource(File file, String content, List if (lc.startsWith("issue ")) continue; - Assert.fail("Directive line \"" + directive + "\" in '" + file.getAbsolutePath() + "' invalid: unrecognized directive."); + Assert.fail("Directive line \"" + directive + "\" in '" + sourceFile.getAbsolutePath() + "' invalid: unrecognized directive."); throw new RuntimeException(); } this.specifiedEncoding = encoding; @@ -276,7 +282,7 @@ private LombokTestSource(File file, String content, List Assert.fail("Problem on directive line: " + problem + " at conf line #" + lineNumber + " (" + line + ")"); } }; - final ConfigurationFile configurationFile = ConfigurationFile.fromCharSequence(file.getAbsoluteFile().getPath(), conf, ConfigurationFile.getLastModifiedOrMissing(file)); + final ConfigurationFile configurationFile = ConfigurationFile.fromCharSequence(sourceFile.getAbsoluteFile().getPath(), conf, ConfigurationFile.getLastModifiedOrMissing(sourceFile)); final ConfigurationSource source = SingleConfigurationSource.parse(configurationFile, new ConfigurationParser(reporter)); ConfigurationFileToSource sourceFinder = new ConfigurationFileToSource() { @Override public ConfigurationSource parsed(ConfigurationFile fileLocation) { @@ -315,7 +321,7 @@ public static LombokTestSource readDirectives(File file) throws IOException { } } - return new LombokTestSource(file, "", null, directives); + return new LombokTestSource(file, null, "", null, directives); } public static LombokTestSource read(File sourceFolder, File messagesFolder, String fileName) throws IOException { @@ -360,8 +366,9 @@ private static LombokTestSource read0(File sourceFolder, File messagesFolder, St if (content == null) content = new StringBuilder(); List messages = null; + File messagesFile = null; if (messagesFolder != null) { - File messagesFile = new File(messagesFolder, fileName + ".messages"); + messagesFile = new File(messagesFolder, fileName + ".messages"); try { InputStream rawIn = new FileInputStream(messagesFile); try { @@ -372,10 +379,11 @@ private static LombokTestSource read0(File sourceFolder, File messagesFolder, St } } catch (FileNotFoundException e) { messages = null; + messagesFile = null; } } - LombokTestSource source = new LombokTestSource(sourceFile, content.toString(), messages, directives); + LombokTestSource source = new LombokTestSource(sourceFile, messagesFile, content.toString(), messages, directives); String specifiedEncoding = source.getSpecifiedEncoding(); // The source file has an 'encoding' header to test encoding issues. Of course, reading the encoding header From 07a0cf7cdd1bbef7031f1da9344514a54286ca96 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 02:33:36 +0200 Subject: [PATCH 026/118] [bugfix] mixing `@Delegate` and `@Getter(lazy)` causes positions to be lost. 15 years and nobody found this bug - not worth an issue or a changelog. --- .../lombok/javac/handlers/HandleGetter.java | 2 +- .../lombok/javac/handlers/JavacHandlerUtil.java | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index dac524dd3b..5c7b5b0f13 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.java @@ -215,7 +215,7 @@ public void createGetterForField(AccessLevel level, long access = toJavacModifier(level) | (fieldDecl.mods.flags & Flags.STATIC); - injectMethod(fieldNode.up(), createGetter(access, fieldNode, fieldNode.getTreeMaker(), source, lazy, onMethod)); + injectMethod(fieldNode.up(), source, createGetter(access, fieldNode, fieldNode.getTreeMaker(), source, lazy, onMethod)); } public JCMethodDecl createGetter(long access, JavacNode field, JavacTreeMaker treeMaker, JavacNode source, boolean lazy, List onMethod) { diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index 8b5638247d..660ebcc8a1 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -1369,6 +1369,21 @@ static void enter(ClassSymbol from, Symbol toEnter) { * Also takes care of updating the JavacAST. */ public static void injectMethod(JavacNode typeNode, JCMethodDecl method) { + JavacNode source = typeNode.getNodeFor(getGeneratedBy(method)); + injectMethod(typeNode, source, method); + } + + /** + * Adds the given new method declaration to the provided type AST Node. + * Can also inject constructors. + * + * Also takes care of updating the JavacAST. + * + * Ordinarily the 'source' is determined automatically. In rare cases generally involving combinations between + * annotations, some of which require re-attribution such as {@code @Delegate}, that doesn't work. This method + * exists if you explicitly have the source. + */ + public static void injectMethod(JavacNode typeNode, JavacNode source, JCMethodDecl method) { JCClassDecl type = (JCClassDecl) typeNode.get(); if (method.getName().contentEquals("")) { @@ -1389,7 +1404,7 @@ public static void injectMethod(JavacNode typeNode, JCMethodDecl method) { } addSuppressWarningsAll(method.mods, typeNode, typeNode.getNodeFor(getGeneratedBy(method)), typeNode.getContext()); - addGenerated(method.mods, typeNode, typeNode.getNodeFor(getGeneratedBy(method)), typeNode.getContext()); + addGenerated(method.mods, typeNode, source, typeNode.getContext()); type.defs = type.defs.append(method); EnterReflect.memberEnter(method, typeNode); From 906f66d6dff203b92cd09afe00680ad8d666be9b Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 00:54:02 +0200 Subject: [PATCH 027/118] [i3667] change default behaviour: lombok.Generated now generated by default --- src/core/lombok/ConfigurationKeys.java | 2 +- src/core/lombok/Generated.java | 12 ++++++------ .../lombok/eclipse/handlers/EclipseHandlerUtil.java | 2 +- src/core/lombok/javac/handlers/JavacHandlerUtil.java | 2 +- .../resource/before/GeneratedJavaxOnLombokOn.java | 1 - .../resource/before/GeneratedOffLombokOn.java | 1 - 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/core/lombok/ConfigurationKeys.java b/src/core/lombok/ConfigurationKeys.java index 27fe78e058..b19dccfc98 100644 --- a/src/core/lombok/ConfigurationKeys.java +++ b/src/core/lombok/ConfigurationKeys.java @@ -87,7 +87,7 @@ private ConfigurationKeys() {} * * If {@code true}, lombok generates {@code @lombok.Generated} on all fields, methods, and types that are generated. */ - public static final ConfigurationKey ADD_LOMBOK_GENERATED_ANNOTATIONS = new ConfigurationKey("lombok.addLombokGeneratedAnnotation", "Generate @lombok.Generated on all generated code (default: false).") {}; + public static final ConfigurationKey ADD_LOMBOK_GENERATED_ANNOTATIONS = new ConfigurationKey("lombok.addLombokGeneratedAnnotation", "Generate @lombok.Generated on all generated code (default: true).") {}; /** * lombok configuration: {@code lombok.extern.findbugs.addSuppressFBWarnings} = {@code true} | {@code false}. diff --git a/src/core/lombok/Generated.java b/src/core/lombok/Generated.java index 216ab14348..09608e4bb3 100644 --- a/src/core/lombok/Generated.java +++ b/src/core/lombok/Generated.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2016 The Project Lombok Authors. + * Copyright (C) 2015-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -27,14 +27,14 @@ import java.lang.annotation.Target; /** - * Lombok will eventually automatically add this annotation to all generated constructors, methods, fields, and types. + * Lombok automatically adds this annotation to all generated constructors, methods, fields, and types. * * You can mark the presence of this annotation as 'ignore it' for all code style and bug finding tools. *

- * NB: As of v1.16.2 which introduces this annotation, lombok doesn't actually add this annotation; we're setting - * it up so that lombok jars in widespread use start having this, which will make it easier to actually apply it - * later on. By adding {@code lombok.addLombokGeneratedAnnotation = true} to {@code lombok.config} you can already - * get this behavior. + * NB: As of v1.18.34, lombok adds this annotation by default; before then you had to add a lombok config key. + *

+ * If you want to opt out (not recommended), you can add {@code lombok.addLombokGeneratedAnnotation = false} to + * {@code lombok.config}. */ @Target({ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE}) @Retention(RetentionPolicy.CLASS) diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index ef7a7c3a3c..af1aa0fd82 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -2098,7 +2098,7 @@ public static Annotation[] addGenerated(EclipseNode node, ASTNode source, Annota if (Boolean.TRUE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_JAKARTA_GENERATED_ANNOTATIONS))) { result = addAnnotation(source, result, JAKARTA_ANNOTATION_GENERATED, new StringLiteral(LOMBOK, 0, 0, 0)); } - if (Boolean.TRUE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS))) { + if (!Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS))) { result = addAnnotation(source, result, LOMBOK_GENERATED); } return result; diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index 660ebcc8a1..38658bb622 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -1542,7 +1542,7 @@ public static void addGenerated(JCModifiers mods, JavacNode node, JavacNode sour if (Boolean.TRUE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_JAKARTA_GENERATED_ANNOTATIONS))) { addAnnotation(mods, node, source, "jakarta.annotation.Generated", node.getTreeMaker().Literal("lombok")); } - if (Boolean.TRUE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS))) { + if (!Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS))) { addAnnotation(mods, node, source, "lombok.Generated", null); } } diff --git a/test/transform/resource/before/GeneratedJavaxOnLombokOn.java b/test/transform/resource/before/GeneratedJavaxOnLombokOn.java index cee391adb1..b6cc1fe42b 100644 --- a/test/transform/resource/before/GeneratedJavaxOnLombokOn.java +++ b/test/transform/resource/before/GeneratedJavaxOnLombokOn.java @@ -1,5 +1,4 @@ //CONF: lombok.addJavaxGeneratedAnnotation = true -//CONF: lombok.addLombokGeneratedAnnotation = true class GeneratedJavaxOnLombokOn { @lombok.Getter int x; diff --git a/test/transform/resource/before/GeneratedOffLombokOn.java b/test/transform/resource/before/GeneratedOffLombokOn.java index 9d122306dd..ae6094e452 100644 --- a/test/transform/resource/before/GeneratedOffLombokOn.java +++ b/test/transform/resource/before/GeneratedOffLombokOn.java @@ -1,5 +1,4 @@ //CONF: lombok.addGeneratedAnnotation = false -//CONF: lombok.addLombokGeneratedAnnotation = true class GeneratedOffLombokOn { @lombok.Getter int x; From 0c5f878a4c262c26c8dc6e9ec04bac08b48ea575 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:01:42 +0200 Subject: [PATCH 028/118] [tests] This seemingly humongous commit is actually nothing: All test-cases now have `@Generated` annotations where before they did not. --- ...f.java => GeneratedJavaxOffLombokOff.java} | 2 +- .../resource/after-ecj/Accessors.java | 32 +++---- .../resource/after-ecj/AccessorsCascade.java | 10 +- .../after-ecj/AccessorsConfiguration.java | 8 +- .../after-ecj/AccessorsInAnonymousClass.java | 4 +- .../after-ecj/AccessorsMakeFinal.java | 4 +- .../AccessorsMakeFinalLombokConfig.java | 4 +- .../after-ecj/AccessorsNoParamWarning.java | 6 +- .../after-ecj/BuilderAccessWithGetter.java | 18 ++-- .../resource/after-ecj/BuilderComplex.java | 26 ++--- .../after-ecj/BuilderConstructorJavadoc.java | 22 ++--- .../resource/after-ecj/BuilderDefaults.java | 46 ++++----- .../after-ecj/BuilderDefaultsArray.java | 30 +++--- .../after-ecj/BuilderDefaultsGenerics.java | 36 +++---- .../BuilderDefaultsTargetTyping.java | 20 ++-- .../after-ecj/BuilderDefaultsWarnings.java | 40 ++++---- .../after-ecj/BuilderGenericMethod.java | 18 ++-- .../after-ecj/BuilderInstanceMethod.java | 26 ++--- .../resource/after-ecj/BuilderJavadoc.java | 28 +++--- .../after-ecj/BuilderNestedInEnum.java | 26 ++--- .../after-ecj/BuilderOnNestedClass.java | 16 ++-- .../after-ecj/BuilderOnNestedRecord.java | 16 ++-- .../resource/after-ecj/BuilderSimple.java | 20 ++-- .../after-ecj/BuilderSimpleOnRecord.java | 18 ++-- .../BuilderSimpleWithSetterPrefix.java | 16 ++-- .../BuilderSingularAnnotatedTypes.java | 32 +++---- ...ingularAnnotatedTypesWithSetterPrefix.java | 30 +++--- .../BuilderSingularGuavaListsSets.java | 52 +++++----- .../after-ecj/BuilderSingularGuavaMaps.java | 36 +++---- .../after-ecj/BuilderSingularLists.java | 39 ++++---- .../after-ecj/BuilderSingularMaps.java | 54 +++++------ .../BuilderSingularMapsWithSetterPrefix.java | 54 +++++------ .../after-ecj/BuilderSingularNoAuto.java | 36 +++---- ...BuilderSingularNoAutoWithSetterPrefix.java | 36 +++---- .../BuilderSingularNullBehavior1.java | 30 +++--- .../BuilderSingularNullBehavior2.java | 22 ++--- .../after-ecj/BuilderSingularOnRecord.java | 34 +++---- .../BuilderSingularRedirectToGuava.java | 38 ++++---- .../after-ecj/BuilderSingularSets.java | 46 ++++----- .../BuilderSingularSetsWithSetterPrefix.java | 44 ++++----- .../BuilderSingularToBuilderWithNull.java | 24 ++--- ...ularToBuilderWithNullWithSetterPrefix.java | 22 ++--- ...derSingularWildcardListsWithToBuilder.java | 32 +++---- .../BuilderSingularWithPrefixes.java | 22 ++--- ...rSingularWithPrefixesWithSetterPrefix.java | 20 ++-- .../resource/after-ecj/BuilderTypeAnnos.java | 16 ++-- .../BuilderTypeAnnosWithSetterPrefix.java | 16 ++-- .../resource/after-ecj/BuilderValueData.java | 44 ++++----- .../BuilderValueDataWithSetterPrefix.java | 42 ++++----- .../after-ecj/BuilderWithAccessors.java | 28 +++--- .../after-ecj/BuilderWithBadNames.java | 20 ++-- .../after-ecj/BuilderWithDeprecated.java | 38 ++++---- .../BuilderWithDeprecatedAnnOnly.java | 32 +++---- .../BuilderWithExistingBuilderClass.java | 18 ++-- ...hExistingBuilderClassWithSetterPrefix.java | 16 ++-- ...uilderWithJavaBeansSpecCapitalization.java | 32 +++---- .../after-ecj/BuilderWithNoBuilderMethod.java | 16 ++-- .../after-ecj/BuilderWithNonNull.java | 18 ++-- .../BuilderWithNonNullWithSetterPrefix.java | 16 ++-- .../BuilderWithRecursiveGenerics.java | 31 +++--- .../after-ecj/BuilderWithToBuilder.java | 76 +++++++-------- .../after-ecj/BuilderWithTolerate.java | 16 ++-- .../after-ecj/CheckerFrameworkBasic.java | 22 ++--- .../after-ecj/CheckerFrameworkBuilder.java | 38 ++++---- .../CheckerFrameworkSuperBuilder.java | 72 +++++++------- .../after-ecj/ClassNamedAfterGetter.java | 2 +- .../after-ecj/CommentsInterspersed.java | 2 +- .../ConflictingStaticConstructorNames.java | 12 +-- .../resource/after-ecj/ConstructorInner.java | 6 +- .../resource/after-ecj/Constructors.java | 28 +++--- .../after-ecj/ConstructorsConfiguration.java | 2 +- .../ConstructorsInAnonymousClass.java | 6 +- .../after-ecj/ConstructorsTypeAnnos.java | 2 +- .../after-ecj/ConstructorsWithAccessors.java | 6 +- .../ConstructorsWithBuilderDefaults.java | 36 +++---- .../ConstructorsWithBuilderDefaults2.java | 46 ++++----- .../ConstructorsWithSuperBuilderDefaults.java | 36 +++---- .../resource/after-ecj/DataConfiguration.java | 14 +-- .../resource/after-ecj/DataExtended.java | 14 +-- .../resource/after-ecj/DataIgnore.java | 12 +-- .../after-ecj/DataInAnonymousClass.java | 14 +-- .../resource/after-ecj/DataOnEnum.java | 6 +- .../resource/after-ecj/DataOnLocalClass.java | 42 ++++----- .../resource/after-ecj/DataPlain.java | 76 +++++++-------- .../resource/after-ecj/DataWithGetter.java | 20 ++-- .../after-ecj/DataWithGetterNone.java | 14 +-- .../DataWithOverrideEqualsAndHashCode.java | 4 +- .../resource/after-ecj/EqualsAndHashCode.java | 22 ++--- .../after-ecj/EqualsAndHashCodeAnnotated.java | 8 +- .../EqualsAndHashCodeAutoExclude.java | 12 +-- .../after-ecj/EqualsAndHashCodeCache.java | 48 +++++----- .../EqualsAndHashCodeConfigKeys1.java | 14 +-- .../EqualsAndHashCodeConfigKeys2.java | 20 ++-- .../after-ecj/EqualsAndHashCodeEmpty.java | 14 +-- .../EqualsAndHashCodeExplicitInclude.java | 8 +- .../EqualsAndHashCodeInAnonymousClass.java | 6 +- .../EqualsAndHashCodeNestedShadow.java | 14 +-- .../after-ecj/EqualsAndHashCodeNewStyle.java | 6 +- .../EqualsAndHashCodeOfAndExclude.java | 8 +- .../after-ecj/EqualsAndHashCodeRank.java | 6 +- .../EqualsAndHashCodeWithExistingMethods.java | 6 +- ...EqualsAndHashCodeWithGenericsOnInners.java | 6 +- ...hCodeWithGenericsOnInnersInInterfaces.java | 7 +- ...EqualsAndHashCodeWithNonNullByDefault.java | 8 +- .../EqualsAndHashCodeWithOnParam.java | 9 +- ...alsAndHashCodeWithSomeExistingMethods.java | 26 ++--- ...tsViaConfigAndRequiredArgsConstructor.java | 2 +- .../after-ecj/FieldNameConstantsBasic.java | 6 +- .../FieldNameConstantsConfigKeys.java | 6 +- .../after-ecj/FieldNameConstantsEnum.java | 6 +- .../FieldNameConstantsHandrolled.java | 6 +- .../after-ecj/FieldNameConstantsOnRecord.java | 4 +- .../FieldNameConstantsUppercased.java | 6 +- .../after-ecj/GenerateSuppressFBWarnings.java | 4 +- .../after-ecj/GeneratedJavaxJakarta.java | 2 +- ...f.java => GeneratedJavaxOffLombokOff.java} | 4 +- .../resource/after-ecj/GeneratedOff.java | 2 +- .../after-ecj/GeneratedOffJavaxOn.java | 2 +- .../resource/after-ecj/GeneratedOn.java | 2 +- .../resource/after-ecj/GetterAccessLevel.java | 18 ++-- .../after-ecj/GetterAlreadyExists.java | 20 ++-- .../resource/after-ecj/GetterBoolean.java | 8 +- .../resource/after-ecj/GetterDeprecated.java | 4 +- .../resource/after-ecj/GetterEnum.java | 6 +- .../after-ecj/GetterInAnonymousClass.java | 2 +- .../resource/after-ecj/GetterLazy.java | 2 +- .../after-ecj/GetterLazyArguments.java | 14 +-- .../resource/after-ecj/GetterLazyBoolean.java | 12 +-- .../after-ecj/GetterLazyEahcToString.java | 12 +-- .../after-ecj/GetterLazyGenerics.java | 6 +- .../after-ecj/GetterLazyInAnonymousClass.java | 2 +- .../resource/after-ecj/GetterLazyInvalid.java | 2 +- .../resource/after-ecj/GetterLazyNative.java | 18 ++-- .../after-ecj/GetterLazyTransient.java | 6 +- .../resource/after-ecj/GetterNone.java | 2 +- .../resource/after-ecj/GetterOnClass.java | 16 ++-- .../resource/after-ecj/GetterOnMethod.java | 6 +- .../after-ecj/GetterOnMethodErrors2.java | 18 ++-- .../after-ecj/GetterOnMethodOnType.java | 6 +- .../resource/after-ecj/GetterOnStatic.java | 4 +- .../resource/after-ecj/GetterPlain.java | 4 +- .../after-ecj/GetterSetterJavadoc.java | 32 +++---- .../resource/after-ecj/GetterTypeAnnos.java | 2 +- .../resource/after-ecj/GetterWithDollar.java | 6 +- ...GetterWithJavaBeansSpecCapitalization.java | 6 +- .../I2335_BuilderMultipleObtainVia.java | 20 ++-- .../resource/after-ecj/InnerClass.java | 12 +-- .../after-ecj/JacksonBuilderSingular.java | 48 +++++----- .../after-ecj/JacksonJsonProperty.java | 20 ++-- .../after-ecj/JacksonizedBuilderComplex.java | 26 ++--- .../after-ecj/JacksonizedBuilderSimple.java | 21 ++--- .../after-ecj/JacksonizedOnRecord.java | 22 ++--- .../JacksonizedSuperBuilderSimple.java | 24 ++--- ...onizedSuperBuilderWithJsonDeserialize.java | 24 ++--- .../resource/after-ecj/JavadocMultiline.java | 8 +- .../resource/after-ecj/MultiFieldGetter.java | 8 +- .../after-ecj/NoArgsConstructorForce.java | 4 +- .../after-ecj/NoPrivateNoArgsConstructor.java | 24 ++--- .../NonNullExistingConstructorOnRecord.java | 2 +- .../after-ecj/NonNullOnRecordSimple.java | 2 +- .../after-ecj/NonNullOnRecordTypeUse.java | 2 +- .../resource/after-ecj/NonNullPlain.java | 16 ++-- .../NonNullWithAlternateException.java | 4 +- .../after-ecj/NonNullWithAssertion.java | 4 +- .../resource/after-ecj/NonNullWithGuava.java | 2 +- .../resource/after-ecj/NonNullWithJdk.java | 2 +- ...AnnotatedCheckerFrameworkSuperBuilder.java | 74 +++++++-------- .../resource/after-ecj/NullLibrary1.java | 12 +-- .../resource/after-ecj/NullLibrary2.java | 12 +-- .../resource/after-ecj/NullLibrary3.java | 14 +-- .../resource/after-ecj/OnXJava7StyleOn8.java | 18 ++-- .../resource/after-ecj/OnXJava8Style.java | 18 ++-- .../after-ecj/PrivateNoArgsConstructor.java | 76 +++++++-------- .../resource/after-ecj/SetterAccessLevel.java | 10 +- .../after-ecj/SetterAlreadyExists.java | 4 +- .../after-ecj/SetterAndWithMethodJavadoc.java | 8 +- .../resource/after-ecj/SetterDeprecated.java | 4 +- .../after-ecj/SetterInAnonymousClass.java | 2 +- .../resource/after-ecj/SetterOnClass.java | 16 ++-- .../after-ecj/SetterOnMethodOnParam.java | 8 +- .../resource/after-ecj/SetterOnStatic.java | 4 +- .../resource/after-ecj/SetterPlain.java | 4 +- .../resource/after-ecj/SetterTypeAnnos.java | 2 +- .../resource/after-ecj/SetterWithDollar.java | 6 +- ...SetterWithJavaBeansSpecCapitalization.java | 6 +- .../after-ecj/SimpleTypeResolution.java | 2 +- .../after-ecj/SkipSuppressWarnings.java | 6 +- .../after-ecj/StandardExceptions.java | 16 ++-- .../resource/after-ecj/StaticConstructor.java | 6 +- .../after-ecj/SuperBuilderAbstract.java | 58 ++++++------ .../SuperBuilderAbstractToBuilder.java | 74 +++++++-------- .../resource/after-ecj/SuperBuilderBasic.java | 52 +++++----- .../after-ecj/SuperBuilderBasicToBuilder.java | 76 +++++++-------- .../after-ecj/SuperBuilderCustomName.java | 22 ++--- .../after-ecj/SuperBuilderCustomized.java | 30 +++--- ...uperBuilderCustomizedWithSetterPrefix.java | 18 ++-- .../after-ecj/SuperBuilderInitializer.java | 22 ++--- .../after-ecj/SuperBuilderJavadoc.java | 26 ++--- .../after-ecj/SuperBuilderNameClashes.java | 78 +++++++-------- .../SuperBuilderNestedGenericTypes.java | 22 ++--- .../SuperBuilderSingularAnnotatedTypes.java | 38 ++++---- .../SuperBuilderSingularCustomized.java | 26 ++--- .../SuperBuilderSingularToBuilderGuava.java | 94 +++++++++---------- .../SuperBuilderWithAnnotatedTypeParam.java | 44 ++++----- ...uperBuilderWithCustomBuilderClassName.java | 38 ++++---- .../SuperBuilderWithCustomBuilderMethod.java | 56 +++++------ .../after-ecj/SuperBuilderWithDefaults.java | 62 ++++++------ ...perBuilderWithDefaultsAndTargetTyping.java | 52 +++++----- .../SuperBuilderWithExistingConstructor.java | 20 ++-- .../after-ecj/SuperBuilderWithGenerics.java | 58 ++++++------ .../after-ecj/SuperBuilderWithGenerics2.java | 58 ++++++------ .../after-ecj/SuperBuilderWithGenerics3.java | 44 ++++----- .../SuperBuilderWithGenericsAndToBuilder.java | 72 +++++++------- .../after-ecj/SuperBuilderWithNonNull.java | 48 +++++----- ...BuilderWithOverloadedGeneratedMethods.java | 44 ++++----- .../after-ecj/SuperBuilderWithPrefixes.java | 34 +++---- .../SuperBuilderWithSetterPrefix.java | 76 +++++++-------- .../resource/after-ecj/ToStringArray.java | 2 +- .../ToStringArrayTypeAnnotations.java | 2 +- .../after-ecj/ToStringAutoExclude.java | 6 +- .../resource/after-ecj/ToStringAutoSuper.java | 4 +- .../after-ecj/ToStringConfiguration.java | 12 +-- .../resource/after-ecj/ToStringEnum.java | 8 +- .../after-ecj/ToStringExplicitInclude.java | 2 +- .../ToStringExplicitIncludeConf.java | 2 +- .../after-ecj/ToStringInAnonymousClass.java | 2 +- .../resource/after-ecj/ToStringInner.java | 8 +- .../resource/after-ecj/ToStringNewStyle.java | 2 +- .../resource/after-ecj/ToStringPlain.java | 4 +- .../resource/after-ecj/Tolerate.java | 10 +- .../after-ecj/TypeUseAnnotations.java | 6 +- .../resource/after-ecj/UtilityClass.java | 10 +- .../after-ecj/UtilityClassGeneric.java | 2 +- .../resource/after-ecj/UtilityClassInner.java | 4 +- .../resource/after-ecj/ValueCallSuper.java | 10 +- .../after-ecj/ValueInAnonymousClass.java | 10 +- .../resource/after-ecj/ValuePlain.java | 38 ++++---- .../after-ecj/ValueStaticConstructorOf.java | 12 +-- .../resource/after-ecj/ValueStaticField.java | 10 +- .../ValueWithJavaBeansSpecCapitalization.java | 10 +- .../resource/after-ecj/WithAlreadyExists.java | 4 +- .../after-ecj/WithAndAllArgsConstructor.java | 6 +- .../after-ecj/WithByInAnonymousClass.java | 2 +- .../resource/after-ecj/WithByNullAnnos.java | 6 +- .../resource/after-ecj/WithByOnRecord.java | 4 +- .../after-ecj/WithByOnRecordComponent.java | 2 +- .../resource/after-ecj/WithByTypes.java | 22 ++--- .../after-ecj/WithInAnonymousClass.java | 2 +- .../after-ecj/WithMethodAbstract.java | 2 +- .../after-ecj/WithMethodMarkedDeprecated.java | 4 +- .../WithMethodMarkedDeprecatedAnnOnly.java | 3 +- .../resource/after-ecj/WithNested.java | 4 +- .../resource/after-ecj/WithOnClass.java | 12 +-- .../after-ecj/WithOnNestedRecord.java | 5 +- .../resource/after-ecj/WithOnRecord.java | 4 +- .../after-ecj/WithOnRecordComponent.java | 2 +- .../resource/after-ecj/WithPlain.java | 4 +- .../resource/after-ecj/WithWithGenerics.java | 6 +- .../WithWithJavaBeansSpecCapitalization.java | 2 +- .../resource/after-ecj/WithWithTypeAnnos.java | 2 +- .../resource/after-ecj/WitherAccessLevel.java | 10 +- .../resource/after-ecj/WitherLegacyStar.java | 4 +- .../resource/before/GeneratedJavaxOff.java | 5 - .../before/GeneratedJavaxOffLombokOff.java | 6 ++ 264 files changed, 2496 insertions(+), 2504 deletions(-) rename test/transform/resource/after-delombok/{GeneratedJavaxOff.java => GeneratedJavaxOffLombokOff.java} (71%) rename test/transform/resource/after-ecj/{GeneratedJavaxOff.java => GeneratedJavaxOffLombokOff.java} (64%) delete mode 100644 test/transform/resource/before/GeneratedJavaxOff.java create mode 100644 test/transform/resource/before/GeneratedJavaxOffLombokOff.java diff --git a/test/transform/resource/after-delombok/GeneratedJavaxOff.java b/test/transform/resource/after-delombok/GeneratedJavaxOffLombokOff.java similarity index 71% rename from test/transform/resource/after-delombok/GeneratedJavaxOff.java rename to test/transform/resource/after-delombok/GeneratedJavaxOffLombokOff.java index ca50f3d258..d1ec546418 100644 --- a/test/transform/resource/after-delombok/GeneratedJavaxOff.java +++ b/test/transform/resource/after-delombok/GeneratedJavaxOffLombokOff.java @@ -1,4 +1,4 @@ -class GeneratedJavaxOff { +class GeneratedJavaxOffLombokOff { int x; @java.lang.SuppressWarnings("all") public int getX() { diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java index 149d16f998..77fda247df 100644 --- a/test/transform/resource/after-ecj/Accessors.java +++ b/test/transform/resource/after-ecj/Accessors.java @@ -3,13 +3,13 @@ class AccessorsFluent { AccessorsFluent() { super(); } - public @java.lang.SuppressWarnings("all") String fieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String fieldName() { return this.fieldName; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsFluent fieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; } @@ -23,14 +23,14 @@ class AccessorsFluent { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsFluentOnClass fieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; } - public @java.lang.SuppressWarnings("all") String fieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String fieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") String getOtherFieldWithOverride() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } } @@ -42,7 +42,7 @@ class AccessorsChain { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsChain setRunning(final boolean isRunning) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; } @@ -53,7 +53,7 @@ class AccessorsChain { AccessorsPrefix() { super(); } - public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setActualField(final String fActualField) { this.fActualField = fActualField; } } @@ -63,10 +63,10 @@ class AccessorsChain { AccessorsPrefix2() { super(); } - public @java.lang.SuppressWarnings("all") void setFieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFieldName(final String fieldName) { this.fieldName = fieldName; } - public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setActualField(final String fActualField) { this.fActualField = fActualField; } } @@ -78,10 +78,10 @@ class AccessorsChain { private String getName() { return fName; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("AccessorsPrefix3(fName=" + this.getName()) + ")"); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof AccessorsPrefix3))) @@ -95,10 +95,10 @@ private String getName() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof AccessorsPrefix3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $fName = this.getName(); @@ -114,7 +114,7 @@ class AccessorsFluentGenerics { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsFluentGenerics name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsFluentGenerics name(final String name) { this.name = name; return this; } @@ -124,7 +124,7 @@ class AccessorsFluentNoChaining { AccessorsFluentNoChaining() { super(); } - public @java.lang.SuppressWarnings("all") void name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void name(final String name) { this.name = name; } } @@ -135,7 +135,7 @@ class AccessorsFluentStatic { AccessorsFluentStatic() { super(); } - public static @java.lang.SuppressWarnings("all") void name(final String name) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated void name(final String name) { AccessorsFluentStatic.name = name; } } diff --git a/test/transform/resource/after-ecj/AccessorsCascade.java b/test/transform/resource/after-ecj/AccessorsCascade.java index cacd338f68..a6f8dadc03 100644 --- a/test/transform/resource/after-ecj/AccessorsCascade.java +++ b/test/transform/resource/after-ecj/AccessorsCascade.java @@ -7,7 +7,7 @@ class AccessorsInner1 { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsOuter.AccessorsInner1 setTest3(final String zTest3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsOuter.AccessorsInner1 setTest3(final String zTest3) { this.zTest3 = zTest3; return this; } @@ -17,7 +17,7 @@ class AccessorsInner1 { AccessorsInner2() { super(); } - public @java.lang.SuppressWarnings("all") void setTest4(final String fTest4) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest4(final String fTest4) { this.fTest4 = fTest4; } } @@ -29,15 +29,15 @@ class AccessorsInner1 { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsOuter setTest(final String fTest) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsOuter setTest(final String fTest) { this.fTest = fTest; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsOuter setTest2(final String zTest2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsOuter setTest2(final String zTest2) { this.zTest2 = zTest2; return this; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/AccessorsConfiguration.java b/test/transform/resource/after-ecj/AccessorsConfiguration.java index a844763c96..219ec4e2f3 100644 --- a/test/transform/resource/after-ecj/AccessorsConfiguration.java +++ b/test/transform/resource/after-ecj/AccessorsConfiguration.java @@ -3,10 +3,10 @@ class AccessorsConfiguration { AccessorsConfiguration() { super(); } - public @java.lang.SuppressWarnings("all") String fieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String fieldName() { return this.m_FieldName; } - public @java.lang.SuppressWarnings("all") void fieldName(final String m_FieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void fieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } } @@ -15,7 +15,7 @@ class AccessorsConfiguration { AccessorsConfiguration2() { super(); } - public @java.lang.SuppressWarnings("all") void setM_FieldName(final String m_FieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setM_FieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } } @@ -27,7 +27,7 @@ class AccessorsConfiguration { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsConfiguration3 setFieldName(final String fFieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsConfiguration3 setFieldName(final String fFieldName) { this.fFieldName = fFieldName; return this; } diff --git a/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java b/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java index 34db4f2dce..ec9df3f69b 100644 --- a/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java +++ b/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java @@ -8,13 +8,13 @@ public class AccessorsInAnonymousClass { Inner() { super(); } - public @java.lang.SuppressWarnings("all") String string() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String string() { return this.string; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") Inner string(final String string) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner string(final String string) { this.string = string; return this; } diff --git a/test/transform/resource/after-ecj/AccessorsMakeFinal.java b/test/transform/resource/after-ecj/AccessorsMakeFinal.java index c8ac4bbd56..ed4f6ebc31 100644 --- a/test/transform/resource/after-ecj/AccessorsMakeFinal.java +++ b/test/transform/resource/after-ecj/AccessorsMakeFinal.java @@ -6,8 +6,8 @@ /** * @return {@code this}. */ - public final @java.lang.SuppressWarnings("all") AccessorsMakeFinal1 test(final String test) { + public final @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsMakeFinal1 test(final String test) { this.test = test; return this; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/AccessorsMakeFinalLombokConfig.java b/test/transform/resource/after-ecj/AccessorsMakeFinalLombokConfig.java index f7c411e36b..6aba9814ae 100644 --- a/test/transform/resource/after-ecj/AccessorsMakeFinalLombokConfig.java +++ b/test/transform/resource/after-ecj/AccessorsMakeFinalLombokConfig.java @@ -3,7 +3,7 @@ class AccessorsMakeFinalLombokConfig { AccessorsMakeFinalLombokConfig() { super(); } - public final @java.lang.SuppressWarnings("all") void setTest(final String test) { + public final @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final String test) { this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/AccessorsNoParamWarning.java b/test/transform/resource/after-ecj/AccessorsNoParamWarning.java index e5d2d9051a..eefabbe2be 100644 --- a/test/transform/resource/after-ecj/AccessorsNoParamWarning.java +++ b/test/transform/resource/after-ecj/AccessorsNoParamWarning.java @@ -3,7 +3,7 @@ AccessorsNoParams() { super(); } - public @java.lang.SuppressWarnings("all") String otherFieldWithOverride() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String otherFieldWithOverride() { return this.otherFieldWithOverride; } } @@ -12,7 +12,7 @@ AccessorsNoParams2() { super(); } - public @java.lang.SuppressWarnings("all") void setFoo(final boolean foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final boolean foo) { this.foo = foo; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderAccessWithGetter.java b/test/transform/resource/after-ecj/BuilderAccessWithGetter.java index 7ad5fa6a77..d42cdb40f8 100644 --- a/test/transform/resource/after-ecj/BuilderAccessWithGetter.java +++ b/test/transform/resource/after-ecj/BuilderAccessWithGetter.java @@ -2,34 +2,34 @@ import lombok.Builder; import lombok.Getter; public final @Builder(access = AccessLevel.PRIVATE) class BuilderAccessWithGetter { - private static @java.lang.SuppressWarnings("all") class BuilderAccessWithGetterBuilder { - private @java.lang.SuppressWarnings("all") String string; - @java.lang.SuppressWarnings("all") BuilderAccessWithGetterBuilder() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderAccessWithGetterBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String string; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAccessWithGetterBuilder() { super(); } /** * @return {@code this}. */ - private @java.lang.SuppressWarnings("all") BuilderAccessWithGetter.BuilderAccessWithGetterBuilder string(final String string) { + private @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAccessWithGetter.BuilderAccessWithGetterBuilder string(final String string) { this.string = string; return this; } - private @java.lang.SuppressWarnings("all") BuilderAccessWithGetter build() { + private @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAccessWithGetter build() { return new BuilderAccessWithGetter(this.string); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderAccessWithGetter.BuilderAccessWithGetterBuilder(string=" + this.string) + ")"); } } private final @Getter String string; - @java.lang.SuppressWarnings("all") BuilderAccessWithGetter(final String string) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAccessWithGetter(final String string) { super(); this.string = string; } - private static @java.lang.SuppressWarnings("all") BuilderAccessWithGetter.BuilderAccessWithGetterBuilder builder() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAccessWithGetter.BuilderAccessWithGetterBuilder builder() { return new BuilderAccessWithGetter.BuilderAccessWithGetterBuilder(); } - public @java.lang.SuppressWarnings("all") String getString() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getString() { return this.string; } } diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java index ce6b0fd45b..e36c9be4b4 100644 --- a/test/transform/resource/after-ecj/BuilderComplex.java +++ b/test/transform/resource/after-ecj/BuilderComplex.java @@ -1,46 +1,46 @@ import java.util.List; import lombok.Builder; class BuilderComplex { - public static @java.lang.SuppressWarnings("all") class TestVoidName { - private @java.lang.SuppressWarnings("all") T number; - private @java.lang.SuppressWarnings("all") int arg2; - private @java.lang.SuppressWarnings("all") String arg3; - private @java.lang.SuppressWarnings("all") BuilderComplex selfRef; - @java.lang.SuppressWarnings("all") TestVoidName() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class TestVoidName { + private @java.lang.SuppressWarnings("all") @lombok.Generated T number; + private @java.lang.SuppressWarnings("all") @lombok.Generated int arg2; + private @java.lang.SuppressWarnings("all") @lombok.Generated String arg3; + private @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex selfRef; + @java.lang.SuppressWarnings("all") @lombok.Generated TestVoidName() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName number(final T number) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex.TestVoidName number(final T number) { this.number = number; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName arg2(final int arg2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex.TestVoidName arg2(final int arg2) { this.arg2 = arg2; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName arg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex.TestVoidName arg3(final String arg3) { this.arg3 = arg3; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName selfRef(final BuilderComplex selfRef) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex.TestVoidName selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } - public @java.lang.SuppressWarnings("all") void execute() { + public @java.lang.SuppressWarnings("all") @lombok.Generated void execute() { BuilderComplex.testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderComplex.TestVoidName(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")"); } } @@ -49,7 +49,7 @@ class BuilderComplex { } private static @Builder(buildMethodName = "execute") void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) { } - public static @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex.TestVoidName builder() { return new BuilderComplex.TestVoidName(); } } diff --git a/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java b/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java index 29b6373b94..273a803f53 100644 --- a/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java +++ b/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java @@ -1,10 +1,10 @@ import java.util.List; class BuilderConstructorJavadoc { public static class BuilderConstructorJavadocBuilder { - private @java.lang.SuppressWarnings("all") int basic; - private @java.lang.SuppressWarnings("all") int multiline; - private @java.lang.SuppressWarnings("all") int predef; - private @java.lang.SuppressWarnings("all") int predefWithJavadoc; + private @java.lang.SuppressWarnings("all") @lombok.Generated int basic; + private @java.lang.SuppressWarnings("all") @lombok.Generated int multiline; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predef; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predefWithJavadoc; public BuilderConstructorJavadocBuilder predef(final int x) { this.predef = x; return this; @@ -13,34 +13,34 @@ public BuilderConstructorJavadocBuilder predefWithJavadoc(final int x) { this.predefWithJavadoc = x; return this; } - @java.lang.SuppressWarnings("all") BuilderConstructorJavadocBuilder() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadocBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder basic(final int basic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder basic(final int basic) { this.basic = basic; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder multiline(final int multiline) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder multiline(final int multiline) { this.multiline = multiline; return this; } - public @java.lang.SuppressWarnings("all") BuilderConstructorJavadoc build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc build() { return new BuilderConstructorJavadoc(this.basic, this.multiline, this.predef, this.predefWithJavadoc); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(basic=" + this.basic) + ", multiline=") + this.multiline) + ", predef=") + this.predef) + ", predefWithJavadoc=") + this.predefWithJavadoc) + ")"); } } @lombok.Builder BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc) { super(); } - public static @java.lang.SuppressWarnings("all") BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder builder() { return new BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderDefaults.java b/test/transform/resource/after-ecj/BuilderDefaults.java index 37a00cbfef..2bb467c0b1 100644 --- a/test/transform/resource/after-ecj/BuilderDefaults.java +++ b/test/transform/resource/after-ecj/BuilderDefaults.java @@ -1,19 +1,19 @@ import lombok.Builder; import lombok.Value; public final @Value @Builder class BuilderDefaults { - public static @java.lang.SuppressWarnings("all") class BuilderDefaultsBuilder { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") String name; - private @java.lang.SuppressWarnings("all") long z$value; - private @java.lang.SuppressWarnings("all") boolean z$set; - @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderDefaultsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated String name; + private @java.lang.SuppressWarnings("all") @lombok.Generated long z$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean z$set; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder x(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults.BuilderDefaultsBuilder x(final int x) { this.x$value = x; x$set = true; return this; @@ -21,19 +21,19 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults.BuilderDefaultsBuilder name(final String name) { this.name = name; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder z(final long z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults.BuilderDefaultsBuilder z(final long z) { this.z$value = z; z$set = true; return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaults build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults build() { int x$value = this.x$value; if ((! this.x$set)) x$value = BuilderDefaults.$default$x(); @@ -42,38 +42,38 @@ z$value = BuilderDefaults.$default$z(); return new BuilderDefaults(x$value, this.name, z$value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderDefaults.BuilderDefaultsBuilder(x$value=" + this.x$value) + ", name=") + this.name) + ", z$value=") + this.z$value) + ")"); } } private final @Builder.Default int x; private final String name; private final @Builder.Default long z; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 10; } - private static @java.lang.SuppressWarnings("all") long $default$z() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated long $default$z() { return System.currentTimeMillis(); } - @java.lang.SuppressWarnings("all") BuilderDefaults(final int x, final String name, final long z) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults(final int x, final String name, final long z) { super(); this.x = x; this.name = name; this.z = z; } - public static @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults.BuilderDefaultsBuilder builder() { return new BuilderDefaults.BuilderDefaultsBuilder(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") long getZ() { + public @java.lang.SuppressWarnings("all") @lombok.Generated long getZ() { return this.z; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderDefaults))) @@ -89,7 +89,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -99,7 +99,7 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderDefaults(x=" + this.getX()) + ", name=") + this.getName()) + ", z=") + this.getZ()) + ")"); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderDefaultsArray.java b/test/transform/resource/after-ecj/BuilderDefaultsArray.java index d25e037134..74b74596c1 100644 --- a/test/transform/resource/after-ecj/BuilderDefaultsArray.java +++ b/test/transform/resource/after-ecj/BuilderDefaultsArray.java @@ -1,18 +1,18 @@ import lombok.Builder; import lombok.Value; public @Builder class BuilderDefaultsArray { - public static @java.lang.SuppressWarnings("all") class BuilderDefaultsArrayBuilder { - private @java.lang.SuppressWarnings("all") int[] x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") java.lang.String[][] y$value; - private @java.lang.SuppressWarnings("all") boolean y$set; - @java.lang.SuppressWarnings("all") BuilderDefaultsArrayBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderDefaultsArrayBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int[] x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String[][] y$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean y$set; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArrayBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsArray.BuilderDefaultsArrayBuilder x(final int[] x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArray.BuilderDefaultsArrayBuilder x(final int[] x) { this.x$value = x; x$set = true; return this; @@ -20,12 +20,12 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsArray.BuilderDefaultsArrayBuilder y(final java.lang.String[][] y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArray.BuilderDefaultsArrayBuilder y(final java.lang.String[][] y) { this.y$value = y; y$set = true; return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsArray build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArray build() { int[] x$value = this.x$value; if ((! this.x$set)) x$value = BuilderDefaultsArray.$default$x(); @@ -34,24 +34,24 @@ y$value = BuilderDefaultsArray.$default$y(); return new BuilderDefaultsArray(x$value, y$value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderDefaultsArray.BuilderDefaultsArrayBuilder(x$value=" + java.util.Arrays.toString(this.x$value)) + ", y$value=") + java.util.Arrays.deepToString(this.y$value)) + ")"); } } @Builder.Default int[] x; @Builder.Default java.lang.String[][] y; - private static @java.lang.SuppressWarnings("all") int[] $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int[] $default$x() { return new int[]{1, 2}; } - private static @java.lang.SuppressWarnings("all") java.lang.String[][] $default$y() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String[][] $default$y() { return new java.lang.String[][]{}; } - @java.lang.SuppressWarnings("all") BuilderDefaultsArray(final int[] x, final java.lang.String[][] y) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArray(final int[] x, final java.lang.String[][] y) { super(); this.x = x; this.y = y; } - public static @java.lang.SuppressWarnings("all") BuilderDefaultsArray.BuilderDefaultsArrayBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArray.BuilderDefaultsArrayBuilder builder() { return new BuilderDefaultsArray.BuilderDefaultsArrayBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java b/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java index 4f9a3cfdde..83d5367ee6 100644 --- a/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java +++ b/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java @@ -1,20 +1,20 @@ import lombok.Builder; import java.util.*; public @Builder class BuilderDefaultsGenerics> { - public static @java.lang.SuppressWarnings("all") class BuilderDefaultsGenericsBuilder> { - private @java.lang.SuppressWarnings("all") java.util.concurrent.Callable callable$value; - private @java.lang.SuppressWarnings("all") boolean callable$set; - private @java.lang.SuppressWarnings("all") T tee$value; - private @java.lang.SuppressWarnings("all") boolean tee$set; - private @java.lang.SuppressWarnings("all") R arrr$value; - private @java.lang.SuppressWarnings("all") boolean arrr$set; - @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderDefaultsGenericsBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.Callable callable$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean callable$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated T tee$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean tee$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated R arrr$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean arrr$set; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenericsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder callable(final java.util.concurrent.Callable callable) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder callable(final java.util.concurrent.Callable callable) { this.callable$value = callable; callable$set = true; return this; @@ -22,7 +22,7 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder tee(final T tee) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder tee(final T tee) { this.tee$value = tee; tee$set = true; return this; @@ -30,12 +30,12 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder arrr(final R arrr) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder arrr(final R arrr) { this.arrr$value = arrr; arrr$set = true; return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenerics build() { java.util.concurrent.Callable callable$value = this.callable$value; if ((! this.callable$set)) callable$value = BuilderDefaultsGenerics.$default$callable(); @@ -47,29 +47,29 @@ arrr$value = BuilderDefaultsGenerics.$default$arrr(); return new BuilderDefaultsGenerics(callable$value, tee$value, arrr$value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(callable$value=" + this.callable$value) + ", tee$value=") + this.tee$value) + ", arrr$value=") + this.arrr$value) + ")"); } } private @Builder.Default java.util.concurrent.Callable callable; private @Builder.Default T tee; private @Builder.Default R arrr; - private static @java.lang.SuppressWarnings("all") >java.util.concurrent.Callable $default$callable() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated >java.util.concurrent.Callable $default$callable() { return null; } - private static @java.lang.SuppressWarnings("all") >T $default$tee() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated >T $default$tee() { return null; } - private static @java.lang.SuppressWarnings("all") >R $default$arrr() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated >R $default$arrr() { return null; } - @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics(final java.util.concurrent.Callable callable, final T tee, final R arrr) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenerics(final java.util.concurrent.Callable callable, final T tee, final R arrr) { super(); this.callable = callable; this.tee = tee; this.arrr = arrr; } - public static @java.lang.SuppressWarnings("all") >BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated >BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder builder() { return new BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderDefaultsTargetTyping.java b/test/transform/resource/after-ecj/BuilderDefaultsTargetTyping.java index 4b9235d6f2..d41aecbe82 100644 --- a/test/transform/resource/after-ecj/BuilderDefaultsTargetTyping.java +++ b/test/transform/resource/after-ecj/BuilderDefaultsTargetTyping.java @@ -1,27 +1,27 @@ import java.util.Arrays; import lombok.Builder; public @Builder class BuilderDefaultsTargetTyping { - public static @java.lang.SuppressWarnings("all") class BuilderDefaultsTargetTypingBuilder { - private @java.lang.SuppressWarnings("all") String foo$value; - private @java.lang.SuppressWarnings("all") boolean foo$set; - @java.lang.SuppressWarnings("all") BuilderDefaultsTargetTypingBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderDefaultsTargetTypingBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String foo$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean foo$set; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsTargetTypingBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder foo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder foo(final String foo) { this.foo$value = foo; foo$set = true; return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsTargetTyping build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsTargetTyping build() { String foo$value = this.foo$value; if ((! this.foo$set)) foo$value = BuilderDefaultsTargetTyping.$default$foo(); return new BuilderDefaultsTargetTyping(foo$value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder(foo$value=" + this.foo$value) + ")"); } } @@ -29,14 +29,14 @@ static String doSth(java.util.List i, java.util.List c) { return null; } - private static @java.lang.SuppressWarnings("all") String $default$foo() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - @java.lang.SuppressWarnings("all") BuilderDefaultsTargetTyping(final String foo) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsTargetTyping(final String foo) { super(); this.foo = foo; } - public static @java.lang.SuppressWarnings("all") BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder builder() { return new BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java b/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java index 16caf39eab..1d9474572a 100644 --- a/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java +++ b/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java @@ -1,34 +1,34 @@ import lombok.Builder; import lombok.Singular; public @Builder class BuilderDefaultsWarnings { - public static @java.lang.SuppressWarnings("all") class BuilderDefaultsWarningsBuilder { - private @java.lang.SuppressWarnings("all") long x; - private @java.lang.SuppressWarnings("all") int z; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; - @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderDefaultsWarningsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated long x; + private @java.lang.SuppressWarnings("all") @lombok.Generated int z; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarningsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) { this.x = x; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) { this.z = z; return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -38,12 +38,12 @@ this.items.addAll(items); return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() { if ((this.items != null)) this.items.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings build() { java.util.List items; switch (((this.items == null) ? 0 : this.items.size())) { case 0 : @@ -57,7 +57,7 @@ } return new BuilderDefaultsWarnings(this.x, this.z, items); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(x=" + this.x) + ", z=") + this.z) + ", items=") + this.items) + ")"); } } @@ -65,25 +65,25 @@ final int y = 5; @Builder.Default int z; @Builder.Default @Singular java.util.List items; - @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings(final long x, final int z, final java.util.List items) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings(final long x, final int z, final java.util.List items) { super(); this.x = x; this.z = z; this.items = items; } - public static @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() { return new BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(); } } class NoBuilderButHasDefaults { - public static @java.lang.SuppressWarnings("all") class NoBuilderButHasDefaultsBuilder { - @java.lang.SuppressWarnings("all") NoBuilderButHasDefaultsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class NoBuilderButHasDefaultsBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated NoBuilderButHasDefaultsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") NoBuilderButHasDefaults build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoBuilderButHasDefaults build() { return new NoBuilderButHasDefaults(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder()"; } } @@ -91,7 +91,7 @@ class NoBuilderButHasDefaults { public @Builder NoBuilderButHasDefaults() { super(); } - public static @java.lang.SuppressWarnings("all") NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() { return new NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderGenericMethod.java b/test/transform/resource/after-ecj/BuilderGenericMethod.java index be35cf9e65..20d5d5bb61 100644 --- a/test/transform/resource/after-ecj/BuilderGenericMethod.java +++ b/test/transform/resource/after-ecj/BuilderGenericMethod.java @@ -2,30 +2,30 @@ import lombok.Builder; import java.util.*; class BuilderGenericMethod { - public @java.lang.SuppressWarnings("all") class MapBuilder { - private @java.lang.SuppressWarnings("all") int a; - private @java.lang.SuppressWarnings("all") long b; - @java.lang.SuppressWarnings("all") MapBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated class MapBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int a; + private @java.lang.SuppressWarnings("all") @lombok.Generated long b; + @java.lang.SuppressWarnings("all") @lombok.Generated MapBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderGenericMethod.MapBuilder a(final int a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderGenericMethod.MapBuilder a(final int a) { this.a = a; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderGenericMethod.MapBuilder b(final long b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderGenericMethod.MapBuilder b(final long b) { this.b = b; return this; } - public @java.lang.SuppressWarnings("all") Map build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Map build() { return BuilderGenericMethod.this.foo(this.a, this.b); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderGenericMethod.MapBuilder(a=" + this.a) + ", b=") + this.b) + ")"); } } @@ -35,7 +35,7 @@ class BuilderGenericMethod { public @Builder Map foo(int a, long b) { return null; } - public @java.lang.SuppressWarnings("all") BuilderGenericMethod.MapBuilder builder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderGenericMethod.MapBuilder builder() { return this.new MapBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderInstanceMethod.java b/test/transform/resource/after-ecj/BuilderInstanceMethod.java index 33502ca91b..d9eae54bdf 100644 --- a/test/transform/resource/after-ecj/BuilderInstanceMethod.java +++ b/test/transform/resource/after-ecj/BuilderInstanceMethod.java @@ -1,45 +1,45 @@ import java.util.List; class BuilderInstanceMethod { - public @java.lang.SuppressWarnings("all") class StringBuilder { - private @java.lang.SuppressWarnings("all") int show; - private @java.lang.SuppressWarnings("all") int yes; - private @java.lang.SuppressWarnings("all") List also; - private @java.lang.SuppressWarnings("all") int $andMe; - @java.lang.SuppressWarnings("all") StringBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated class StringBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int show; + private @java.lang.SuppressWarnings("all") @lombok.Generated int yes; + private @java.lang.SuppressWarnings("all") @lombok.Generated List also; + private @java.lang.SuppressWarnings("all") @lombok.Generated int $andMe; + @java.lang.SuppressWarnings("all") @lombok.Generated StringBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderInstanceMethod.StringBuilder show(final int show) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderInstanceMethod.StringBuilder show(final int show) { this.show = show; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderInstanceMethod.StringBuilder yes(final int yes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderInstanceMethod.StringBuilder yes(final int yes) { this.yes = yes; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderInstanceMethod.StringBuilder also(final List also) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderInstanceMethod.StringBuilder also(final List also) { this.also = also; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderInstanceMethod.StringBuilder $andMe(final int $andMe) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderInstanceMethod.StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } - public @java.lang.SuppressWarnings("all") String build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String build() { return BuilderInstanceMethod.this.create(this.show, this.yes, this.also, this.$andMe); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderInstanceMethod.StringBuilder(show=" + this.show) + ", yes=") + this.yes) + ", also=") + this.also) + ", $andMe=") + this.$andMe) + ")"); } } @@ -49,7 +49,7 @@ class BuilderInstanceMethod { public @lombok.Builder String create(int show, final int yes, List also, int $andMe) { return (((("" + show) + yes) + also) + $andMe); } - public @java.lang.SuppressWarnings("all") BuilderInstanceMethod.StringBuilder builder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderInstanceMethod.StringBuilder builder() { return this.new StringBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderJavadoc.java b/test/transform/resource/after-ecj/BuilderJavadoc.java index f5790ee7ad..718b1c457c 100644 --- a/test/transform/resource/after-ecj/BuilderJavadoc.java +++ b/test/transform/resource/after-ecj/BuilderJavadoc.java @@ -1,10 +1,10 @@ import java.util.List; @lombok.Builder class BuilderJavadoc { public static class BuilderJavadocBuilder { - private @java.lang.SuppressWarnings("all") int basic; - private @java.lang.SuppressWarnings("all") int getsetwith; - private @java.lang.SuppressWarnings("all") int predef; - private @java.lang.SuppressWarnings("all") int predefWithJavadoc; + private @java.lang.SuppressWarnings("all") @lombok.Generated int basic; + private @java.lang.SuppressWarnings("all") @lombok.Generated int getsetwith; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predef; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predefWithJavadoc; public BuilderJavadocBuilder predef(final int x) { this.predef = (x * 10); return this; @@ -13,7 +13,7 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { this.predefWithJavadoc = (x * 100); return this; } - @java.lang.SuppressWarnings("all") BuilderJavadocBuilder() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadocBuilder() { super(); } /** @@ -22,7 +22,7 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { * @param tag is moved to the setter. * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderJavadoc.BuilderJavadocBuilder basic(final int basic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc.BuilderJavadocBuilder basic(final int basic) { this.basic = basic; return this; } @@ -31,14 +31,14 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { * @param tag is moved to the setters and wither. * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderJavadoc.BuilderJavadocBuilder getsetwith(final int getsetwith) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc.BuilderJavadocBuilder getsetwith(final int getsetwith) { this.getsetwith = getsetwith; return this; } - public @java.lang.SuppressWarnings("all") BuilderJavadoc build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc build() { return new BuilderJavadoc(this.basic, this.getsetwith, this.predef, this.predefWithJavadoc); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderJavadoc.BuilderJavadocBuilder(basic=" + this.basic) + ", getsetwith=") + this.getsetwith) + ", predef=") + this.predef) + ", predefWithJavadoc=") + this.predefWithJavadoc) + ")"); } } @@ -46,28 +46,28 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { private @lombok.Getter @lombok.Setter @lombok.experimental.Wither int getsetwith; private final int predef; private final int predefWithJavadoc; - @java.lang.SuppressWarnings("all") BuilderJavadoc(final int basic, final int getsetwith, final int predef, final int predefWithJavadoc) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc(final int basic, final int getsetwith, final int predef, final int predefWithJavadoc) { super(); this.basic = basic; this.getsetwith = getsetwith; this.predef = predef; this.predefWithJavadoc = predefWithJavadoc; } - public static @java.lang.SuppressWarnings("all") BuilderJavadoc.BuilderJavadocBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc.BuilderJavadocBuilder builder() { return new BuilderJavadoc.BuilderJavadocBuilder(); } /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @return tag is moved to the getter. */ - public @java.lang.SuppressWarnings("all") int getGetsetwith() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getGetsetwith() { return this.getsetwith; } /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @param tag is moved to the setters and wither. */ - public @java.lang.SuppressWarnings("all") void setGetsetwith(final int getsetwith) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setGetsetwith(final int getsetwith) { this.getsetwith = getsetwith; } /** @@ -75,7 +75,7 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { * @param tag is moved to the setters and wither. * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") BuilderJavadoc withGetsetwith(final int getsetwith) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc withGetsetwith(final int getsetwith) { return ((this.getsetwith == getsetwith) ? this : new BuilderJavadoc(this.basic, getsetwith, this.predef, this.predefWithJavadoc)); } } diff --git a/test/transform/resource/after-ecj/BuilderNestedInEnum.java b/test/transform/resource/after-ecj/BuilderNestedInEnum.java index b3fb54f319..da72cdaac3 100644 --- a/test/transform/resource/after-ecj/BuilderNestedInEnum.java +++ b/test/transform/resource/after-ecj/BuilderNestedInEnum.java @@ -1,37 +1,37 @@ class BuilderNestedInEnum { public enum TestEnum { public static final @lombok.Builder @lombok.Value class TestBuilder { - public static @java.lang.SuppressWarnings("all") class TestBuilderBuilder { - private @java.lang.SuppressWarnings("all") String field; - @java.lang.SuppressWarnings("all") TestBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class TestBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String field; + @java.lang.SuppressWarnings("all") @lombok.Generated TestBuilderBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) { this.field = field; return this; } - public @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedInEnum.TestEnum.TestBuilder build() { return new BuilderNestedInEnum.TestEnum.TestBuilder(this.field); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(field=" + this.field) + ")"); } } private final String field; - @java.lang.SuppressWarnings("all") TestBuilder(final String field) { + @java.lang.SuppressWarnings("all") @lombok.Generated TestBuilder(final String field) { super(); this.field = field; } - public static @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() { return new BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(); } - public @java.lang.SuppressWarnings("all") String getField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getField() { return this.field; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderNestedInEnum.TestEnum.TestBuilder))) @@ -43,14 +43,14 @@ public enum TestEnum { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $field = this.getField(); result = ((result * PRIME) + (($field == null) ? 43 : $field.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderNestedInEnum.TestEnum.TestBuilder(field=" + this.getField()) + ")"); } } @@ -65,4 +65,4 @@ public TestEnum() { BuilderNestedInEnum() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderOnNestedClass.java b/test/transform/resource/after-ecj/BuilderOnNestedClass.java index b100223ba1..c9cfa4740d 100644 --- a/test/transform/resource/after-ecj/BuilderOnNestedClass.java +++ b/test/transform/resource/after-ecj/BuilderOnNestedClass.java @@ -1,30 +1,30 @@ public class BuilderOnNestedClass { public static @lombok.Builder class Nested { - public static @java.lang.SuppressWarnings("all") class NestedBuilder { - private @java.lang.SuppressWarnings("all") String a; - @java.lang.SuppressWarnings("all") NestedBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class NestedBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String a; + @java.lang.SuppressWarnings("all") @lombok.Generated NestedBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderOnNestedClass.Nested.NestedBuilder a(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedClass.Nested.NestedBuilder a(final String a) { this.a = a; return this; } - public @java.lang.SuppressWarnings("all") BuilderOnNestedClass.Nested build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedClass.Nested build() { return new BuilderOnNestedClass.Nested(this.a); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderOnNestedClass.Nested.NestedBuilder(a=" + this.a) + ")"); } } private String a; - @java.lang.SuppressWarnings("all") Nested(final String a) { + @java.lang.SuppressWarnings("all") @lombok.Generated Nested(final String a) { super(); this.a = a; } - public static @java.lang.SuppressWarnings("all") BuilderOnNestedClass.Nested.NestedBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedClass.Nested.NestedBuilder builder() { return new BuilderOnNestedClass.Nested.NestedBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderOnNestedRecord.java b/test/transform/resource/after-ecj/BuilderOnNestedRecord.java index 4e025485f9..61737b17a5 100644 --- a/test/transform/resource/after-ecj/BuilderOnNestedRecord.java +++ b/test/transform/resource/after-ecj/BuilderOnNestedRecord.java @@ -1,30 +1,28 @@ public record BuilderOnNestedRecord(T t) { public @lombok.Builder record Nested(String a) { - public static @java.lang.SuppressWarnings("all") class NestedBuilder { - private @java.lang.SuppressWarnings("all") String a; - @java.lang.SuppressWarnings("all") NestedBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class NestedBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String a; + @java.lang.SuppressWarnings("all") @lombok.Generated NestedBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderOnNestedRecord.Nested.NestedBuilder a(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedRecord.Nested.NestedBuilder a(final String a) { this.a = a; return this; } - public @java.lang.SuppressWarnings("all") BuilderOnNestedRecord.Nested build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedRecord.Nested build() { return new BuilderOnNestedRecord.Nested(this.a); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderOnNestedRecord.Nested.NestedBuilder(a=" + this.a) + ")"); } } /* Implicit */ private final String a; - - public static @java.lang.SuppressWarnings("all") BuilderOnNestedRecord.Nested.NestedBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedRecord.Nested.NestedBuilder builder() { return new BuilderOnNestedRecord.Nested.NestedBuilder(); } } /* Implicit */ private final T t; - } diff --git a/test/transform/resource/after-ecj/BuilderSimple.java b/test/transform/resource/after-ecj/BuilderSimple.java index a991545ef1..22b727c1ec 100644 --- a/test/transform/resource/after-ecj/BuilderSimple.java +++ b/test/transform/resource/after-ecj/BuilderSimple.java @@ -1,29 +1,29 @@ import java.util.List; @lombok.Builder(access = lombok.AccessLevel.PROTECTED) class BuilderSimple { - protected static @java.lang.SuppressWarnings("all") class BuilderSimpleBuilder { - private @java.lang.SuppressWarnings("all") int yes; - private @java.lang.SuppressWarnings("all") List also; - @java.lang.SuppressWarnings("all") BuilderSimpleBuilder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSimpleBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int yes; + private @java.lang.SuppressWarnings("all") @lombok.Generated List also; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderSimple.BuilderSimpleBuilder yes(final int yes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimple.BuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderSimple.BuilderSimpleBuilder also(final List also) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimple.BuilderSimpleBuilder also(final List also) { this.also = also; return this; } - public @java.lang.SuppressWarnings("all") BuilderSimple build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimple build() { return new BuilderSimple(this.yes, this.also); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes) + ", also=") + this.also) + ")"); } } @@ -31,12 +31,12 @@ private final int yes; private List also; private int $butNotMe; - @java.lang.SuppressWarnings("all") BuilderSimple(final int yes, final List also) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimple(final int yes, final List also) { super(); this.yes = yes; this.also = also; } - protected static @java.lang.SuppressWarnings("all") BuilderSimple.BuilderSimpleBuilder builder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimple.BuilderSimpleBuilder builder() { return new BuilderSimple.BuilderSimpleBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java b/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java index 860b436304..fac87407eb 100644 --- a/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java +++ b/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java @@ -1,36 +1,36 @@ // version 14: import java.util.List; public @lombok.Builder(access = lombok.AccessLevel.PROTECTED) record BuilderSimpleOnRecord(List l, String a) { - protected static @java.lang.SuppressWarnings("all") class BuilderSimpleOnRecordBuilder { - private @java.lang.SuppressWarnings("all") List l; - private @java.lang.SuppressWarnings("all") String a; - @java.lang.SuppressWarnings("all") BuilderSimpleOnRecordBuilder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSimpleOnRecordBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated List l; + private @java.lang.SuppressWarnings("all") @lombok.Generated String a; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleOnRecordBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder l(final List l) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder l(final List l) { this.l = l; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder a(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder a(final String a) { this.a = a; return this; } - public @java.lang.SuppressWarnings("all") BuilderSimpleOnRecord build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleOnRecord build() { return new BuilderSimpleOnRecord(this.l, this.a); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder(l=" + this.l) + ", a=") + this.a) + ")"); } } /* Implicit */ private final List l; /* Implicit */ private final String a; - protected static @java.lang.SuppressWarnings("all") BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder builder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder builder() { return new BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java index 51077a91c7..7b251243c8 100644 --- a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java @@ -1,30 +1,30 @@ import java.util.List; @lombok.Builder(access = lombok.AccessLevel.PROTECTED,setterPrefix = "with") class BuilderSimpleWithSetterPrefix { - protected static @java.lang.SuppressWarnings("all") class BuilderSimpleWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") int unprefixed; - @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSimpleWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int unprefixed; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleWithSetterPrefixBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder withUnprefixed(final int unprefixed) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder withUnprefixed(final int unprefixed) { this.unprefixed = unprefixed; return this; } - public @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleWithSetterPrefix build() { return new BuilderSimpleWithSetterPrefix(this.unprefixed); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(unprefixed=" + this.unprefixed) + ")"); } } private int unprefixed; - @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix(final int unprefixed) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleWithSetterPrefix(final int unprefixed) { super(); this.unprefixed = unprefixed; } - protected static @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder builder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder builder() { return new BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypes.java b/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypes.java index 977d081b47..9dcd5769aa 100644 --- a/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypes.java @@ -7,14 +7,14 @@ @Target(ElementType.TYPE_USE) @interface MyAnnotation { } @lombok.Builder class BuilderSingularAnnotatedTypes { - public static @java.lang.SuppressWarnings("all") class BuilderSingularAnnotatedTypesBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> foos; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; - @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularAnnotatedTypesBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> foos; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(final @MyAnnotation @NonNull String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(final @MyAnnotation @NonNull String foo) { if ((foo == null)) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -24,7 +24,7 @@ this.foos.add(foo); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection foos) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection foos) { if ((foos == null)) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -34,12 +34,12 @@ this.foos.addAll(foos); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearFoos() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearFoos() { if ((this.foos != null)) this.foos.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { if ((barKey == null)) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); @@ -57,7 +57,7 @@ this.bars$value.add(barValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map bars) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map bars) { if ((bars == null)) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -74,7 +74,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearBars() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearBars() { if ((this.bars$key != null)) { this.bars$key.clear(); @@ -82,7 +82,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes build() { java.util.Set<@MyAnnotation @NonNull String> foos; switch (((this.foos == null) ? 0 : this.foos.size())) { case 0 : @@ -112,18 +112,18 @@ } return new BuilderSingularAnnotatedTypes(foos, bars); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(foos=" + this.foos) + ", bars$key=") + this.bars$key) + ", bars$value=") + this.bars$value) + ")"); } } private @Singular Set<@MyAnnotation @NonNull String> foos; private @Singular Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; - @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { super(); this.foos = foos; this.bars = bars; } - public static @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder builder() { return new BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java index 96f346d451..92916c2073 100644 --- a/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java @@ -7,14 +7,14 @@ @Target(ElementType.TYPE_USE) @interface MyAnnotation { } @lombok.Builder(setterPrefix = "with") class BuilderSingularAnnotatedTypesWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularAnnotatedTypesWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> foos; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; - @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularAnnotatedTypesWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> foos; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(final @MyAnnotation @NonNull String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(final @MyAnnotation @NonNull String foo) { if ((foo == null)) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -24,7 +24,7 @@ this.foos.add(foo); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection foos) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection foos) { if ((foos == null)) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -34,12 +34,12 @@ this.foos.addAll(foos); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() { if ((this.foos != null)) this.foos.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { if ((barKey == null)) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); @@ -57,7 +57,7 @@ this.bars$value.add(barValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map bars) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map bars) { if ((bars == null)) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -74,7 +74,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() { if ((this.bars$key != null)) { this.bars$key.clear(); @@ -82,7 +82,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix build() { java.util.Set<@MyAnnotation @NonNull String> foos; switch (((this.foos == null) ? 0 : this.foos.size())) { case 0 : @@ -112,18 +112,18 @@ } return new BuilderSingularAnnotatedTypesWithSetterPrefix(foos, bars); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(foos=" + this.foos) + ", bars$key=") + this.bars$key) + ", bars$value=") + this.bars$value) + ")"); } } private @Singular Set<@MyAnnotation @NonNull String> foos; private @Singular Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; - @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { super(); this.foos = foos; this.bars = bars; } - public static @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() { return new BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java index ce15928889..f6eb7435b7 100644 --- a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java @@ -5,22 +5,22 @@ import com.google.common.collect.ImmutableTable; import lombok.Singular; @lombok.Builder class BuilderSingularGuavaListsSets { - public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaListsSetsBuilder { - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder cards; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder frogs; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder rawSet; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedSet.Builder passes; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableTable.Builder users; - @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularGuavaListsSetsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder cards; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder frogs; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSet.Builder rawSet; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSortedSet.Builder passes; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableTable.Builder users; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSetsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder card(final T card) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder card(final T card) { if ((this.cards == null)) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { if ((cards == null)) { throw new java.lang.NullPointerException("cards cannot be null"); @@ -30,17 +30,17 @@ this.cards.addAll(cards); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearCards() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearCards() { this.cards = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { if ((this.frogs == null)) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { if ((frogs == null)) { throw new java.lang.NullPointerException("frogs cannot be null"); @@ -50,17 +50,17 @@ this.frogs.addAll(frogs); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearFrogs() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearFrogs() { this.frogs = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { if ((rawSet == null)) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -70,17 +70,17 @@ this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearRawSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearRawSet() { this.rawSet = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder pass(final String pass) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder pass(final String pass) { if ((this.passes == null)) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { if ((passes == null)) { throw new java.lang.NullPointerException("passes cannot be null"); @@ -90,17 +90,17 @@ this.passes.addAll(passes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearPasses() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearPasses() { this.passes = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder user(final Number rowKey, final Number columnKey, final String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder users(final com.google.common.collect.Table users) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder users(final com.google.common.collect.Table users) { if ((users == null)) { throw new java.lang.NullPointerException("users cannot be null"); @@ -110,11 +110,11 @@ this.users.putAll(users); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearUsers() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearUsers() { this.users = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated 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()); com.google.common.collect.ImmutableSet rawSet = ((this.rawSet == null) ? com.google.common.collect.ImmutableSet.of() : this.rawSet.build()); @@ -122,7 +122,7 @@ com.google.common.collect.ImmutableTable users = ((this.users == null) ? com.google.common.collect.ImmutableTable.of() : this.users.build()); return new BuilderSingularGuavaListsSets(cards, frogs, rawSet, passes, users); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((("BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ", users=") + this.users) + ")"); } } @@ -131,7 +131,7 @@ private @SuppressWarnings("all") @Singular("rawSet") ImmutableSet rawSet; private @Singular ImmutableSortedSet passes; private @Singular ImmutableTable users; - @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { super(); this.cards = cards; this.frogs = frogs; @@ -139,7 +139,7 @@ this.passes = passes; this.users = users; } - public static @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder builder() { return new BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java index 76e6653b46..c05c33a0fd 100644 --- a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java @@ -3,20 +3,20 @@ import com.google.common.collect.ImmutableSortedMap; import lombok.Singular; @lombok.Builder class BuilderSingularGuavaMaps { - public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaMapsBuilder { - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableMap.Builder battleaxes; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedMap.Builder vertices; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableBiMap.Builder rawMap; - @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularGuavaMapsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableMap.Builder battleaxes; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSortedMap.Builder vertices; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableBiMap.Builder rawMap; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMapsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxe(final K key, final V value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { if ((battleaxes == null)) { throw new java.lang.NullPointerException("battleaxes cannot be null"); @@ -26,17 +26,17 @@ this.battleaxes.putAll(battleaxes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearBattleaxes() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearBattleaxes() { this.battleaxes = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertex(final Integer key, final V value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { if ((vertices == null)) { throw new java.lang.NullPointerException("vertices cannot be null"); @@ -46,17 +46,17 @@ this.vertices.putAll(vertices); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearVertices() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearVertices() { this.vertices = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(final java.lang.Object key, final java.lang.Object value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { if ((rawMap == null)) { throw new java.lang.NullPointerException("rawMap cannot be null"); @@ -66,30 +66,30 @@ this.rawMap.putAll(rawMap); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearRawMap() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearRawMap() { this.rawMap = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated 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()); com.google.common.collect.ImmutableBiMap rawMap = ((this.rawMap == null) ? com.google.common.collect.ImmutableBiMap.of() : this.rawMap.build()); return new BuilderSingularGuavaMaps(battleaxes, vertices, rawMap); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")"); } } private @Singular ImmutableMap battleaxes; private @Singular ImmutableSortedMap vertices; private @SuppressWarnings("all") @Singular("rawMap") ImmutableBiMap rawMap; - @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { super(); this.battleaxes = battleaxes; this.vertices = vertices; this.rawMap = rawMap; } - public static @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder builder() { return new BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularLists.java b/test/transform/resource/after-ecj/BuilderSingularLists.java index 712b5e863d..4f19c7da4e 100644 --- a/test/transform/resource/after-ecj/BuilderSingularLists.java +++ b/test/transform/resource/after-ecj/BuilderSingularLists.java @@ -1,22 +1,21 @@ import java.util.List; import java.util.Collection; - import lombok.Singular; @lombok.Builder class BuilderSingularLists { - public static @java.lang.SuppressWarnings("all") class BuilderSingularListsBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList children; - private @java.lang.SuppressWarnings("all") java.util.ArrayList scarves; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawList; - @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularListsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList children; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList scarves; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawList; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularListsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder child(final T child) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder child(final T child) { if ((this.children == null)) this.children = new java.util.ArrayList(); this.children.add(child); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder children(final java.util.Collection children) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder children(final java.util.Collection children) { if ((children == null)) { throw new java.lang.NullPointerException("children cannot be null"); @@ -26,18 +25,18 @@ this.children.addAll(children); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder clearChildren() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder clearChildren() { if ((this.children != null)) this.children.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder scarf(final Number scarf) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder scarf(final Number scarf) { if ((this.scarves == null)) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { if ((scarves == null)) { throw new java.lang.NullPointerException("scarves cannot be null"); @@ -47,18 +46,18 @@ this.scarves.addAll(scarves); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder clearScarves() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder clearScarves() { if ((this.scarves != null)) this.scarves.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { if ((this.rawList == null)) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { if ((rawList == null)) { throw new java.lang.NullPointerException("rawList cannot be null"); @@ -68,12 +67,12 @@ this.rawList.addAll(rawList); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder clearRawList() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder clearRawList() { if ((this.rawList != null)) this.rawList.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists build() { java.util.List children; switch (((this.children == null) ? 0 : this.children.size())) { case 0 : @@ -109,20 +108,20 @@ } return new BuilderSingularLists(children, scarves, rawList); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")"); } } private @Singular List children; private @Singular Collection scarves; private @SuppressWarnings("all") @Singular("rawList") List rawList; - @java.lang.SuppressWarnings("all") BuilderSingularLists(final List children, final Collection scarves, final List rawList) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists(final List children, final Collection scarves, final List rawList) { super(); this.children = children; this.scarves = scarves; this.rawList = rawList; } - public static @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder builder() { return new BuilderSingularLists.BuilderSingularListsBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularMaps.java b/test/transform/resource/after-ecj/BuilderSingularMaps.java index 072cf5e7f6..a1d682f8f1 100644 --- a/test/transform/resource/after-ecj/BuilderSingularMaps.java +++ b/test/transform/resource/after-ecj/BuilderSingularMaps.java @@ -2,19 +2,19 @@ import java.util.SortedMap; import lombok.Singular; @lombok.Builder class BuilderSingularMaps { - public static @java.lang.SuppressWarnings("all") class BuilderSingularMapsBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList women$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList women$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList men$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList men$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawMap$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawMap$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringMap$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringMap$value; - @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularMapsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList women$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList women$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList men$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList men$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawMap$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawMap$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringMap$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringMap$value; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder woman(final K womanKey, final V womanValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder woman(final K womanKey, final V womanValue) { if ((this.women$key == null)) { this.women$key = new java.util.ArrayList(); @@ -24,7 +24,7 @@ this.women$value.add(womanValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder women(final java.util.Map women) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder women(final java.util.Map women) { if ((women == null)) { throw new java.lang.NullPointerException("women cannot be null"); @@ -41,7 +41,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder clearWomen() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder clearWomen() { if ((this.women$key != null)) { this.women$key.clear(); @@ -49,7 +49,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder man(final K manKey, final Number manValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder man(final K manKey, final Number manValue) { if ((this.men$key == null)) { this.men$key = new java.util.ArrayList(); @@ -59,7 +59,7 @@ this.men$value.add(manValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder men(final java.util.Map men) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder men(final java.util.Map men) { if ((men == null)) { throw new java.lang.NullPointerException("men cannot be null"); @@ -76,7 +76,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder clearMen() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder clearMen() { if ((this.men$key != null)) { this.men$key.clear(); @@ -84,7 +84,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { if ((this.rawMap$key == null)) { this.rawMap$key = new java.util.ArrayList(); @@ -94,7 +94,7 @@ this.rawMap$value.add(rawMapValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder rawMap(final java.util.Map rawMap) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder rawMap(final java.util.Map rawMap) { if ((rawMap == null)) { throw new java.lang.NullPointerException("rawMap cannot be null"); @@ -111,7 +111,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder clearRawMap() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder clearRawMap() { if ((this.rawMap$key != null)) { this.rawMap$key.clear(); @@ -119,7 +119,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder stringMap(final String stringMapKey, final V stringMapValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder stringMap(final String stringMapKey, final V stringMapValue) { if ((this.stringMap$key == null)) { this.stringMap$key = new java.util.ArrayList(); @@ -129,7 +129,7 @@ this.stringMap$value.add(stringMapValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder stringMap(final java.util.Map stringMap) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder stringMap(final java.util.Map stringMap) { if ((stringMap == null)) { throw new java.lang.NullPointerException("stringMap cannot be null"); @@ -146,7 +146,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder clearStringMap() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder clearStringMap() { if ((this.stringMap$key != null)) { this.stringMap$key.clear(); @@ -154,7 +154,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps build() { java.util.Map women; switch (((this.women$key == null) ? 0 : this.women$key.size())) { case 0 : @@ -204,7 +204,7 @@ } return new BuilderSingularMaps(women, men, rawMap, stringMap); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((((((((("BuilderSingularMaps.BuilderSingularMapsBuilder(women$key=" + this.women$key) + ", women$value=") + this.women$value) + ", men$key=") + this.men$key) + ", men$value=") + this.men$value) + ", rawMap$key=") + this.rawMap$key) + ", rawMap$value=") + this.rawMap$value) + ", stringMap$key=") + this.stringMap$key) + ", stringMap$value=") + this.stringMap$value) + ")"); } } @@ -212,14 +212,14 @@ private @Singular SortedMap men; private @SuppressWarnings("all") @Singular("rawMap") Map rawMap; private @Singular("stringMap") Map stringMap; - @java.lang.SuppressWarnings("all") BuilderSingularMaps(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { super(); this.women = women; this.men = men; this.rawMap = rawMap; this.stringMap = stringMap; } - public static @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder builder() { return new BuilderSingularMaps.BuilderSingularMapsBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java index dfa495bf5f..dae0512b5a 100644 --- a/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java @@ -2,19 +2,19 @@ import java.util.SortedMap; import lombok.Singular; @lombok.Builder(setterPrefix = "with") class BuilderSingularMapsWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularMapsWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList women$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList women$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList men$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList men$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawMap$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawMap$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringMap$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringMap$value; - @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularMapsWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList women$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList women$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList men$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList men$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawMap$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawMap$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringMap$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringMap$value; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withWoman(final K womanKey, final V womanValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withWoman(final K womanKey, final V womanValue) { if ((this.women$key == null)) { this.women$key = new java.util.ArrayList(); @@ -24,7 +24,7 @@ this.women$value.add(womanValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withWomen(final java.util.Map women) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withWomen(final java.util.Map women) { if ((women == null)) { throw new java.lang.NullPointerException("women cannot be null"); @@ -41,7 +41,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearWomen() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearWomen() { if ((this.women$key != null)) { this.women$key.clear(); @@ -49,7 +49,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withMan(final K manKey, final Number manValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withMan(final K manKey, final Number manValue) { if ((this.men$key == null)) { this.men$key = new java.util.ArrayList(); @@ -59,7 +59,7 @@ this.men$value.add(manValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withMen(final java.util.Map men) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withMen(final java.util.Map men) { if ((men == null)) { throw new java.lang.NullPointerException("men cannot be null"); @@ -76,7 +76,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearMen() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearMen() { if ((this.men$key != null)) { this.men$key.clear(); @@ -84,7 +84,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withRawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withRawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { if ((this.rawMap$key == null)) { this.rawMap$key = new java.util.ArrayList(); @@ -94,7 +94,7 @@ this.rawMap$value.add(rawMapValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withRawMap(final java.util.Map rawMap) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withRawMap(final java.util.Map rawMap) { if ((rawMap != null)) { if ((this.rawMap$key == null)) @@ -110,7 +110,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearRawMap() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearRawMap() { if ((this.rawMap$key != null)) { this.rawMap$key.clear(); @@ -118,7 +118,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withStringMap(final String stringMapKey, final V stringMapValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withStringMap(final String stringMapKey, final V stringMapValue) { if ((this.stringMap$key == null)) { this.stringMap$key = new java.util.ArrayList(); @@ -128,7 +128,7 @@ this.stringMap$value.add(stringMapValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withStringMap(final java.util.Map stringMap) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withStringMap(final java.util.Map stringMap) { if ((stringMap == null)) { throw new java.lang.NullPointerException("stringMap cannot be null"); @@ -145,7 +145,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearStringMap() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearStringMap() { if ((this.stringMap$key != null)) { this.stringMap$key.clear(); @@ -153,7 +153,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix build() { java.util.Map women; switch (((this.women$key == null) ? 0 : this.women$key.size())) { case 0 : @@ -203,7 +203,7 @@ } return new BuilderSingularMapsWithSetterPrefix(women, men, rawMap, stringMap); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((((((((("BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder(women$key=" + this.women$key) + ", women$value=") + this.women$value) + ", men$key=") + this.men$key) + ", men$value=") + this.men$value) + ", rawMap$key=") + this.rawMap$key) + ", rawMap$value=") + this.rawMap$value) + ", stringMap$key=") + this.stringMap$key) + ", stringMap$value=") + this.stringMap$value) + ")"); } } @@ -211,14 +211,14 @@ private @Singular SortedMap men; private @SuppressWarnings("all") @Singular(value = "rawMap",ignoreNullCollections = true) Map rawMap; private @Singular("stringMap") Map stringMap; - @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { super(); this.women = women; this.men = men; this.rawMap = rawMap; this.stringMap = stringMap; } - public static @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder builder() { return new BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularNoAuto.java b/test/transform/resource/after-ecj/BuilderSingularNoAuto.java index 80870c342c..c7cb687669 100644 --- a/test/transform/resource/after-ecj/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-ecj/BuilderSingularNoAuto.java @@ -1,20 +1,20 @@ import java.util.List; import lombok.Singular; @lombok.Builder class BuilderSingularNoAuto { - public static @java.lang.SuppressWarnings("all") class BuilderSingularNoAutoBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList things; - private @java.lang.SuppressWarnings("all") java.util.ArrayList widgets; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; - @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularNoAutoBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList things; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList widgets; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final String things) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final String things) { if ((this.things == null)) this.things = new java.util.ArrayList(); this.things.add(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final java.util.Collection things) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final java.util.Collection things) { if ((things == null)) { throw new java.lang.NullPointerException("things cannot be null"); @@ -24,18 +24,18 @@ this.things.addAll(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearThings() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearThings() { if ((this.things != null)) this.things.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widget(final String widget) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widget(final String widget) { if ((this.widgets == null)) this.widgets = new java.util.ArrayList(); this.widgets.add(widget); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widgets(final java.util.Collection widgets) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widgets(final java.util.Collection widgets) { if ((widgets == null)) { throw new java.lang.NullPointerException("widgets cannot be null"); @@ -45,18 +45,18 @@ this.widgets.addAll(widgets); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearWidgets() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearWidgets() { if ((this.widgets != null)) this.widgets.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final String items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final String items) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(items); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -66,12 +66,12 @@ this.items.addAll(items); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearItems() { if ((this.items != null)) this.items.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto build() { java.util.List things; switch (((this.things == null) ? 0 : this.things.size())) { case 0 : @@ -107,20 +107,20 @@ } return new BuilderSingularNoAuto(things, widgets, items); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things) + ", widgets=") + this.widgets) + ", items=") + this.items) + ")"); } } private @Singular List things; private @Singular("widget") List widgets; private @Singular List items; - @java.lang.SuppressWarnings("all") BuilderSingularNoAuto(final List things, final List widgets, final List items) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto(final List things, final List widgets, final List items) { super(); this.things = things; this.widgets = widgets; this.items = items; } - public static @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java index a3a02841f6..ed3c00815a 100644 --- a/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java @@ -1,20 +1,20 @@ import java.util.List; import lombok.Singular; @lombok.Builder(setterPrefix = "with") class BuilderSingularNoAutoWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularNoAutoWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList things; - private @java.lang.SuppressWarnings("all") java.util.ArrayList widgets; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; - @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularNoAutoWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList things; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList widgets; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) { if ((this.things == null)) this.things = new java.util.ArrayList(); this.things.add(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection things) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection things) { if ((things == null)) { throw new java.lang.NullPointerException("things cannot be null"); @@ -24,18 +24,18 @@ this.things.addAll(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() { if ((this.things != null)) this.things.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) { if ((this.widgets == null)) this.widgets = new java.util.ArrayList(); this.widgets.add(widget); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection widgets) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection widgets) { if ((widgets == null)) { throw new java.lang.NullPointerException("widgets cannot be null"); @@ -45,18 +45,18 @@ this.widgets.addAll(widgets); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() { if ((this.widgets != null)) this.widgets.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(items); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -66,12 +66,12 @@ this.items.addAll(items); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() { if ((this.items != null)) this.items.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix build() { java.util.List things; switch (((this.things == null) ? 0 : this.things.size())) { case 0 : @@ -107,20 +107,20 @@ } return new BuilderSingularNoAutoWithSetterPrefix(things, widgets, items); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(things=" + this.things) + ", widgets=") + this.widgets) + ", items=") + this.items) + ")"); } } private @Singular List things; private @Singular("widget") List widgets; private @Singular List items; - @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix(final List things, final List widgets, final List items) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix(final List things, final List widgets, final List items) { super(); this.things = things; this.widgets = widgets; this.items = items; } - public static @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder builder() { return new BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularNullBehavior1.java b/test/transform/resource/after-ecj/BuilderSingularNullBehavior1.java index 94ef45eb1e..7ab519750e 100644 --- a/test/transform/resource/after-ecj/BuilderSingularNullBehavior1.java +++ b/test/transform/resource/after-ecj/BuilderSingularNullBehavior1.java @@ -2,37 +2,37 @@ import java.util.Collection; import lombok.Singular; @lombok.Builder class BuilderSingularNullBehavior1 { - public static @java.lang.SuppressWarnings("all") class BuilderSingularNullBehavior1Builder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList names; - private @java.lang.SuppressWarnings("all") java.util.ArrayList locations; - @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1Builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularNullBehavior1Builder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList names; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList locations; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1Builder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder name(final String name) { if ((this.names == null)) this.names = new java.util.ArrayList(); this.names.add(name); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder names(final java.util. @org.checkerframework.checker.nullness.qual.NonNull Collection names) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder names(final java.util. @org.checkerframework.checker.nullness.qual.NonNull Collection names) { assert (names != null): "names cannot be null"; if ((this.names == null)) this.names = new java.util.ArrayList(); this.names.addAll(names); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearNames() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearNames() { if ((this.names != null)) this.names.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder location(final String location) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder location(final String location) { if ((this.locations == null)) this.locations = new java.util.ArrayList(); this.locations.add(location); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder locations(final java.util. @org.checkerframework.checker.nullness.qual.Nullable Collection locations) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder locations(final java.util. @org.checkerframework.checker.nullness.qual.Nullable Collection locations) { if ((locations != null)) { if ((this.locations == null)) @@ -41,12 +41,12 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearLocations() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearLocations() { if ((this.locations != null)) this.locations.clear(); return this; } - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1 build() { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1 build() { java.util.List names; switch (((this.names == null) ? 0 : this.names.size())) { case 0 : @@ -71,18 +71,18 @@ } return new BuilderSingularNullBehavior1(names, locations); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return (((("BuilderSingularNullBehavior1.BuilderSingularNullBehavior1Builder(names=" + this.names) + ", locations=") + this.locations) + ")"); } } private @Singular List names; private @Singular(ignoreNullCollections = true) List locations; - @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1(final List names, final List locations) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1(final List names, final List locations) { super(); this.names = names; this.locations = locations; } - public static @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder builder() { return new BuilderSingularNullBehavior1.BuilderSingularNullBehavior1Builder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularNullBehavior2.java b/test/transform/resource/after-ecj/BuilderSingularNullBehavior2.java index e1adccb5b9..3e730f8c56 100644 --- a/test/transform/resource/after-ecj/BuilderSingularNullBehavior2.java +++ b/test/transform/resource/after-ecj/BuilderSingularNullBehavior2.java @@ -2,30 +2,30 @@ import java.util.List; import lombok.Singular; @lombok.Builder class BuilderSingularNullBehavior2 { - public static @java.lang.SuppressWarnings("all") class BuilderSingularNullBehavior2Builder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList locations; - @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2Builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularNullBehavior2Builder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList locations; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2Builder() { super(); } - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder location(final String location) { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder location(final String location) { if ((this.locations == null)) this.locations = new java.util.ArrayList(); this.locations.add(location); return this; } - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder locations(final @org.springframework.lang.NonNull java.util.Collection locations) { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder locations(final @org.springframework.lang.NonNull java.util.Collection locations) { java.util.Objects.requireNonNull(locations, "locations cannot be null"); if ((this.locations == null)) this.locations = new java.util.ArrayList(); this.locations.addAll(locations); return this; } - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder clearLocations() { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder clearLocations() { if ((this.locations != null)) this.locations.clear(); return this; } - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2 build() { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2 build() { java.util.List locations; switch (((this.locations == null) ? 0 : this.locations.size())) { case 0 : @@ -39,16 +39,16 @@ } return new BuilderSingularNullBehavior2(locations); } - public @java.lang.Override @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder(locations=" + this.locations) + ")"); } } private @Singular List locations; - @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2(final List locations) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2(final List locations) { super(); this.locations = locations; } - public static @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder builder() { + public static @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder builder() { return new BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularOnRecord.java b/test/transform/resource/after-ecj/BuilderSingularOnRecord.java index 10d109ed5b..4dcdb6eb10 100644 --- a/test/transform/resource/after-ecj/BuilderSingularOnRecord.java +++ b/test/transform/resource/after-ecj/BuilderSingularOnRecord.java @@ -4,20 +4,20 @@ import lombok.Builder; import lombok.Singular; public @Builder record BuilderSingularOnRecord(List children, Collection scarves, List rawList) { - public static @java.lang.SuppressWarnings("all") class BuilderSingularOnRecordBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList children; - private @java.lang.SuppressWarnings("all") java.util.ArrayList scarves; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawList; - @java.lang.SuppressWarnings("all") BuilderSingularOnRecordBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularOnRecordBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList children; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList scarves; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawList; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecordBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder child(final T child) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder child(final T child) { if ((this.children == null)) this.children = new java.util.ArrayList(); this.children.add(child); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder children(final java.util.Collection children) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder children(final java.util.Collection children) { if ((children == null)) { throw new java.lang.NullPointerException("children cannot be null"); @@ -27,18 +27,18 @@ this.children.addAll(children); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearChildren() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearChildren() { if ((this.children != null)) this.children.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarf(final Number scarf) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarf(final Number scarf) { if ((this.scarves == null)) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarves(final java.util.Collection scarves) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarves(final java.util.Collection scarves) { if ((scarves == null)) { throw new java.lang.NullPointerException("scarves cannot be null"); @@ -48,18 +48,18 @@ this.scarves.addAll(scarves); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearScarves() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearScarves() { if ((this.scarves != null)) this.scarves.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final java.lang.Object rawList) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final java.lang.Object rawList) { if ((this.rawList == null)) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final java.util.Collection rawList) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final java.util.Collection rawList) { if ((rawList == null)) { throw new java.lang.NullPointerException("rawList cannot be null"); @@ -69,12 +69,12 @@ this.rawList.addAll(rawList); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearRawList() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearRawList() { if ((this.rawList != null)) this.rawList.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord build() { java.util.List children; switch (((this.children == null) ? 0 : this.children.size())) { case 0 : @@ -110,14 +110,14 @@ } return new BuilderSingularOnRecord(children, scarves, rawList); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularOnRecord.BuilderSingularOnRecordBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")"); } } /* Implicit */ private final List children; /* Implicit */ private final Collection scarves; /* Implicit */ private final List rawList; - public static @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder builder() { return new BuilderSingularOnRecord.BuilderSingularOnRecordBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java index 73f24f9700..f367b1c288 100644 --- a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java @@ -3,20 +3,20 @@ import java.util.Collection; import lombok.Singular; @lombok.Builder class BuilderSingularRedirectToGuava { - public static @java.lang.SuppressWarnings("all") class BuilderSingularRedirectToGuavaBuilder { - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder dangerMice; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedMap.Builder things; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder> doohickeys; - @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularRedirectToGuavaBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSet.Builder dangerMice; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSortedMap.Builder things; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder> doohickeys; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuavaBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable dangerMice) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable dangerMice) { if ((dangerMice == null)) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -26,17 +26,17 @@ this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDangerMice() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder thing(final Integer key, final Number value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder things(final java.util.Map things) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder things(final java.util.Map things) { if ((things == null)) { throw new java.lang.NullPointerException("things cannot be null"); @@ -46,17 +46,17 @@ this.things.putAll(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearThings() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickey(final Class doohickey) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickey(final Class doohickey) { if ((this.doohickeys == null)) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable> doohickeys) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable> doohickeys) { if ((doohickeys == null)) { throw new java.lang.NullPointerException("doohickeys cannot be null"); @@ -66,30 +66,30 @@ this.doohickeys.addAll(doohickeys); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated 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()); java.util.Collection> doohickeys = ((this.doohickeys == null) ? com.google.common.collect.ImmutableList.>of() : this.doohickeys.build()); return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice) + ", things=") + this.things) + ", doohickeys=") + this.doohickeys) + ")"); } } private @Singular Set dangerMice; private @Singular NavigableMap things; private @Singular Collection> doohickeys; - @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { super(); this.dangerMice = dangerMice; this.things = things; this.doohickeys = doohickeys; } - public static @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularSets.java b/test/transform/resource/after-ecj/BuilderSingularSets.java index 8e1f448457..e2d3ff8735 100644 --- a/test/transform/resource/after-ecj/BuilderSingularSets.java +++ b/test/transform/resource/after-ecj/BuilderSingularSets.java @@ -2,21 +2,21 @@ import java.util.SortedSet; import lombok.Singular; @lombok.Builder class BuilderSingularSets { - public static @java.lang.SuppressWarnings("all") class BuilderSingularSetsBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList dangerMice; - private @java.lang.SuppressWarnings("all") java.util.ArrayList octopodes; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawSet; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringSet; - @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularSetsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList dangerMice; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList octopodes; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawSet; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringSet; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder dangerMouse(final T dangerMouse) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder dangerMouse(final T dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder dangerMice(final java.util.Collection dangerMice) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder dangerMice(final java.util.Collection dangerMice) { if ((dangerMice == null)) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -26,18 +26,18 @@ this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder clearDangerMice() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder clearDangerMice() { if ((this.dangerMice != null)) this.dangerMice.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder octopus(final Number octopus) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder octopus(final Number octopus) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder octopodes(final java.util.Collection octopodes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder octopodes(final java.util.Collection octopodes) { if ((octopodes == null)) { throw new java.lang.NullPointerException("octopodes cannot be null"); @@ -47,18 +47,18 @@ this.octopodes.addAll(octopodes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder clearOctopodes() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder clearOctopodes() { if ((this.octopodes != null)) this.octopodes.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.util.Collection rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.util.Collection rawSet) { if ((rawSet == null)) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -68,18 +68,18 @@ this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder clearRawSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder clearRawSet() { if ((this.rawSet != null)) this.rawSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final String stringSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final String stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final java.util.Collection stringSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final java.util.Collection stringSet) { if ((stringSet == null)) { throw new java.lang.NullPointerException("stringSet cannot be null"); @@ -89,12 +89,12 @@ this.stringSet.addAll(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder clearStringSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder clearStringSet() { if ((this.stringSet != null)) this.stringSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets build() { java.util.Set dangerMice; switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) { case 0 : @@ -140,7 +140,7 @@ } return new BuilderSingularSets(dangerMice, octopodes, rawSet, stringSet); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")"); } } @@ -148,14 +148,14 @@ private @Singular SortedSet octopodes; private @SuppressWarnings("all") @Singular("rawSet") Set rawSet; private @Singular("stringSet") Set stringSet; - @java.lang.SuppressWarnings("all") BuilderSingularSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { super(); this.dangerMice = dangerMice; this.octopodes = octopodes; this.rawSet = rawSet; this.stringSet = stringSet; } - public static @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder builder() { return new BuilderSingularSets.BuilderSingularSetsBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java index 0dc9185149..2ede85ec7b 100644 --- a/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java @@ -2,21 +2,21 @@ import java.util.SortedSet; import lombok.Singular; @lombok.Builder(setterPrefix = "with") class BuilderSingularSetsWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularSetsWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList dangerMice; - private @java.lang.SuppressWarnings("all") java.util.ArrayList octopodes; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawSet; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringSet; - @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularSetsWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList dangerMice; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList octopodes; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawSet; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringSet; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMouse(final T dangerMouse) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMouse(final T dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMice(final java.util.Collection dangerMice) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMice(final java.util.Collection dangerMice) { if ((dangerMice == null)) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -26,18 +26,18 @@ this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearDangerMice() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearDangerMice() { if ((this.dangerMice != null)) this.dangerMice.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopus(final Number octopus) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopus(final Number octopus) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopodes(final java.util.Collection octopodes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopodes(final java.util.Collection octopodes) { if ((octopodes == null)) { throw new java.lang.NullPointerException("octopodes cannot be null"); @@ -47,18 +47,18 @@ this.octopodes.addAll(octopodes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearOctopodes() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearOctopodes() { if ((this.octopodes != null)) this.octopodes.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.util.Collection rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.util.Collection rawSet) { if ((rawSet == null)) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -68,18 +68,18 @@ this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearRawSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearRawSet() { if ((this.rawSet != null)) this.rawSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final String stringSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final String stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final java.util.Collection stringSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final java.util.Collection stringSet) { if ((stringSet == null)) { throw new java.lang.NullPointerException("stringSet cannot be null"); @@ -89,12 +89,12 @@ this.stringSet.addAll(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearStringSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearStringSet() { if ((this.stringSet != null)) this.stringSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix build() { java.util.Set dangerMice; switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) { case 0 : @@ -140,7 +140,7 @@ } return new BuilderSingularSetsWithSetterPrefix(dangerMice, octopodes, rawSet, stringSet); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")"); } } @@ -148,14 +148,14 @@ private @Singular SortedSet octopodes; private @SuppressWarnings("all") @Singular("rawSet") Set rawSet; private @Singular("stringSet") Set stringSet; - @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { super(); this.dangerMice = dangerMice; this.octopodes = octopodes; this.rawSet = rawSet; this.stringSet = stringSet; } - public static @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder builder() { return new BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java index 41ed6dcc4f..268a51bb1d 100644 --- a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java +++ b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java @@ -1,17 +1,17 @@ import lombok.Singular; @lombok.Builder(toBuilder = true) class BuilderSingularToBuilderWithNull { - public static @java.lang.SuppressWarnings("all") class BuilderSingularToBuilderWithNullBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList elems; - @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularToBuilderWithNullBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList elems; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elem(final String elem) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elem(final String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection elems) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection elems) { if ((elems == null)) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -21,12 +21,12 @@ this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder clearElems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull build() { java.util.List elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -40,7 +40,7 @@ } return new BuilderSingularToBuilderWithNull(elems); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(elems=" + this.elems) + ")"); } } @@ -48,17 +48,17 @@ public static void test() { new BuilderSingularToBuilderWithNull(null).toBuilder(); } - @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull(final java.util.List elems) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull(final java.util.List elems) { super(); this.elems = elems; } - public static @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder() { return new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(); } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder toBuilder() { final BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(); if ((this.elems != null)) builder.elems(this.elems); return builder; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java index 6940cc08c2..7e0f5c96bd 100644 --- a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java @@ -1,17 +1,17 @@ import lombok.Singular; @lombok.Builder(toBuilder = true,setterPrefix = "with") class BuilderSingularToBuilderWithNullWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList elems; - @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList elems; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection elems) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if ((elems == null)) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -21,12 +21,12 @@ this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix build() { java.util.List elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -40,7 +40,7 @@ } return new BuilderSingularToBuilderWithNullWithSetterPrefix(elems); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(elems=" + this.elems) + ")"); } } @@ -48,14 +48,14 @@ public static void test() { new BuilderSingularToBuilderWithNullWithSetterPrefix(null).toBuilder(); } - @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix(final java.util.List elems) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix(final java.util.List elems) { super(); this.elems = elems; } - public static @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() { return new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() { final BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); if ((this.elems != null)) builder.withElems(this.elems); diff --git a/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilder.java b/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilder.java index bc5e2a50e7..1379b6c8c8 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilder.java +++ b/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilder.java @@ -2,19 +2,19 @@ import java.util.Collection; import lombok.Singular; @lombok.Builder(toBuilder = true) class BuilderSingularWildcardListsWithToBuilder { - public static @java.lang.SuppressWarnings("all") class BuilderSingularWildcardListsWithToBuilderBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList objects; - private @java.lang.SuppressWarnings("all") java.util.ArrayList numbers; - @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularWildcardListsWithToBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList objects; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList numbers; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilderBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) { if ((this.objects == null)) this.objects = new java.util.ArrayList(); this.objects.add(object); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection objects) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection objects) { if ((objects == null)) { throw new java.lang.NullPointerException("objects cannot be null"); @@ -24,18 +24,18 @@ this.objects.addAll(objects); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() { if ((this.objects != null)) this.objects.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) { if ((this.numbers == null)) this.numbers = new java.util.ArrayList(); this.numbers.add(number); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection numbers) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection numbers) { if ((numbers == null)) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -45,12 +45,12 @@ this.numbers.addAll(numbers); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() { if ((this.numbers != null)) this.numbers.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder build() { java.util.List objects; switch (((this.objects == null) ? 0 : this.objects.size())) { case 0 : @@ -75,21 +75,21 @@ } return new BuilderSingularWildcardListsWithToBuilder(objects, numbers); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(objects=" + this.objects) + ", numbers=") + this.numbers) + ")"); } } private @Singular List objects; private @Singular Collection numbers; - @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder(final List objects, final Collection numbers) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder(final List objects, final Collection numbers) { super(); this.objects = objects; this.numbers = numbers; } - public static @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder() { return new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(); } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() { final BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(); if ((this.objects != null)) builder.objects(this.objects); @@ -97,4 +97,4 @@ builder.numbers(this.numbers); return builder; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java index 4bc79326cb..eef235ccc8 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java +++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java @@ -1,17 +1,17 @@ import lombok.Singular; @lombok.Builder @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixes { - public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList elems; - @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularWithPrefixesBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList elems; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elem(final String elem) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elem(final String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elems(final java.util.Collection elems) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elems(final java.util.Collection elems) { if ((elems == null)) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -21,12 +21,12 @@ this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder clearElems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes build() { java.util.List elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -40,16 +40,16 @@ } return new BuilderSingularWithPrefixes(elems); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems) + ")"); } } private @Singular java.util.List _elems; - @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes(final java.util.List elems) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes(final java.util.List elems) { super(); this._elems = elems; } - public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder builder() { return new BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java index f492005b77..92f95066cb 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java @@ -1,17 +1,17 @@ import lombok.Singular; @lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixesWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList elems; - @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularWithPrefixesWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList elems; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection elems) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if ((elems == null)) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -21,12 +21,12 @@ this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix build() { java.util.List elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -40,16 +40,16 @@ } return new BuilderSingularWithPrefixesWithSetterPrefix(elems); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(elems=" + this.elems) + ")"); } } private @Singular java.util.List _elems; - @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix(final java.util.List elems) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix(final java.util.List elems) { super(); this._elems = elems; } - public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() { return new BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnos.java b/test/transform/resource/after-ecj/BuilderTypeAnnos.java index cae7f2b4a3..5ea456dd79 100644 --- a/test/transform/resource/after-ecj/BuilderTypeAnnos.java +++ b/test/transform/resource/after-ecj/BuilderTypeAnnos.java @@ -6,31 +6,31 @@ @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB { } @lombok.Builder class BuilderTypeAnnos { - public static @java.lang.SuppressWarnings("all") class BuilderTypeAnnosBuilder { - private @java.lang.SuppressWarnings("all") List foo; - @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderTypeAnnosBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated List foo; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderTypeAnnos.BuilderTypeAnnosBuilder foo(final @TA List foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnos.BuilderTypeAnnosBuilder foo(final @TA List foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") BuilderTypeAnnos build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnos build() { return new BuilderTypeAnnos(this.foo); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo) + ")"); } } private @TA @TB List foo; - @java.lang.SuppressWarnings("all") BuilderTypeAnnos(final @TA List foo) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnos(final @TA List foo) { super(); this.foo = foo; } - public static @java.lang.SuppressWarnings("all") BuilderTypeAnnos.BuilderTypeAnnosBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnos.BuilderTypeAnnosBuilder builder() { return new BuilderTypeAnnos.BuilderTypeAnnosBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java index a3e279851c..dcc492c531 100644 --- a/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java @@ -6,31 +6,31 @@ @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB { } @lombok.Builder(setterPrefix = "with") class BuilderTypeAnnosWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderTypeAnnosWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") List foo; - @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderTypeAnnosWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated List foo; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosWithSetterPrefixBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder withFoo(final @TA List foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder withFoo(final @TA List foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosWithSetterPrefix build() { return new BuilderTypeAnnosWithSetterPrefix(this.foo); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(foo=" + this.foo) + ")"); } } private @TA @TB List foo; - @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix(final @TA List foo) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosWithSetterPrefix(final @TA List foo) { super(); this.foo = foo; } - public static @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder builder() { return new BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderValueData.java b/test/transform/resource/after-ecj/BuilderValueData.java index deffcbb9d2..e92446dd44 100644 --- a/test/transform/resource/after-ecj/BuilderValueData.java +++ b/test/transform/resource/after-ecj/BuilderValueData.java @@ -1,27 +1,27 @@ import java.util.List; final @lombok.Builder @lombok.Value class BuilderAndValue { - public static @java.lang.SuppressWarnings("all") class BuilderAndValueBuilder { - @java.lang.SuppressWarnings("all") BuilderAndValueBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderAndValueBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValueBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderAndValue build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValue build() { return new BuilderAndValue(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "BuilderAndValue.BuilderAndValueBuilder()"; } } private final int zero = 0; - @java.lang.SuppressWarnings("all") BuilderAndValue() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValue() { super(); } - public static @java.lang.SuppressWarnings("all") BuilderAndValue.BuilderAndValueBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValue.BuilderAndValueBuilder builder() { return new BuilderAndValue.BuilderAndValueBuilder(); } - public @java.lang.SuppressWarnings("all") int getZero() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getZero() { return this.zero; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderAndValue))) @@ -31,39 +31,39 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getZero()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderAndValue(zero=" + this.getZero()) + ")"); } } @lombok.Builder @lombok.Data class BuilderAndData { - public static @java.lang.SuppressWarnings("all") class BuilderAndDataBuilder { - @java.lang.SuppressWarnings("all") BuilderAndDataBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderAndDataBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndDataBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderAndData build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndData build() { return new BuilderAndData(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "BuilderAndData.BuilderAndDataBuilder()"; } } private final int zero = 0; - @java.lang.SuppressWarnings("all") BuilderAndData() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndData() { super(); } - public static @java.lang.SuppressWarnings("all") BuilderAndData.BuilderAndDataBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndData.BuilderAndDataBuilder builder() { return new BuilderAndData.BuilderAndDataBuilder(); } - public @java.lang.SuppressWarnings("all") int getZero() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getZero() { return this.zero; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderAndData))) @@ -75,16 +75,16 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof BuilderAndData); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getZero()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderAndData(zero=" + this.getZero()) + ")"); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java index 832bac2462..f19cf776a4 100644 --- a/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java @@ -1,27 +1,27 @@ import java.util.List; final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValueWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderAndValueWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderAndValueWithSetterPrefixBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValueWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValueWithSetterPrefix build() { return new BuilderAndValueWithSetterPrefix(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder()"; } } private final int zero = 0; - @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefix() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValueWithSetterPrefix() { super(); } - public static @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder builder() { return new BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder(); } - public @java.lang.SuppressWarnings("all") int getZero() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getZero() { return this.zero; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderAndValueWithSetterPrefix))) @@ -31,39 +31,39 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getZero()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderAndValueWithSetterPrefix(zero=" + this.getZero()) + ")"); } } @lombok.Builder(setterPrefix = "with") @lombok.Data class BuilderAndDataWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderAndDataWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderAndDataWithSetterPrefixBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndDataWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndDataWithSetterPrefix build() { return new BuilderAndDataWithSetterPrefix(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder()"; } } private final int zero = 0; - @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefix() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndDataWithSetterPrefix() { super(); } - public static @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder builder() { return new BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder(); } - public @java.lang.SuppressWarnings("all") int getZero() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getZero() { return this.zero; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderAndDataWithSetterPrefix))) @@ -75,16 +75,16 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof BuilderAndDataWithSetterPrefix); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getZero()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderAndDataWithSetterPrefix(zero=" + this.getZero()) + ")"); } } diff --git a/test/transform/resource/after-ecj/BuilderWithAccessors.java b/test/transform/resource/after-ecj/BuilderWithAccessors.java index 2d9f80d568..719baa46e5 100644 --- a/test/transform/resource/after-ecj/BuilderWithAccessors.java +++ b/test/transform/resource/after-ecj/BuilderWithAccessors.java @@ -1,44 +1,44 @@ @lombok.Builder @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors { - public static @java.lang.SuppressWarnings("all") class BuilderWithAccessorsBuilder { - private @java.lang.SuppressWarnings("all") int plower; - private @java.lang.SuppressWarnings("all") int upper; - private @java.lang.SuppressWarnings("all") int foo; - private @java.lang.SuppressWarnings("all") int _bar; - @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithAccessorsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int plower; + private @java.lang.SuppressWarnings("all") @lombok.Generated int upper; + private @java.lang.SuppressWarnings("all") @lombok.Generated int foo; + private @java.lang.SuppressWarnings("all") @lombok.Generated int _bar; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessorsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) { this.plower = plower; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) { this.upper = upper; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) { this.foo = foo; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder _bar(final int _bar) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors.BuilderWithAccessorsBuilder _bar(final int _bar) { this._bar = _bar; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithAccessors build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors build() { return new BuilderWithAccessors(this.plower, this.upper, this.foo, this._bar); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower) + ", upper=") + this.upper) + ", foo=") + this.foo) + ", _bar=") + this._bar) + ")"); } } @@ -46,14 +46,14 @@ private final int pUpper; private int _foo; private int __bar; - @java.lang.SuppressWarnings("all") BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { super(); this.plower = plower; this.pUpper = upper; this._foo = foo; this.__bar = _bar; } - public static @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors.BuilderWithAccessorsBuilder builder() { return new BuilderWithAccessors.BuilderWithAccessorsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithBadNames.java b/test/transform/resource/after-ecj/BuilderWithBadNames.java index c0366e141b..2ccedddc94 100644 --- a/test/transform/resource/after-ecj/BuilderWithBadNames.java +++ b/test/transform/resource/after-ecj/BuilderWithBadNames.java @@ -1,39 +1,39 @@ public @lombok.Builder class BuilderWithBadNames { - public static @java.lang.SuppressWarnings("all") class BuilderWithBadNamesBuilder { - private @java.lang.SuppressWarnings("all") String build; - private @java.lang.SuppressWarnings("all") String toString; - @java.lang.SuppressWarnings("all") BuilderWithBadNamesBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithBadNamesBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String build; + private @java.lang.SuppressWarnings("all") @lombok.Generated String toString; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNamesBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) { this.build = build; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithBadNames.BuilderWithBadNamesBuilder toString(final String toString) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNames.BuilderWithBadNamesBuilder toString(final String toString) { this.toString = toString; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithBadNames build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNames build() { return new BuilderWithBadNames(this.build, this.toString); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderWithBadNames.BuilderWithBadNamesBuilder(build=" + this.build) + ", toString=") + this.toString) + ")"); } } String build; String toString; - @java.lang.SuppressWarnings("all") BuilderWithBadNames(final String build, final String toString) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNames(final String build, final String toString) { super(); this.build = build; this.toString = toString; } - public static @java.lang.SuppressWarnings("all") BuilderWithBadNames.BuilderWithBadNamesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNames.BuilderWithBadNamesBuilder builder() { return new BuilderWithBadNames.BuilderWithBadNamesBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithDeprecated.java b/test/transform/resource/after-ecj/BuilderWithDeprecated.java index 7e484b5db9..1d18360a9b 100644 --- a/test/transform/resource/after-ecj/BuilderWithDeprecated.java +++ b/test/transform/resource/after-ecj/BuilderWithDeprecated.java @@ -2,36 +2,36 @@ import lombok.Builder; import lombok.Singular; public @Builder class BuilderWithDeprecated { - public static @java.lang.SuppressWarnings("all") class BuilderWithDeprecatedBuilder { - private @java.lang.SuppressWarnings("all") String dep1; - private @java.lang.SuppressWarnings("all") int dep2; - private @java.lang.SuppressWarnings("all") java.util.ArrayList strings; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder numbers; - @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithDeprecatedBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String dep1; + private @java.lang.SuppressWarnings("all") @lombok.Generated int dep2; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList strings; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder numbers; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedBuilder() { super(); } /** * @deprecated since always * @return {@code this}. */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep1(final String dep1) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep1(final String dep1) { this.dep1 = dep1; return this; } /** * @return {@code this}. */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep2(final int dep2) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep2(final int dep2) { this.dep2 = dep2; return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder string(final String string) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder string(final String string) { if ((this.strings == null)) this.strings = new java.util.ArrayList(); this.strings.add(string); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder strings(final java.util.Collection strings) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder strings(final java.util.Collection strings) { if ((strings == null)) { throw new java.lang.NullPointerException("strings cannot be null"); @@ -41,18 +41,18 @@ this.strings.addAll(strings); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearStrings() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearStrings() { if ((this.strings != null)) this.strings.clear(); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder number(final Integer number) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder number(final Integer number) { if ((this.numbers == null)) this.numbers = com.google.common.collect.ImmutableList.builder(); this.numbers.add(number); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable numbers) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable numbers) { if ((numbers == null)) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -62,11 +62,11 @@ this.numbers.addAll(numbers); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearNumbers() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearNumbers() { this.numbers = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithDeprecated build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated build() { java.util.List strings; switch (((this.strings == null) ? 0 : this.strings.size())) { case 0 : @@ -81,7 +81,7 @@ com.google.common.collect.ImmutableList numbers = ((this.numbers == null) ? com.google.common.collect.ImmutableList.of() : this.numbers.build()); return new BuilderWithDeprecated(this.dep1, this.dep2, strings, numbers); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderWithDeprecated.BuilderWithDeprecatedBuilder(dep1=" + this.dep1) + ", dep2=") + this.dep2) + ", strings=") + this.strings) + ", numbers=") + this.numbers) + ")"); } } @@ -89,14 +89,14 @@ @Deprecated int dep2; @Singular @Deprecated java.util.List strings; @Singular @Deprecated ImmutableList numbers; - @java.lang.SuppressWarnings("all") BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List strings, final ImmutableList numbers) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List strings, final ImmutableList numbers) { super(); this.dep1 = dep1; this.dep2 = dep2; this.strings = strings; this.numbers = numbers; } - public static @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder builder() { return new BuilderWithDeprecated.BuilderWithDeprecatedBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java b/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java index 2c563387fc..eacd49832a 100644 --- a/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java +++ b/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java @@ -2,27 +2,27 @@ import lombok.Builder; import lombok.Singular; public @Builder class BuilderWithDeprecatedAnnOnly { - public static @java.lang.SuppressWarnings("all") class BuilderWithDeprecatedAnnOnlyBuilder { - private @java.lang.SuppressWarnings("all") int dep1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList strings; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder numbers; - @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnlyBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithDeprecatedAnnOnlyBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int dep1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList strings; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder numbers; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnlyBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder dep1(final int dep1) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder dep1(final int dep1) { this.dep1 = dep1; return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder string(final String string) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder string(final String string) { if ((this.strings == null)) this.strings = new java.util.ArrayList(); this.strings.add(string); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder strings(final java.util.Collection strings) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder strings(final java.util.Collection strings) { if ((strings == null)) { throw new java.lang.NullPointerException("strings cannot be null"); @@ -32,18 +32,18 @@ this.strings.addAll(strings); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearStrings() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearStrings() { if ((this.strings != null)) this.strings.clear(); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder number(final Integer number) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder number(final Integer number) { if ((this.numbers == null)) this.numbers = com.google.common.collect.ImmutableList.builder(); this.numbers.add(number); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder numbers(final java.lang.Iterable numbers) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder numbers(final java.lang.Iterable numbers) { if ((numbers == null)) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -53,11 +53,11 @@ this.numbers.addAll(numbers); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearNumbers() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearNumbers() { this.numbers = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly build() { java.util.List strings; switch (((this.strings == null) ? 0 : this.strings.size())) { case 0 : @@ -72,20 +72,20 @@ com.google.common.collect.ImmutableList numbers = ((this.numbers == null) ? com.google.common.collect.ImmutableList.of() : this.numbers.build()); return new BuilderWithDeprecatedAnnOnly(this.dep1, strings, numbers); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder(dep1=" + this.dep1) + ", strings=") + this.strings) + ", numbers=") + this.numbers) + ")"); } } @Deprecated int dep1; @Singular @Deprecated java.util.List strings; @Singular @Deprecated ImmutableList numbers; - @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly(final int dep1, final java.util.List strings, final ImmutableList numbers) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly(final int dep1, final java.util.List strings, final ImmutableList numbers) { super(); this.dep1 = dep1; this.strings = strings; this.numbers = numbers; } - public static @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder builder() { return new BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java index b8c716a7e2..22c4323224 100644 --- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java +++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java @@ -1,32 +1,32 @@ import lombok.Builder; class BuilderWithExistingBuilderClass { public static class BuilderWithExistingBuilderClassBuilder { - private @java.lang.SuppressWarnings("all") boolean arg2; - private @java.lang.SuppressWarnings("all") String arg3; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean arg2; + private @java.lang.SuppressWarnings("all") @lombok.Generated String arg3; private Z arg1; public void arg2(boolean arg) { } - @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg1(final Z arg1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg1(final Z arg1) { this.arg1 = arg1; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg3(final String arg3) { this.arg3 = arg3; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClass build() { return BuilderWithExistingBuilderClass.staticMethod(this.arg1, this.arg2, this.arg3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")"); } } @@ -36,7 +36,7 @@ public void arg2(boolean arg) { public static @Builder BuilderWithExistingBuilderClass staticMethod(Z arg1, boolean arg2, String arg3) { return null; } - public static @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder builder() { return new BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java index f3619019d2..c1ec261d12 100644 --- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -1,32 +1,32 @@ import lombok.Builder; class BuilderWithExistingBuilderClassWithSetterPrefix { public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") boolean arg2; - private @java.lang.SuppressWarnings("all") String arg3; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean arg2; + private @java.lang.SuppressWarnings("all") @lombok.Generated String arg3; private Z arg1; public void withArg2(boolean arg) { } - @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefixBuilder() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefixBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg1(final Z arg1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg1(final Z arg1) { this.arg1 = arg1; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg3(final String arg3) { this.arg3 = arg3; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefix build() { return BuilderWithExistingBuilderClassWithSetterPrefix.staticMethod(this.arg1, this.arg2, this.arg3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")"); } } @@ -36,7 +36,7 @@ public void withArg2(boolean arg) { public static @Builder(setterPrefix = "with") BuilderWithExistingBuilderClassWithSetterPrefix staticMethod(Z arg1, boolean arg2, String arg3) { return null; } - public static @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder builder() { return new BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java index 1107254fea..e86e1c73ba 100644 --- a/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java @@ -1,18 +1,18 @@ @lombok.Builder(setterPrefix = "set") class BuilderWithJavaBeansSpecCapitalization { - public static @java.lang.SuppressWarnings("all") class BuilderWithJavaBeansSpecCapitalizationBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList a; - private @java.lang.SuppressWarnings("all") java.util.ArrayList aField; - private @java.lang.SuppressWarnings("all") String bField; - @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalizationBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithJavaBeansSpecCapitalizationBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList a; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList aField; + private @java.lang.SuppressWarnings("all") @lombok.Generated String bField; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalizationBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setZ(final String z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setZ(final String z) { if ((this.a == null)) this.a = new java.util.ArrayList(); this.a.add(z); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setA(final java.util.Collection a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setA(final java.util.Collection a) { if ((a == null)) { throw new java.lang.NullPointerException("a cannot be null"); @@ -22,18 +22,18 @@ this.a.addAll(a); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearA() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearA() { if ((this.a != null)) this.a.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setyField(final String yField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setyField(final String yField) { if ((this.aField == null)) this.aField = new java.util.ArrayList(); this.aField.add(yField); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setaField(final java.util.Collection aField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setaField(final java.util.Collection aField) { if ((aField == null)) { throw new java.lang.NullPointerException("aField cannot be null"); @@ -43,7 +43,7 @@ this.aField.addAll(aField); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearaField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearaField() { if ((this.aField != null)) this.aField.clear(); return this; @@ -51,11 +51,11 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setbField(final String bField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setbField(final String bField) { this.bField = bField; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization build() { java.util.List a; switch (((this.a == null) ? 0 : this.a.size())) { case 0 : @@ -80,20 +80,20 @@ } return new BuilderWithJavaBeansSpecCapitalization(a, aField, this.bField); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder(a=" + this.a) + ", aField=") + this.aField) + ", bField=") + this.bField) + ")"); } } @lombok.Singular("z") java.util.List a; @lombok.Singular("yField") java.util.List aField; String bField; - @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization(final java.util.List a, final java.util.List aField, final String bField) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization(final java.util.List a, final java.util.List aField, final String bField) { super(); this.a = a; this.aField = aField; this.bField = bField; } - public static @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder builder() { return new BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java b/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java index d5cdf765be..1c76d8a53c 100644 --- a/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java +++ b/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java @@ -1,30 +1,30 @@ import lombok.Builder; @Builder(toBuilder = true,builderMethodName = "") class BuilderWithNoBuilderMethod { - public static @java.lang.SuppressWarnings("all") class BuilderWithNoBuilderMethodBuilder { - private @java.lang.SuppressWarnings("all") String a; - @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithNoBuilderMethodBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String a; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNoBuilderMethodBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder a(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder a(final String a) { this.a = a; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNoBuilderMethod build() { return new BuilderWithNoBuilderMethod(this.a); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder(a=" + this.a) + ")"); } } private String a = ""; - @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod(final String a) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNoBuilderMethod(final String a) { super(); this.a = a; } - public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder toBuilder() { return new BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder().a(this.a); } } diff --git a/test/transform/resource/after-ecj/BuilderWithNonNull.java b/test/transform/resource/after-ecj/BuilderWithNonNull.java index eb041fae71..9486ff943a 100644 --- a/test/transform/resource/after-ecj/BuilderWithNonNull.java +++ b/test/transform/resource/after-ecj/BuilderWithNonNull.java @@ -1,13 +1,13 @@ @lombok.Builder class BuilderWithNonNull { - public static @java.lang.SuppressWarnings("all") class BuilderWithNonNullBuilder { - private @java.lang.SuppressWarnings("all") String id; - @java.lang.SuppressWarnings("all") BuilderWithNonNullBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithNonNullBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String id; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithNonNull.BuilderWithNonNullBuilder id(final @lombok.NonNull String id) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNull.BuilderWithNonNullBuilder id(final @lombok.NonNull String id) { if ((id == null)) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -15,15 +15,15 @@ this.id = id; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithNonNull build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNull build() { return new BuilderWithNonNull(this.id); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderWithNonNull.BuilderWithNonNullBuilder(id=" + this.id) + ")"); } } private final @lombok.NonNull String id; - @java.lang.SuppressWarnings("all") BuilderWithNonNull(final @lombok.NonNull String id) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNull(final @lombok.NonNull String id) { super(); if ((id == null)) { @@ -31,7 +31,7 @@ } this.id = id; } - public static @java.lang.SuppressWarnings("all") BuilderWithNonNull.BuilderWithNonNullBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNull.BuilderWithNonNullBuilder builder() { return new BuilderWithNonNull.BuilderWithNonNullBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java index dc43f9a930..140e04f568 100644 --- a/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java @@ -1,13 +1,13 @@ @lombok.Builder(setterPrefix = "with") class BuilderWithNonNullWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderWithNonNullWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") String id; - @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithNonNullWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String id; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullWithSetterPrefixBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder withId(final @lombok.NonNull String id) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder withId(final @lombok.NonNull String id) { if ((id == null)) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -15,15 +15,15 @@ this.id = id; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullWithSetterPrefix build() { return new BuilderWithNonNullWithSetterPrefix(this.id); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(id=" + this.id) + ")"); } } private final @lombok.NonNull String id; - @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix(final @lombok.NonNull String id) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullWithSetterPrefix(final @lombok.NonNull String id) { super(); if ((id == null)) { @@ -31,7 +31,7 @@ } this.id = id; } - public static @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder builder() { return new BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java b/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java index e42b9e5faa..bd8d5d2042 100644 --- a/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java +++ b/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java @@ -5,50 +5,50 @@ public class BuilderWithRecursiveGenerics { interface Inter> { } public static final @Builder @Value class Test, Quz extends Inter> { - public static @java.lang.SuppressWarnings("all") class TestBuilder, Quz extends Inter> { - private @java.lang.SuppressWarnings("all") Foo foo; - private @java.lang.SuppressWarnings("all") Bar bar; - @java.lang.SuppressWarnings("all") TestBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class TestBuilder, Quz extends Inter> { + private @java.lang.SuppressWarnings("all") @lombok.Generated Foo foo; + private @java.lang.SuppressWarnings("all") @lombok.Generated Bar bar; + @java.lang.SuppressWarnings("all") @lombok.Generated TestBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithRecursiveGenerics.Test.TestBuilder foo(final Foo foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithRecursiveGenerics.Test.TestBuilder foo(final Foo foo) { this.foo = foo; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithRecursiveGenerics.Test.TestBuilder bar(final Bar bar) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithRecursiveGenerics.Test.TestBuilder bar(final Bar bar) { this.bar = bar; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithRecursiveGenerics.Test build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithRecursiveGenerics.Test build() { return new BuilderWithRecursiveGenerics.Test(this.foo, this.bar); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderWithRecursiveGenerics.Test.TestBuilder(foo=" + this.foo) + ", bar=") + this.bar) + ")"); } } private final Foo foo; private final Bar bar; - @java.lang.SuppressWarnings("all") Test(final Foo foo, final Bar bar) { + @java.lang.SuppressWarnings("all") @lombok.Generated Test(final Foo foo, final Bar bar) { super(); this.foo = foo; this.bar = bar; } - public static @java.lang.SuppressWarnings("all") , Quz extends Inter>BuilderWithRecursiveGenerics.Test.TestBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated , Quz extends Inter>BuilderWithRecursiveGenerics.Test.TestBuilder builder() { return new BuilderWithRecursiveGenerics.Test.TestBuilder(); } - public @java.lang.SuppressWarnings("all") Foo getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Foo getFoo() { return this.foo; } - public @java.lang.SuppressWarnings("all") Bar getBar() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Bar getBar() { return this.bar; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderWithRecursiveGenerics.Test))) @@ -64,7 +64,7 @@ interface Inter> { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $foo = this.getFoo(); @@ -73,7 +73,7 @@ interface Inter> { result = ((result * PRIME) + (($bar == null) ? 43 : $bar.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderWithRecursiveGenerics.Test(foo=" + this.getFoo()) + ", bar=") + this.getBar()) + ")"); } } @@ -81,4 +81,3 @@ public BuilderWithRecursiveGenerics() { super(); } } - diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilder.java b/test/transform/resource/after-ecj/BuilderWithToBuilder.java index 0ba3e11a99..2da1611b8c 100644 --- a/test/transform/resource/after-ecj/BuilderWithToBuilder.java +++ b/test/transform/resource/after-ecj/BuilderWithToBuilder.java @@ -1,42 +1,42 @@ import java.util.List; import lombok.Builder; @Builder(toBuilder = true) @lombok.experimental.Accessors(prefix = "m") class BuilderWithToBuilder { - public static @java.lang.SuppressWarnings("all") class BuilderWithToBuilderBuilder { - private @java.lang.SuppressWarnings("all") String one; - private @java.lang.SuppressWarnings("all") String two; - private @java.lang.SuppressWarnings("all") T foo; - private @java.lang.SuppressWarnings("all") java.util.ArrayList bars; - @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithToBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String one; + private @java.lang.SuppressWarnings("all") @lombok.Generated String two; + private @java.lang.SuppressWarnings("all") @lombok.Generated T foo; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList bars; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilderBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder one(final String one) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder one(final String one) { this.one = one; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder two(final String two) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder two(final String two) { this.two = two; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder foo(final T foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder foo(final T foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder bar(final T bar) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder bar(final T bar) { if ((this.bars == null)) this.bars = new java.util.ArrayList(); this.bars.add(bar); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder bars(final java.util.Collection bars) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder bars(final java.util.Collection bars) { if ((bars == null)) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -46,12 +46,12 @@ this.bars.addAll(bars); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder clearBars() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder clearBars() { if ((this.bars != null)) this.bars.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder build() { java.util.List bars; switch (((this.bars == null) ? 0 : this.bars.size())) { case 0 : @@ -65,7 +65,7 @@ } return new BuilderWithToBuilder(this.one, this.two, this.foo, bars); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one) + ", two=") + this.two) + ", foo=") + this.foo) + ", bars=") + this.bars) + ")"); } } @@ -76,17 +76,17 @@ public static K rrr(BuilderWithToBuilder x) { return x.foo; } - @java.lang.SuppressWarnings("all") BuilderWithToBuilder(final String one, final String two, final T foo, final List bars) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder(final String one, final String two, final T foo, final List bars) { super(); this.mOne = one; this.mTwo = two; this.foo = foo; this.bars = bars; } - public static @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder builder() { return new BuilderWithToBuilder.BuilderWithToBuilderBuilder(); } - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder toBuilder() { final T foo = BuilderWithToBuilder.rrr(this); final BuilderWithToBuilder.BuilderWithToBuilderBuilder builder = new BuilderWithToBuilder.BuilderWithToBuilderBuilder().one(this.mOne).two(this.mTwo).foo(foo); if ((this.bars != null)) @@ -95,38 +95,38 @@ public static K rrr(BuilderWithToBuilder x) { } } @lombok.experimental.Accessors(prefix = "m") class ConstructorWithToBuilder { - public static @java.lang.SuppressWarnings("all") class ConstructorWithToBuilderBuilder { - private @java.lang.SuppressWarnings("all") String mOne; - private @java.lang.SuppressWarnings("all") T baz; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList bars; - @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorWithToBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String mOne; + private @java.lang.SuppressWarnings("all") @lombok.Generated T baz; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList bars; + @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilderBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder mOne(final String mOne) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder.ConstructorWithToBuilderBuilder mOne(final String mOne) { this.mOne = mOne; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder baz(final T baz) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder.ConstructorWithToBuilderBuilder baz(final T baz) { this.baz = baz; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder bars(final com.google.common.collect.ImmutableList bars) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder.ConstructorWithToBuilderBuilder bars(final com.google.common.collect.ImmutableList bars) { this.bars = bars; return this; } - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder build() { return new ConstructorWithToBuilder(this.mOne, this.baz, this.bars); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne) + ", baz=") + this.baz) + ", bars=") + this.bars) + ")"); } } @@ -137,30 +137,30 @@ public static K rrr(BuilderWithToBuilder x) { public @Builder(toBuilder = true) ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T baz, com.google.common.collect.ImmutableList bars) { super(); } - public static @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder.ConstructorWithToBuilderBuilder builder() { return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(); } - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder.ConstructorWithToBuilderBuilder toBuilder() { return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder().mOne(this.mOne).baz(this.foo).bars(this.bars); } } class StaticMethodWithToBuilder { - public static @java.lang.SuppressWarnings("all") class StaticMethodWithToBuilderBuilder { - private @java.lang.SuppressWarnings("all") T foo; - @java.lang.SuppressWarnings("all") StaticMethodWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class StaticMethodWithToBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated T foo; + @java.lang.SuppressWarnings("all") @lombok.Generated StaticMethodWithToBuilderBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder foo(final T foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder foo(final T foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") StaticMethodWithToBuilder build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated StaticMethodWithToBuilder build() { return StaticMethodWithToBuilder.of(this.foo); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder(foo=" + this.foo) + ")"); } } @@ -172,10 +172,10 @@ public StaticMethodWithToBuilder(T foo) { public static @Builder(toBuilder = true) StaticMethodWithToBuilder of(T foo) { return new StaticMethodWithToBuilder(foo); } - public static @java.lang.SuppressWarnings("all") StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder builder() { return new StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder(); } - public @java.lang.SuppressWarnings("all") StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder toBuilder() { return new StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder().foo(this.foo); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderWithTolerate.java b/test/transform/resource/after-ecj/BuilderWithTolerate.java index 8b6fbb536b..9dff72005a 100644 --- a/test/transform/resource/after-ecj/BuilderWithTolerate.java +++ b/test/transform/resource/after-ecj/BuilderWithTolerate.java @@ -2,24 +2,24 @@ import lombok.experimental.Tolerate; public @Builder class BuilderWithTolerate { public static class BuilderWithTolerateBuilder { - private @java.lang.SuppressWarnings("all") int value; + private @java.lang.SuppressWarnings("all") @lombok.Generated int value; public @Tolerate BuilderWithTolerateBuilder value(String s) { return this.value(Integer.parseInt(s)); } - @java.lang.SuppressWarnings("all") BuilderWithTolerateBuilder() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithTolerateBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithTolerate.BuilderWithTolerateBuilder value(final int value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithTolerate.BuilderWithTolerateBuilder value(final int value) { this.value = value; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithTolerate build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithTolerate build() { return new BuilderWithTolerate(this.value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value) + ")"); } } @@ -27,11 +27,11 @@ public static class BuilderWithTolerateBuilder { public static void main(String[] args) { BuilderWithTolerate.builder().value("42").build(); } - @java.lang.SuppressWarnings("all") BuilderWithTolerate(final int value) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithTolerate(final int value) { super(); this.value = value; } - public static @java.lang.SuppressWarnings("all") BuilderWithTolerate.BuilderWithTolerateBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithTolerate.BuilderWithTolerateBuilder builder() { return new BuilderWithTolerate.BuilderWithTolerateBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java index 670d7a2dfa..a52e0c2c43 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java @@ -9,26 +9,26 @@ /** * @return {@code this}. */ - public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBasic withX(final int x) { + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBasic withX(final int x) { return ((this.x == x) ? this : new CheckerFrameworkBasic(x, this.y, this.z)); } - public @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") int getX() { + public @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") int getY() { + public @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } - public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int getZ() { + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated int getZ() { return this.z; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBasic setZ(final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBasic setZ(final int z) { this.z = z; return this; } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof CheckerFrameworkBasic))) @@ -44,10 +44,10 @@ return false; return true; } - protected @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof CheckerFrameworkBasic); } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -55,13 +55,13 @@ result = ((result * PRIME) + this.getZ()); return result; } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("CheckerFrameworkBasic(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")"); } - public @java.lang.SuppressWarnings("all") CheckerFrameworkBasic(final int x, final int y, final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBasic(final int x, final int y, final int z) { super(); this.x = x; this.y = y; this.z = z; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java index 2aa89e5d15..15872a1229 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java @@ -2,19 +2,19 @@ import lombok.Builder; import lombok.Singular; @Builder class CheckerFrameworkBuilder { - public static @java.lang.SuppressWarnings("all") class CheckerFrameworkBuilderBuilder { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") int y; - private @java.lang.SuppressWarnings("all") int z; - private @java.lang.SuppressWarnings("all") java.util.ArrayList names; - @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class CheckerFrameworkBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int y; + private @java.lang.SuppressWarnings("all") @lombok.Generated int z; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList names; + @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilderBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder x(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder x(final int x) { this.x$value = x; x$set = true; return this; @@ -22,24 +22,24 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder y(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder y(final int y) { this.y = y; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder z(final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder z(final int z) { this.z = z; return this; } - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder name(final String name) { if ((this.names == null)) this.names = new java.util.ArrayList(); this.names.add(name); return this; } - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder names(final java.util.Collection names) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder names(final java.util.Collection names) { if ((names == null)) { throw new java.lang.NullPointerException("names cannot be null"); @@ -49,12 +49,12 @@ this.names.addAll(names); return this; } - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder clearNames() { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder clearNames() { if ((this.names != null)) this.names.clear(); return this; } - public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder build(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) { + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder build(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) { java.util.List names; switch (((this.names == null) ? 0 : this.names.size())) { case 0 : @@ -71,7 +71,7 @@ x$value = CheckerFrameworkBuilder.$default$x(); return new CheckerFrameworkBuilder(x$value, this.y, this.z, names); } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ", z=") + this.z) + ", names=") + this.names) + ")"); } } @@ -79,17 +79,17 @@ int y; int z; @Singular List names; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { + @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { super(); this.x = x; this.y = y; this.z = z; this.names = names; } - public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.aliasing.qual.Unique CheckerFrameworkBuilderBuilder builder() { + public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.aliasing.qual.Unique CheckerFrameworkBuilderBuilder builder() { return new CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java index 228993e0a6..4a7c9b352b 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java @@ -2,19 +2,19 @@ import lombok.Singular; class CheckerFrameworkSuperBuilder { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") int y; - private @java.lang.SuppressWarnings("all") int z; - private @java.lang.SuppressWarnings("all") java.util.ArrayList names; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int y; + private @java.lang.SuppressWarnings("all") @lombok.Generated int z; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList names; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B x(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B x(final int x) { this.x$value = x; x$set = true; return self(); @@ -22,24 +22,24 @@ public ParentBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B y(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B y(final int y) { this.y = y; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B z(final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B z(final int z) { this.z = z; return self(); } - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B name(final String name) { if ((this.names == null)) this.names = new java.util.ArrayList(); this.names.add(name); return self(); } - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B names(final java.util.Collection names) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B names(final java.util.Collection names) { if ((names == null)) { throw new java.lang.NullPointerException("names cannot be null"); @@ -49,25 +49,25 @@ public ParentBuilder() { this.names.addAll(names); return self(); } - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B clearNames() { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B clearNames() { if ((this.names != null)) this.names.clear(); return self(); } - protected abstract @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B self(); - public abstract @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") C build(CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilder this); - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B self(); + public abstract @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated C build(CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilder this); + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("CheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ", z=") + this.z) + ", names=") + this.names) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.common.returnsreceiver.qual.This ParentBuilderImpl self() { + protected @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.common.returnsreceiver.qual.This ParentBuilderImpl self() { return this; } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Parent build(CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.Parent build(CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) { return new CheckerFrameworkSuperBuilder.Parent(this); } } @@ -75,10 +75,10 @@ private ParentBuilderImpl() { int y; int z; @Singular List names; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - protected @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") Parent(final CheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { + protected @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final CheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { super(); if (b.x$set) this.x = b.x$value; @@ -99,22 +99,22 @@ private ParentBuilderImpl() { } this.names = names; } - public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.common.aliasing.qual.Unique ParentBuilder builder() { + public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.common.aliasing.qual.Unique ParentBuilder builder() { return new CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class ZChild extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ZChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") int a$value; - private @java.lang.SuppressWarnings("all") boolean a$set; - private @java.lang.SuppressWarnings("all") int b; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ZChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int a$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean a$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int b; public ZChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B a(final int a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B a(final int a) { this.a$value = a; a$set = true; return self(); @@ -122,33 +122,33 @@ public ZChildBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B b(final int b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B b(final int b) { this.b = b; return self(); } - protected abstract @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B self(); - public abstract @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") C build(CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilder this); - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B self(); + public abstract @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated C build(CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilder this); + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder(super=" + super.toString()) + ", a$value=") + this.a$value) + ", b=") + this.b) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ZChildBuilderImpl extends CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ZChildBuilderImpl extends CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { private ZChildBuilderImpl() { super(); } - protected @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.common.returnsreceiver.qual.This ZChildBuilderImpl self() { + protected @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.common.returnsreceiver.qual.This ZChildBuilderImpl self() { return this; } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.ZChild build(CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilderImpl this) { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.ZChild build(CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilderImpl this) { return new CheckerFrameworkSuperBuilder.ZChild(this); } } @lombok.Builder.Default int a; int b; - private static @java.lang.SuppressWarnings("all") int $default$a() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$a() { return 1; } - protected @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") ZChild(final CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { + protected @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated ZChild(final CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { super(b); if (b.a$set) this.a = b.a$value; @@ -156,7 +156,7 @@ private ZChildBuilderImpl() { this.a = CheckerFrameworkSuperBuilder.ZChild.$default$a(); this.b = b.b; } - public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.common.aliasing.qual.Unique ZChildBuilder builder() { + public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.common.aliasing.qual.Unique ZChildBuilder builder() { return new CheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java index fdb6f1228d..2dbf8d1f26 100644 --- a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java +++ b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java @@ -3,7 +3,7 @@ class GetFoo { GetFoo() { super(); } - public @java.lang.SuppressWarnings("all") int getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/CommentsInterspersed.java b/test/transform/resource/after-ecj/CommentsInterspersed.java index d708ad7280..b3b3de6606 100644 --- a/test/transform/resource/after-ecj/CommentsInterspersed.java +++ b/test/transform/resource/after-ecj/CommentsInterspersed.java @@ -6,7 +6,7 @@ public CommentsInterspersed() { super(); } public native void gwtTest(); - public @java.lang.SuppressWarnings("all") String getTest() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getTest() { return this.test; } } diff --git a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java index a7a53ac05a..39df9e560e 100644 --- a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java +++ b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java @@ -1,5 +1,5 @@ @lombok.Data(staticConstructor = "of") @lombok.NoArgsConstructor class ConflictingStaticConstructorNames { - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ConflictingStaticConstructorNames))) @@ -9,17 +9,17 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof ConflictingStaticConstructorNames); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "ConflictingStaticConstructorNames()"; } - public @java.lang.SuppressWarnings("all") ConflictingStaticConstructorNames() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConflictingStaticConstructorNames() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ConstructorInner.java b/test/transform/resource/after-ecj/ConstructorInner.java index be8ea17e2a..aecda71636 100644 --- a/test/transform/resource/after-ecj/ConstructorInner.java +++ b/test/transform/resource/after-ecj/ConstructorInner.java @@ -1,13 +1,13 @@ class ConstructorInner { static @lombok.AllArgsConstructor(staticName = "of") class Inner { - private @java.lang.SuppressWarnings("all") Inner() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Inner() { super(); } - public static @java.lang.SuppressWarnings("all") ConstructorInner.Inner of() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorInner.Inner of() { return new ConstructorInner.Inner(); } } ConstructorInner() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/Constructors.java b/test/transform/resource/after-ecj/Constructors.java index 8f8ee12949..40f3c912a0 100644 --- a/test/transform/resource/after-ecj/Constructors.java +++ b/test/transform/resource/after-ecj/Constructors.java @@ -1,7 +1,7 @@ @lombok.RequiredArgsConstructor class RequiredArgsConstructor1 { final int x; String name; - public @java.lang.SuppressWarnings("all") RequiredArgsConstructor1(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructor1(final int x) { super(); this.x = x; } @@ -9,7 +9,7 @@ @lombok.RequiredArgsConstructor(access = lombok.AccessLevel.PROTECTED) class RequiredArgsConstructorAccess { final int x; String name; - protected @java.lang.SuppressWarnings("all") RequiredArgsConstructorAccess(final int x) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorAccess(final int x) { super(); this.x = x; } @@ -17,18 +17,18 @@ @lombok.RequiredArgsConstructor(staticName = "staticname") class RequiredArgsConstructorStaticName { final int x; String name; - private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticName(final int x) { + private @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticName(final int x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticName staticname(final int x) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticName staticname(final int x) { return new RequiredArgsConstructorStaticName(x); } } @lombok.RequiredArgsConstructor() class RequiredArgsConstructorWithAnnotations { final int x; String name; - public @Deprecated @java.lang.SuppressWarnings("all") RequiredArgsConstructorWithAnnotations(final int x) { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorWithAnnotations(final int x) { super(); this.x = x; } @@ -36,7 +36,7 @@ @lombok.AllArgsConstructor class AllArgsConstructor1 { final int x; String name; - public @java.lang.SuppressWarnings("all") AllArgsConstructor1(final int x, final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AllArgsConstructor1(final int x, final String name) { super(); this.x = x; this.name = name; @@ -45,35 +45,35 @@ @lombok.NoArgsConstructor class NoArgsConstructor1 { int x; String name; - public @java.lang.SuppressWarnings("all") NoArgsConstructor1() { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsConstructor1() { super(); } } @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics { final T x; String name; - private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics(final T x) { + private @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticNameGenerics(final T x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics of(final T x) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticNameGenerics of(final T x) { return new RequiredArgsConstructorStaticNameGenerics(x); } } @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics2 { final Class x; String name; - private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics2(final Class x) { + private @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticNameGenerics2(final Class x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics2 of(final Class x) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticNameGenerics2 of(final Class x) { return new RequiredArgsConstructorStaticNameGenerics2(x); } } @lombok.AllArgsConstructor(access = lombok.AccessLevel.PACKAGE) class AllArgsConstructorPackageAccess { final String x; - @java.lang.SuppressWarnings("all") AllArgsConstructorPackageAccess(final String x) { + @java.lang.SuppressWarnings("all") @lombok.Generated AllArgsConstructorPackageAccess(final String x) { super(); this.x = x; } @@ -86,7 +86,7 @@ final float f; final String s; byte z; - public @java.lang.SuppressWarnings("all") NoArgsConstructor2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsConstructor2() { super(); this.x = 0; this.y = 0D; @@ -95,4 +95,4 @@ this.f = 0F; this.s = null; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ConstructorsConfiguration.java b/test/transform/resource/after-ecj/ConstructorsConfiguration.java index 2e88a59fa1..81508b9108 100644 --- a/test/transform/resource/after-ecj/ConstructorsConfiguration.java +++ b/test/transform/resource/after-ecj/ConstructorsConfiguration.java @@ -1,6 +1,6 @@ @lombok.AllArgsConstructor class ConstructorsConfiguration { int x; - public @java.lang.SuppressWarnings("all") ConstructorsConfiguration(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsConfiguration(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java b/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java index 545ab04d0c..25092e5b1e 100644 --- a/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java +++ b/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java @@ -7,7 +7,7 @@ public class ConstructorsInAnonymousClass { @AllArgsConstructor @RequiredArgsConstructor @NoArgsConstructor class Inner { private String string; private @NonNull String string2; - public @java.lang.SuppressWarnings("all") Inner(final String string, final @NonNull String string2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner(final String string, final @NonNull String string2) { super(); if ((string2 == null)) { @@ -16,7 +16,7 @@ public class ConstructorsInAnonymousClass { this.string = string; this.string2 = string2; } - public @java.lang.SuppressWarnings("all") Inner(final @NonNull String string2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner(final @NonNull String string2) { super(); if ((string2 == null)) { @@ -24,7 +24,7 @@ public class ConstructorsInAnonymousClass { } this.string2 = string2; } - public @java.lang.SuppressWarnings("all") Inner() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner() { super(); } } diff --git a/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java b/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java index 3491239ffc..b6a95e053b 100644 --- a/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java +++ b/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java @@ -7,7 +7,7 @@ } @lombok.AllArgsConstructor class ConstructorsTypeAnnos { @TA @TB List foo; - public @java.lang.SuppressWarnings("all") ConstructorsTypeAnnos(final @TA List foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsTypeAnnos(final @TA List foo) { super(); this.foo = foo; } diff --git a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java index 552c5c2da7..27208c53b4 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java +++ b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java @@ -3,7 +3,7 @@ int pUpper; int _huh; int __huh2; - public @java.lang.SuppressWarnings("all") ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { super(); this.plower = plower; this.pUpper = upper; @@ -16,7 +16,7 @@ @lombok.NonNull Integer pUpper; @lombok.NonNull Integer _huh; final @lombok.NonNull Integer __huh2; - public @java.lang.SuppressWarnings("all") ConstructorsWithAccessorsNonNull(final @lombok.NonNull Integer plower, final @lombok.NonNull Integer upper, final @lombok.NonNull Integer huh, final @lombok.NonNull Integer _huh2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithAccessorsNonNull(final @lombok.NonNull Integer plower, final @lombok.NonNull Integer upper, final @lombok.NonNull Integer huh, final @lombok.NonNull Integer _huh2) { super(); if ((plower == null)) { @@ -39,4 +39,4 @@ this._huh = huh; this.__huh2 = _huh2; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java index 1fcd97e332..c47141b0c9 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java +++ b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java @@ -3,17 +3,17 @@ import lombok.Value; import lombok.Builder; final @NoArgsConstructor(force = true) @AllArgsConstructor @Builder @Value class ConstructorsWithBuilderDefaults { - public static @java.lang.SuppressWarnings("all") class ConstructorsWithBuilderDefaultsBuilder { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") int y; - @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorsWithBuilderDefaultsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int y; + @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaultsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final int x) { this.x$value = x; x$set = true; return this; @@ -21,35 +21,35 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder y(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder y(final int y) { this.y = y; return this; } - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults build() { int x$value = this.x$value; if ((! this.x$set)) x$value = ConstructorsWithBuilderDefaults.$default$x(); return new ConstructorsWithBuilderDefaults(x$value, this.y); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ")"); } } private final @Builder.Default int x; private final int y; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - public static @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") int getY() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ConstructorsWithBuilderDefaults))) @@ -61,22 +61,22 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); result = ((result * PRIME) + this.getY()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ConstructorsWithBuilderDefaults(x=" + this.getX()) + ", y=") + this.getY()) + ")"); } - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults() { super(); this.y = 0; this.x = ConstructorsWithBuilderDefaults.$default$x(); } - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults(final int x, final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults(final int x, final int y) { super(); this.x = x; this.y = y; diff --git a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java index 4d6e70794e..7581bd4688 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java +++ b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java @@ -2,19 +2,19 @@ import lombok.Value; import lombok.Builder; final @Builder @Value class ConstructorsWithBuilderDefaults { - public static @java.lang.SuppressWarnings("all") class ConstructorsWithBuilderDefaultsBuilder { - private @java.lang.SuppressWarnings("all") java.util.List z$value; - private @java.lang.SuppressWarnings("all") boolean z$set; - private @java.lang.SuppressWarnings("all") T x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") T q; - @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorsWithBuilderDefaultsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.List z$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean z$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated T x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated T q; + @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaultsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder z(final java.util.List z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder z(final java.util.List z) { this.z$value = z; z$set = true; return this; @@ -22,7 +22,7 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final T x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final T x) { this.x$value = x; x$set = true; return this; @@ -30,11 +30,11 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder q(final T q) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder q(final T q) { this.q = q; return this; } - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults build() { java.util.List z$value = this.z$value; if ((! this.z$set)) z$value = ConstructorsWithBuilderDefaults.$default$z(); @@ -43,38 +43,38 @@ x$value = ConstructorsWithBuilderDefaults.$default$x(); return new ConstructorsWithBuilderDefaults(z$value, x$value, this.q); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(z$value=" + this.z$value) + ", x$value=") + this.x$value) + ", q=") + this.q) + ")"); } } private final @Builder.Default java.util.List z; private final @Builder.Default T x; private final T q; - private static @java.lang.SuppressWarnings("all") java.util.List $default$z() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated java.util.List $default$z() { return new java.util.ArrayList(); } - private static @java.lang.SuppressWarnings("all") T $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated T $default$x() { return null; } - @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults(final java.util.List z, final T x, final T q) { + @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults(final java.util.List z, final T x, final T q) { super(); this.z = z; this.x = x; this.q = q; } - public static @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(); } - public @java.lang.SuppressWarnings("all") java.util.List getZ() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.util.List getZ() { return this.z; } - public @java.lang.SuppressWarnings("all") T getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated T getX() { return this.x; } - public @java.lang.SuppressWarnings("all") T getQ() { + public @java.lang.SuppressWarnings("all") @lombok.Generated T getQ() { return this.q; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ConstructorsWithBuilderDefaults))) @@ -94,7 +94,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $z = this.getZ(); @@ -105,10 +105,10 @@ result = ((result * PRIME) + (($q == null) ? 43 : $q.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("ConstructorsWithBuilderDefaults(z=" + this.getZ()) + ", x=") + this.getX()) + ", q=") + this.getQ()) + ")"); } - private @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults() { + private @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults() { super(); this.q = null; this.z = ConstructorsWithBuilderDefaults.$default$z(); diff --git a/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java b/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java index 16a4ee929f..6c9b8b8197 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java +++ b/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java @@ -3,17 +3,17 @@ import lombok.experimental.SuperBuilder; import lombok.Builder; @NoArgsConstructor @AllArgsConstructor @SuperBuilder class ConstructorsWithSuperBuilderDefaults { - public static abstract @java.lang.SuppressWarnings("all") class ConstructorsWithSuperBuilderDefaultsBuilder> { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") int y; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorsWithSuperBuilderDefaultsBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int y; public ConstructorsWithSuperBuilderDefaultsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B x(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B x(final int x) { this.x$value = x; x$set = true; return self(); @@ -21,33 +21,33 @@ public ConstructorsWithSuperBuilderDefaultsBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B y(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B y(final int y) { this.y = y; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ConstructorsWithSuperBuilderDefaultsBuilderImpl extends ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorsWithSuperBuilderDefaultsBuilderImpl extends ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder { private ConstructorsWithSuperBuilderDefaultsBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults build() { return new ConstructorsWithSuperBuilderDefaults(this); } } @Builder.Default int x; int y; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - protected @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults(final ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults(final ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder b) { super(); if (b.x$set) this.x = b.x$value; @@ -55,16 +55,16 @@ private ConstructorsWithSuperBuilderDefaultsBuilderImpl() { this.x = ConstructorsWithSuperBuilderDefaults.$default$x(); this.y = b.y; } - public static @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder builder() { return new ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilderImpl(); } - public @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults() { super(); this.x = ConstructorsWithSuperBuilderDefaults.$default$x(); } - public @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults(final int x, final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults(final int x, final int y) { super(); this.x = x; this.y = y; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/DataConfiguration.java b/test/transform/resource/after-ecj/DataConfiguration.java index 25f7620e0e..7b09545399 100644 --- a/test/transform/resource/after-ecj/DataConfiguration.java +++ b/test/transform/resource/after-ecj/DataConfiguration.java @@ -1,9 +1,9 @@ @lombok.Data class DataConfiguration { final int x; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataConfiguration))) @@ -15,23 +15,23 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataConfiguration); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("DataConfiguration(x=" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") DataConfiguration(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated DataConfiguration(final int x) { super(); this.x = x; } - private @java.lang.SuppressWarnings("all") DataConfiguration() { + private @java.lang.SuppressWarnings("all") @lombok.Generated DataConfiguration() { super(); this.x = 0; } diff --git a/test/transform/resource/after-ecj/DataExtended.java b/test/transform/resource/after-ecj/DataExtended.java index 3250421fc2..d5ec1e492d 100644 --- a/test/transform/resource/after-ecj/DataExtended.java +++ b/test/transform/resource/after-ecj/DataExtended.java @@ -1,12 +1,12 @@ @lombok.Data @lombok.ToString(doNotUseGetters = true) class DataExtended { int x; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataExtended))) @@ -18,19 +18,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataExtended); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.SuppressWarnings("all") DataExtended() { + public @java.lang.SuppressWarnings("all") @lombok.Generated DataExtended() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("DataExtended(x=" + this.x) + ")"); } } diff --git a/test/transform/resource/after-ecj/DataIgnore.java b/test/transform/resource/after-ecj/DataIgnore.java index d3ac8aa3bd..8c20c1e462 100644 --- a/test/transform/resource/after-ecj/DataIgnore.java +++ b/test/transform/resource/after-ecj/DataIgnore.java @@ -1,10 +1,10 @@ @lombok.Data class DataIgnore { final int x; String $name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataIgnore))) @@ -16,19 +16,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataIgnore); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("DataIgnore(x=" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") DataIgnore(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated DataIgnore(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/DataInAnonymousClass.java b/test/transform/resource/after-ecj/DataInAnonymousClass.java index c6e22f8029..5a6786478c 100644 --- a/test/transform/resource/after-ecj/DataInAnonymousClass.java +++ b/test/transform/resource/after-ecj/DataInAnonymousClass.java @@ -3,13 +3,13 @@ public class DataInAnonymousClass { Object annonymous = new Object() { @Data class Inner { private String string; - public @java.lang.SuppressWarnings("all") String getString() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getString() { return this.string; } - public @java.lang.SuppressWarnings("all") void setString(final String string) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setString(final String string) { this.string = string; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Inner))) @@ -23,20 +23,20 @@ public class DataInAnonymousClass { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Inner); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $string = this.getString(); result = ((result * PRIME) + (($string == null) ? 43 : $string.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Inner(string=" + this.getString()) + ")"); } - public @java.lang.SuppressWarnings("all") Inner() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner() { super(); } } diff --git a/test/transform/resource/after-ecj/DataOnEnum.java b/test/transform/resource/after-ecj/DataOnEnum.java index 31eb12ec92..2529543f54 100644 --- a/test/transform/resource/after-ecj/DataOnEnum.java +++ b/test/transform/resource/after-ecj/DataOnEnum.java @@ -3,13 +3,13 @@ private final String someField; () { } - public @java.lang.SuppressWarnings("all") String getSomeField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getSomeField() { return this.someField; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("DataOnEnum." + this.name()) + "(someField=") + this.getSomeField()) + ")"); } - private @java.lang.SuppressWarnings("all") DataOnEnum(final String someField) { + private @java.lang.SuppressWarnings("all") @lombok.Generated DataOnEnum(final String someField) { super(); this.someField = someField; } diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java index ae986676d9..ebb935fbb3 100644 --- a/test/transform/resource/after-ecj/DataOnLocalClass.java +++ b/test/transform/resource/after-ecj/DataOnLocalClass.java @@ -7,16 +7,16 @@ public static void main(String[] args) { @Data class Local { final int x; String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local))) @@ -32,10 +32,10 @@ public static void main(String[] args) { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -43,10 +43,10 @@ public static void main(String[] args) { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Local(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Local(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Local(final int x) { super(); this.x = x; } @@ -58,17 +58,17 @@ class DataOnLocalClass2 { @Data class Local { @Data class InnerLocal { @lombok.NonNull String name; - public @lombok.NonNull @java.lang.SuppressWarnings("all") String getName() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") void setName(final @lombok.NonNull String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setName(final @lombok.NonNull String name) { if ((name == null)) { throw new java.lang.NullPointerException("name is marked non-null but is null"); } this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local.InnerLocal))) @@ -82,20 +82,20 @@ class DataOnLocalClass2 { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local.InnerLocal); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $name = this.getName(); result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Local.InnerLocal(name=" + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") InnerLocal(final @lombok.NonNull String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated InnerLocal(final @lombok.NonNull String name) { super(); if ((name == null)) { @@ -105,10 +105,10 @@ class DataOnLocalClass2 { } } final int x; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local))) @@ -120,19 +120,19 @@ class DataOnLocalClass2 { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Local(x=" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") Local(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Local(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java index d9119388e6..295d814cbc 100644 --- a/test/transform/resource/after-ecj/DataPlain.java +++ b/test/transform/resource/after-ecj/DataPlain.java @@ -2,16 +2,16 @@ @lombok.Data class Data1 { final int x; String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data1))) @@ -27,10 +27,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -38,10 +38,10 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Data1(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Data1(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data1(final int x) { super(); this.x = x; } @@ -49,16 +49,16 @@ @Data class Data2 { final int x; String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data2))) @@ -74,10 +74,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -85,10 +85,10 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Data2(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Data2(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data2(final int x) { super(); this.x = x; } @@ -96,16 +96,16 @@ final @Data class Data3 { final int x; String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data3))) @@ -119,7 +119,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -127,10 +127,10 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Data3(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Data3(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data3(final int x) { super(); this.x = x; } @@ -140,16 +140,16 @@ Data4() { super(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Data4(x=" + this.getX()) + ")"); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data4))) @@ -163,10 +163,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data4); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = super.hashCode(); result = ((result * PRIME) + this.getX()); @@ -174,7 +174,7 @@ } } @Data class Data5 { - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data5))) @@ -184,36 +184,36 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data5); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "Data5()"; } - public @java.lang.SuppressWarnings("all") Data5() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data5() { super(); } } final @Data class Data6 { - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data6))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "Data6()"; } - public @java.lang.SuppressWarnings("all") Data6() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data6() { super(); } } diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java index fa291eca29..49ac3ef0fe 100644 --- a/test/transform/resource/after-ecj/DataWithGetter.java +++ b/test/transform/resource/after-ecj/DataWithGetter.java @@ -2,13 +2,13 @@ private int x; private int y; private final String z; - public @java.lang.SuppressWarnings("all") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.SuppressWarnings("all") void setY(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setY(final int y) { this.y = y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataWithGetter))) @@ -26,10 +26,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataWithGetter); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -38,20 +38,20 @@ result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("DataWithGetter(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")"); } - public @java.lang.SuppressWarnings("all") DataWithGetter(final String z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated DataWithGetter(final String z) { super(); this.z = z; } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") int getY() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } - public @java.lang.SuppressWarnings("all") String getZ() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getZ() { return this.z; } } diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java index 4545dc464f..cd17ac0b37 100644 --- a/test/transform/resource/after-ecj/DataWithGetterNone.java +++ b/test/transform/resource/after-ecj/DataWithGetterNone.java @@ -2,13 +2,13 @@ private int x; private int y; private final String z; - public @java.lang.SuppressWarnings("all") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.SuppressWarnings("all") void setY(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setY(final int y) { this.y = y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataWithGetterNone))) @@ -26,10 +26,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataWithGetterNone); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -38,10 +38,10 @@ result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("DataWithGetterNone(x=" + this.x) + ", y=") + this.y) + ", z=") + this.z) + ")"); } - public @java.lang.SuppressWarnings("all") DataWithGetterNone(final String z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated DataWithGetterNone(final String z) { super(); this.z = z; } diff --git a/test/transform/resource/after-ecj/DataWithOverrideEqualsAndHashCode.java b/test/transform/resource/after-ecj/DataWithOverrideEqualsAndHashCode.java index 2149321f63..fe88844d64 100644 --- a/test/transform/resource/after-ecj/DataWithOverrideEqualsAndHashCode.java +++ b/test/transform/resource/after-ecj/DataWithOverrideEqualsAndHashCode.java @@ -12,10 +12,10 @@ public int hashCode() { public boolean equals(Object other) { return false; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "DataWithOverrideEqualsAndHashCode.Data2()"; } - public @java.lang.SuppressWarnings("all") Data2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data2() { super(); } } diff --git a/test/transform/resource/after-ecj/EqualsAndHashCode.java b/test/transform/resource/after-ecj/EqualsAndHashCode.java index 10c2c7da7a..7bb342d0ea 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCode.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCode.java @@ -7,7 +7,7 @@ EqualsAndHashCode() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode))) @@ -31,10 +31,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -56,7 +56,7 @@ EqualsAndHashCode2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode2))) @@ -74,7 +74,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -91,7 +91,7 @@ EqualsAndHashCode3() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode3))) @@ -101,10 +101,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -113,7 +113,7 @@ EqualsAndHashCode4() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode4))) @@ -125,10 +125,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode4); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = super.hashCode(); return result; } diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeAnnotated.java b/test/transform/resource/after-ecj/EqualsAndHashCodeAnnotated.java index 4e377fb47f..da8f352cd6 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeAnnotated.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeAnnotated.java @@ -11,7 +11,7 @@ EqualsAndHashCodeAnnotated() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeAnnotated))) @@ -35,10 +35,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeAnnotated); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.primitive); @@ -50,4 +50,4 @@ result = ((result * PRIME) + java.util.Arrays.deepHashCode(this.moreObjectValues)); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeAutoExclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeAutoExclude.java index 7e6e171b5e..3be7047c5e 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeAutoExclude.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeAutoExclude.java @@ -5,7 +5,7 @@ EqualsAndHashCodeAutoExclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeAutoExclude))) @@ -17,10 +17,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeAutoExclude); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -34,7 +34,7 @@ EqualsAndHashCodeAutoExclude2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeAutoExclude2))) @@ -54,10 +54,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeAutoExclude2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeCache.java b/test/transform/resource/after-ecj/EqualsAndHashCodeCache.java index 7094b63622..4596294090 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeCache.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeCache.java @@ -1,5 +1,5 @@ @lombok.EqualsAndHashCode(cacheStrategy = lombok.EqualsAndHashCode.CacheStrategy.LAZY) class EqualsAndHashCode { - private transient @java.lang.SuppressWarnings("all") int $hashCodeCache; + private transient @java.lang.SuppressWarnings("all") @lombok.Generated int $hashCodeCache; int x; boolean[] y; Object[] z; @@ -8,7 +8,7 @@ EqualsAndHashCode() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode))) @@ -32,11 +32,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { - if ((this.$hashCodeCache != 0)) + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { + if ((this.$hashCodeCache != 0)) return this.$hashCodeCache; final int PRIME = 59; int result = 1; @@ -54,7 +54,7 @@ } } final @lombok.EqualsAndHashCode(cacheStrategy = lombok.EqualsAndHashCode.CacheStrategy.LAZY) class EqualsAndHashCode2 { - private transient @java.lang.SuppressWarnings("all") int $hashCodeCache; + private transient @java.lang.SuppressWarnings("all") @lombok.Generated int $hashCodeCache; int x; long y; float f; @@ -63,7 +63,7 @@ EqualsAndHashCode2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode2))) @@ -81,8 +81,8 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { - if ((this.$hashCodeCache != 0)) + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { + if ((this.$hashCodeCache != 0)) return this.$hashCodeCache; final int PRIME = 59; int result = 1; @@ -100,11 +100,11 @@ } } final @lombok.EqualsAndHashCode(callSuper = false,cacheStrategy = lombok.EqualsAndHashCode.CacheStrategy.LAZY) class EqualsAndHashCode3 extends EqualsAndHashCode { - private transient @java.lang.SuppressWarnings("all") int $hashCodeCache; + private transient @java.lang.SuppressWarnings("all") @lombok.Generated int $hashCodeCache; EqualsAndHashCode3() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode3))) @@ -114,11 +114,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { - if ((this.$hashCodeCache != 0)) + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { + if ((this.$hashCodeCache != 0)) return this.$hashCodeCache; int result = 1; if ((result == 0)) @@ -128,11 +128,11 @@ } } @lombok.EqualsAndHashCode(callSuper = true,cacheStrategy = lombok.EqualsAndHashCode.CacheStrategy.LAZY) class EqualsAndHashCode4 extends EqualsAndHashCode { - private transient @java.lang.SuppressWarnings("all") int $hashCodeCache; + private transient @java.lang.SuppressWarnings("all") @lombok.Generated int $hashCodeCache; EqualsAndHashCode4() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode4))) @@ -144,11 +144,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode4); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { - if ((this.$hashCodeCache != 0)) + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { + if ((this.$hashCodeCache != 0)) return this.$hashCodeCache; int result = super.hashCode(); if ((result == 0)) @@ -158,11 +158,11 @@ } } final @lombok.EqualsAndHashCode(callSuper = true,cacheStrategy = lombok.EqualsAndHashCode.CacheStrategy.LAZY) class EqualsAndHashCode5 extends EqualsAndHashCode { - private transient @java.lang.SuppressWarnings("all") int $hashCodeCache; + private transient @java.lang.SuppressWarnings("all") @lombok.Generated int $hashCodeCache; EqualsAndHashCode5() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode5))) @@ -174,11 +174,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode5); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { - if ((this.$hashCodeCache != 0)) + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { + if ((this.$hashCodeCache != 0)) return this.$hashCodeCache; int result = super.hashCode(); if ((result == 0)) diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java index 4a265d9c1d..e7fb1e2ade 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java @@ -2,7 +2,7 @@ EqualsAndHashCodeConfigKeys1Parent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys1Parent))) @@ -12,10 +12,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys1Parent); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -25,7 +25,7 @@ EqualsAndHashCodeConfigKeys1() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys1))) @@ -37,13 +37,13 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java index 1257de325b..498527dd25 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java @@ -2,7 +2,7 @@ EqualsAndHashCodeConfigKeys2Object() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys2Object))) @@ -12,10 +12,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys2Object); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -24,7 +24,7 @@ EqualsAndHashCodeConfigKeys2Parent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys2Parent))) @@ -34,10 +34,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys2Parent); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -47,7 +47,7 @@ EqualsAndHashCodeConfigKeys2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys2))) @@ -61,13 +61,13 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = super.hashCode(); result = ((result * PRIME) + this.x); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeEmpty.java b/test/transform/resource/after-ecj/EqualsAndHashCodeEmpty.java index 5b7dd62454..0b96f9eeef 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeEmpty.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeEmpty.java @@ -2,7 +2,7 @@ EqualsAndHashCodeEmpty() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeEmpty))) @@ -12,10 +12,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeEmpty); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -24,7 +24,7 @@ EqualsAndHashCodeEmptyWithSuper() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeEmptyWithSuper))) @@ -36,11 +36,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeEmptyWithSuper); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = super.hashCode(); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java index 96b54039f7..b10a44b575 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java @@ -3,7 +3,7 @@ EqualsAndHashCodeExplicitInclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeExplicitInclude))) @@ -13,11 +13,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeExplicitInclude); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java b/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java index e66850bb60..75ff733e59 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java @@ -6,7 +6,7 @@ public class EqualsAndHashCodeInAnonymousClass { Inner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Inner))) @@ -20,10 +20,10 @@ public class EqualsAndHashCodeInAnonymousClass { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Inner); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $string = this.string; diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java b/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java index 3f0cfc806d..fac3800bdc 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java @@ -6,7 +6,7 @@ class Bar { public Foo() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeNestedShadow.Bar.Foo))) @@ -16,10 +16,10 @@ public Foo() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeNestedShadow.Bar.Foo); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -33,7 +33,7 @@ class Baz { public Foo() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeNestedShadow.Baz.Foo))) @@ -43,10 +43,10 @@ public Foo() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeNestedShadow.Baz.Foo); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -55,4 +55,4 @@ public Foo() { super(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java b/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java index 7fbe6d24db..1f221fcdec 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java @@ -15,7 +15,7 @@ public EqualsAndHashCodeNewStyle() { @EqualsAndHashCode.Include(replaces = "g") long i() { return 0; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeNewStyle))) @@ -35,10 +35,10 @@ public EqualsAndHashCodeNewStyle() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeNewStyle); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.b); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java index 8e93963ad3..2527211758 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java @@ -4,7 +4,7 @@ EqualsAndHashCodeOf() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeOf))) @@ -14,7 +14,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -27,7 +27,7 @@ EqualsAndHashCodeExclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeExclude))) @@ -37,7 +37,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java b/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java index ef221261d4..a4ebaf0a89 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java @@ -6,7 +6,7 @@ public EqualsAndHashCodeRank() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeRank))) @@ -22,10 +22,10 @@ public EqualsAndHashCodeRank() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeRank); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.a); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java index cc0d6544ac..c1a8197b14 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java @@ -24,7 +24,7 @@ public boolean equals(Object other) { private boolean canEqual(Object other) { return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithExistingMethods3))) @@ -38,10 +38,10 @@ private boolean canEqual(Object other) { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = super.hashCode(); result = ((result * PRIME) + this.x); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java index 164d0f15dc..8f94f3fc6e 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java @@ -4,7 +4,7 @@ public class EqualsAndHashCodeWithGenericsOnInners { Inner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithGenericsOnInners.Inner))) @@ -16,10 +16,10 @@ public class EqualsAndHashCodeWithGenericsOnInners { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithGenericsOnInners.Inner); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java index 8c849502bf..4dbbb0b46a 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java @@ -4,7 +4,7 @@ public interface EqualsAndHashCodeWithGenericsOnInnersInInterfaces { Inner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner))) @@ -16,10 +16,10 @@ public interface EqualsAndHashCodeWithGenericsOnInnersInInterfaces { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -27,4 +27,3 @@ public interface EqualsAndHashCodeWithGenericsOnInnersInInterfaces { } } } - diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java index 0cd170b48f..829cfa1eba 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java @@ -3,7 +3,7 @@ EqualsAndHashCodeWithNonNullByDefault() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @javax.annotation.Nullable java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final @javax.annotation.Nullable java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithNonNullByDefault))) @@ -13,11 +13,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final @javax.annotation.Nullable java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final @javax.annotation.Nullable java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithNonNullByDefault); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java index d8af4c7707..14d4a9378d 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java @@ -1,6 +1,5 @@ @interface Nullable { } - @lombok.EqualsAndHashCode() class EqualsAndHashCodeWithOnParam { int x; boolean[] y; @@ -10,7 +9,7 @@ EqualsAndHashCodeWithOnParam() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @Nullable java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final @Nullable java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithOnParam))) @@ -34,10 +33,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final @Nullable java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final @Nullable java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithOnParam); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -49,4 +48,4 @@ result = ((result * PRIME) + (($b == null) ? 43 : $b.hashCode())); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java index 781faccbb2..86d25108f8 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java @@ -5,10 +5,10 @@ public int hashCode() { return 42; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("EqualsAndHashCodeWithSomeExistingMethods(x=" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithSomeExistingMethods() { + public @java.lang.SuppressWarnings("all") @lombok.Generated EqualsAndHashCodeWithSomeExistingMethods() { super(); } } @@ -17,7 +17,7 @@ public int hashCode() { protected boolean canEqual(Object other) { return false; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithSomeExistingMethods2))) @@ -29,16 +29,16 @@ protected boolean canEqual(Object other) { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("EqualsAndHashCodeWithSomeExistingMethods2(x=" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithSomeExistingMethods2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated EqualsAndHashCodeWithSomeExistingMethods2() { super(); } } @@ -50,16 +50,16 @@ public int hashCode() { public boolean equals(Object other) { return false; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("EqualsAndHashCodeWithAllExistingMethods(x=" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithAllExistingMethods() { + public @java.lang.SuppressWarnings("all") @lombok.Generated EqualsAndHashCodeWithAllExistingMethods() { super(); } } @Data @Getter(AccessLevel.NONE) @Setter(lombok.AccessLevel.NONE) class EqualsAndHashCodeWithNoExistingMethods { int x; - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithNoExistingMethods))) @@ -71,19 +71,19 @@ public boolean equals(Object other) { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithNoExistingMethods); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("EqualsAndHashCodeWithNoExistingMethods(x=" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithNoExistingMethods() { + public @java.lang.SuppressWarnings("all") @lombok.Generated EqualsAndHashCodeWithNoExistingMethods() { super(); } } diff --git a/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java b/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java index 02def41a55..530b10470b 100644 --- a/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java +++ b/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java @@ -1,6 +1,6 @@ @lombok.RequiredArgsConstructor class FieldDefaultsViaConfigAndRequiredArgsConstructor { final int x; - public @java.lang.SuppressWarnings("all") FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/FieldNameConstantsBasic.java b/test/transform/resource/after-ecj/FieldNameConstantsBasic.java index 5b58e7d7fa..fad50a6a84 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsBasic.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsBasic.java @@ -1,12 +1,12 @@ import lombok.experimental.FieldNameConstants; import lombok.AccessLevel; public @FieldNameConstants(level = AccessLevel.PACKAGE) class FieldNameConstantsBasic { - static final @java.lang.SuppressWarnings("all") class Fields { + static final @java.lang.SuppressWarnings("all") @lombok.Generated class Fields { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; public static final java.lang.String butPrintMePlease = "butPrintMePlease"; () { } - private @java.lang.SuppressWarnings("all") Fields() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Fields() { super(); } } @@ -20,4 +20,4 @@ public FieldNameConstantsBasic() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java b/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java index 7eb9736489..9e7dcc0538 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java @@ -1,9 +1,9 @@ public @lombok.experimental.FieldNameConstants class FieldNameConstantsConfigKeys { - public static final @java.lang.SuppressWarnings("all") class Foobar { + public static final @java.lang.SuppressWarnings("all") @lombok.Generated class Foobar { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; () { } - private @java.lang.SuppressWarnings("all") Foobar() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Foobar() { super(); } } @@ -11,4 +11,4 @@ public FieldNameConstantsConfigKeys() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/FieldNameConstantsEnum.java b/test/transform/resource/after-ecj/FieldNameConstantsEnum.java index 053a6e7ae3..c994b2c72e 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsEnum.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsEnum.java @@ -1,11 +1,11 @@ import lombok.experimental.FieldNameConstants; import lombok.AccessLevel; public @FieldNameConstants(onlyExplicitlyIncluded = true,asEnum = true,innerTypeName = "TypeTest") class FieldNameConstantsEnum { - public @java.lang.SuppressWarnings("all") enum TypeTest { + public @java.lang.SuppressWarnings("all") @lombok.Generated enum TypeTest { iAmADvdPlayer(), $dontSkipMe(), alsoDontSkipMe(), - private @java.lang.SuppressWarnings("all") TypeTest() { + private @java.lang.SuppressWarnings("all") @lombok.Generated TypeTest() { super(); } () { @@ -20,4 +20,4 @@ public FieldNameConstantsEnum() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/FieldNameConstantsHandrolled.java b/test/transform/resource/after-ecj/FieldNameConstantsHandrolled.java index 6762fdd8db..776d2a4e04 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsHandrolled.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsHandrolled.java @@ -7,7 +7,7 @@ public enum TypeTest { thirdField(), () { } - private @java.lang.SuppressWarnings("all") TypeTest() { + private @java.lang.SuppressWarnings("all") @lombok.Generated TypeTest() { super(); } } @@ -28,7 +28,7 @@ public enum TypeTest { public String foo() { return name(); } - private @java.lang.SuppressWarnings("all") TypeTest() { + private @java.lang.SuppressWarnings("all") @lombok.Generated TypeTest() { super(); } } @@ -46,7 +46,7 @@ static class Fields { public static final int alsoAField = 5; () { } - private @java.lang.SuppressWarnings("all") Fields() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Fields() { super(); } } diff --git a/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java b/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java index cec19f3bf1..8eca05e39d 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java @@ -2,12 +2,12 @@ import lombok.experimental.FieldNameConstants; import lombok.AccessLevel; public @FieldNameConstants(level = AccessLevel.PACKAGE) record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, int andMe, String butPrintMePlease) { - static final @java.lang.SuppressWarnings("all") class Fields { + static final @java.lang.SuppressWarnings("all") @lombok.Generated class Fields { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; public static final java.lang.String butPrintMePlease = "butPrintMePlease"; () { } - private @java.lang.SuppressWarnings("all") Fields() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Fields() { super(); } } diff --git a/test/transform/resource/after-ecj/FieldNameConstantsUppercased.java b/test/transform/resource/after-ecj/FieldNameConstantsUppercased.java index a858b91f27..a3a64b50a4 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsUppercased.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsUppercased.java @@ -1,12 +1,12 @@ import lombok.experimental.FieldNameConstants; import lombok.AccessLevel; public @FieldNameConstants(level = AccessLevel.PACKAGE) class FieldNameConstantsUppercased { - static final @java.lang.SuppressWarnings("all") class Fields { + static final @java.lang.SuppressWarnings("all") @lombok.Generated class Fields { public static final java.lang.String I_AM_A_DVD_PLAYER = "iAmADvdPlayer"; public static final java.lang.String BUT_PRINT_ME_PLEASE = "butPrintMePlease"; () { } - private @java.lang.SuppressWarnings("all") Fields() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Fields() { super(); } } @@ -20,4 +20,4 @@ public FieldNameConstantsUppercased() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java b/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java index 9cd996d51b..2151e8f3f6 100644 --- a/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java +++ b/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java @@ -3,7 +3,7 @@ class GenerateSuppressFBWarnings { GenerateSuppressFBWarnings() { super(); } - public @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") int getY() { + public @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") @lombok.Generated int getY() { return this.y; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GeneratedJavaxJakarta.java b/test/transform/resource/after-ecj/GeneratedJavaxJakarta.java index 184df939bc..90536ac6ef 100644 --- a/test/transform/resource/after-ecj/GeneratedJavaxJakarta.java +++ b/test/transform/resource/after-ecj/GeneratedJavaxJakarta.java @@ -3,7 +3,7 @@ class GeneratedJavaxJakarta { GeneratedJavaxJakarta() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @jakarta.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @jakarta.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/GeneratedJavaxOff.java b/test/transform/resource/after-ecj/GeneratedJavaxOffLombokOff.java similarity index 64% rename from test/transform/resource/after-ecj/GeneratedJavaxOff.java rename to test/transform/resource/after-ecj/GeneratedJavaxOffLombokOff.java index 481e0ba937..42fbaaac5a 100644 --- a/test/transform/resource/after-ecj/GeneratedJavaxOff.java +++ b/test/transform/resource/after-ecj/GeneratedJavaxOffLombokOff.java @@ -1,6 +1,6 @@ -class GeneratedJavaxOff { +class GeneratedJavaxOffLombokOff { @lombok.Getter int x; - GeneratedJavaxOff() { + GeneratedJavaxOffLombokOff() { super(); } public @java.lang.SuppressWarnings("all") int getX() { diff --git a/test/transform/resource/after-ecj/GeneratedOff.java b/test/transform/resource/after-ecj/GeneratedOff.java index 2644e42cff..1fc8ddf1d3 100644 --- a/test/transform/resource/after-ecj/GeneratedOff.java +++ b/test/transform/resource/after-ecj/GeneratedOff.java @@ -3,7 +3,7 @@ class GeneratedOff { GeneratedOff() { super(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/GeneratedOffJavaxOn.java b/test/transform/resource/after-ecj/GeneratedOffJavaxOn.java index c21b53795b..79c7e9d291 100644 --- a/test/transform/resource/after-ecj/GeneratedOffJavaxOn.java +++ b/test/transform/resource/after-ecj/GeneratedOffJavaxOn.java @@ -3,7 +3,7 @@ class GeneratedOffJavaxOn { GeneratedOffJavaxOn() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/GeneratedOn.java b/test/transform/resource/after-ecj/GeneratedOn.java index 9d72333407..b543cc138f 100644 --- a/test/transform/resource/after-ecj/GeneratedOn.java +++ b/test/transform/resource/after-ecj/GeneratedOn.java @@ -3,7 +3,7 @@ class GeneratedOn { GeneratedOn() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/GetterAccessLevel.java b/test/transform/resource/after-ecj/GetterAccessLevel.java index 14edfb5693..85ad5d5bcb 100644 --- a/test/transform/resource/after-ecj/GetterAccessLevel.java +++ b/test/transform/resource/after-ecj/GetterAccessLevel.java @@ -13,31 +13,31 @@ class GetterAccessLevel { GetterAccessLevel() { super(); } - private @java.lang.SuppressWarnings("all") boolean isPrivate() { + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPrivate() { return this.isPrivate; } - @java.lang.SuppressWarnings("all") boolean isPackage() { + @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPackage() { return this.isPackage; } - protected @java.lang.SuppressWarnings("all") boolean isProtected() { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean isProtected() { return this.isProtected; } - public @java.lang.SuppressWarnings("all") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPublic() { return this.isPublic; } - private @java.lang.SuppressWarnings("all") String getPrivateString() { + private @java.lang.SuppressWarnings("all") @lombok.Generated String getPrivateString() { return this.privateString; } - @java.lang.SuppressWarnings("all") String getPackageString() { + @java.lang.SuppressWarnings("all") @lombok.Generated String getPackageString() { return this.packageString; } - protected @java.lang.SuppressWarnings("all") String getProtectedString() { + protected @java.lang.SuppressWarnings("all") @lombok.Generated String getProtectedString() { return this.protectedString; } - public @java.lang.SuppressWarnings("all") String getPublicString() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getPublicString() { return this.publicString; } - public @java.lang.SuppressWarnings("all") String getValue() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getValue() { return this.value; } } diff --git a/test/transform/resource/after-ecj/GetterAlreadyExists.java b/test/transform/resource/after-ecj/GetterAlreadyExists.java index 04f5b81e90..8bc5011105 100644 --- a/test/transform/resource/after-ecj/GetterAlreadyExists.java +++ b/test/transform/resource/after-ecj/GetterAlreadyExists.java @@ -6,7 +6,7 @@ class Getter1 { boolean hasFoo() { return true; } - public @java.lang.SuppressWarnings("all") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isFoo() { return this.foo; } } @@ -36,7 +36,7 @@ class Getter4 { String hasFoo() { return null; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -48,7 +48,7 @@ class Getter5 { String isFoo() { return null; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -69,7 +69,7 @@ class Getter7 { boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -81,7 +81,7 @@ class Getter8 { boolean isFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -102,7 +102,7 @@ class Getter10 { static boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isFoo() { return this.foo; } } @@ -132,7 +132,7 @@ class Getter13 { static boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -144,7 +144,7 @@ class Getter14 { static boolean isFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -165,7 +165,7 @@ class Getter16 { static String hasFoo() { return ""; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -177,7 +177,7 @@ class Getter17 { static String isFoo() { return ""; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterBoolean.java b/test/transform/resource/after-ecj/GetterBoolean.java index a7dc2e2fec..afc8912945 100644 --- a/test/transform/resource/after-ecj/GetterBoolean.java +++ b/test/transform/resource/after-ecj/GetterBoolean.java @@ -5,13 +5,13 @@ class Getter { Getter() { super(); } - public @java.lang.SuppressWarnings("all") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isFoo() { return this.foo; } - public @java.lang.SuppressWarnings("all") boolean isBar() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isBar() { return this.isBar; } - public @java.lang.SuppressWarnings("all") boolean isHasBaz() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isHasBaz() { return this.hasBaz; } } @@ -23,7 +23,7 @@ class MoreGetter { boolean hasFoo() { return true; } - public @java.lang.SuppressWarnings("all") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterDeprecated.java b/test/transform/resource/after-ecj/GetterDeprecated.java index 087a60b89b..c00b875115 100644 --- a/test/transform/resource/after-ecj/GetterDeprecated.java +++ b/test/transform/resource/after-ecj/GetterDeprecated.java @@ -5,13 +5,13 @@ class GetterDeprecated { GetterDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") int getAnnotation() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated int getAnnotation() { return this.annotation; } /** * @deprecated */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") int getJavadoc() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated int getJavadoc() { return this.javadoc; } } diff --git a/test/transform/resource/after-ecj/GetterEnum.java b/test/transform/resource/after-ecj/GetterEnum.java index fd70ce9ed8..ce18806087 100644 --- a/test/transform/resource/after-ecj/GetterEnum.java +++ b/test/transform/resource/after-ecj/GetterEnum.java @@ -7,13 +7,13 @@ private final @Getter String name; () { } - public @java.lang.SuppressWarnings("all") int getId() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getId() { return this.id; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - private @java.lang.SuppressWarnings("all") GetterEnum(final int id, final String name) { + private @java.lang.SuppressWarnings("all") @lombok.Generated GetterEnum(final int id, final String name) { super(); this.id = id; this.name = name; diff --git a/test/transform/resource/after-ecj/GetterInAnonymousClass.java b/test/transform/resource/after-ecj/GetterInAnonymousClass.java index 30e6338dcb..be04d505fd 100644 --- a/test/transform/resource/after-ecj/GetterInAnonymousClass.java +++ b/test/transform/resource/after-ecj/GetterInAnonymousClass.java @@ -6,7 +6,7 @@ public class GetterInAnonymousClass { Inner() { super(); } - public @java.lang.SuppressWarnings("all") String getString() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getString() { return this.string; } } diff --git a/test/transform/resource/after-ecj/GetterLazy.java b/test/transform/resource/after-ecj/GetterLazy.java index 7627ab1688..f7b94c7af8 100644 --- a/test/transform/resource/after-ecj/GetterLazy.java +++ b/test/transform/resource/after-ecj/GetterLazy.java @@ -8,7 +8,7 @@ static class ValueType { GetterLazy() { super(); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) ValueType getFieldName() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated ValueType getFieldName() { java.lang.Object $value = this.fieldName.get(); if (($value == null)) { diff --git a/test/transform/resource/after-ecj/GetterLazyArguments.java b/test/transform/resource/after-ecj/GetterLazyArguments.java index bb51c4fc1f..792592428b 100644 --- a/test/transform/resource/after-ecj/GetterLazyArguments.java +++ b/test/transform/resource/after-ecj/GetterLazyArguments.java @@ -17,7 +17,7 @@ static String stringInt(String arg1, Integer arg2) { static String stringRunnable(String arg1, Runnable arg2) { return null; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField1() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField1() { java.lang.Object $value = this.field1.get(); if (($value == null)) { @@ -34,7 +34,7 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field1) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField2() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField2() { java.lang.Object $value = this.field2.get(); if (($value == null)) { @@ -51,7 +51,7 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field2) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField3() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField3() { java.lang.Object $value = this.field3.get(); if (($value == null)) { @@ -68,7 +68,7 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field3) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField4() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField4() { java.lang.Object $value = this.field4.get(); if (($value == null)) { @@ -86,7 +86,7 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field4) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField5() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField5() { java.lang.Object $value = this.field5.get(); if (($value == null)) { @@ -104,7 +104,7 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field5) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField6() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField6() { java.lang.Object $value = this.field6.get(); if (($value == null)) { @@ -121,4 +121,4 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field6) ? null : $value); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterLazyBoolean.java b/test/transform/resource/after-ecj/GetterLazyBoolean.java index 40ecb856de..6f1bc0247f 100644 --- a/test/transform/resource/after-ecj/GetterLazyBoolean.java +++ b/test/transform/resource/after-ecj/GetterLazyBoolean.java @@ -7,7 +7,7 @@ private static boolean calculateBoolean() { return true; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) boolean isBooleanValue() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated boolean isBooleanValue() { java.lang.Object $value = this.booleanValue.get(); if (($value == null)) { @@ -24,7 +24,7 @@ private static boolean calculateBoolean() { } return (java.lang.Boolean) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) boolean isOtherBooleanValue() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated boolean isOtherBooleanValue() { java.lang.Object $value = this.otherBooleanValue.get(); if (($value == null)) { @@ -41,7 +41,7 @@ private static boolean calculateBoolean() { } return (java.lang.Boolean) $value; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterLazyBoolean))) @@ -53,16 +53,16 @@ private static boolean calculateBoolean() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterLazyBoolean); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + (this.isBooleanValue() ? 79 : 97)); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("GetterLazyBoolean(booleanValue=" + this.isBooleanValue()) + ")"); } } diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java index f4f4ed37bd..bf43b77584 100644 --- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java +++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java @@ -4,7 +4,7 @@ GetterLazyEahcToString() { super(); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getValue() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getValue() { java.lang.Object $value = this.value.get(); if (($value == null)) { @@ -21,10 +21,10 @@ } return (String) (($value == this.value) ? null : $value); } - public @java.lang.SuppressWarnings("all") String getValue2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getValue2() { return this.value2; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterLazyEahcToString))) @@ -42,10 +42,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterLazyEahcToString); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $value = this.getValue(); @@ -54,7 +54,7 @@ result = ((result * PRIME) + (($value2 == null) ? 43 : $value2.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("GetterLazyEahcToString(value=" + this.getValue()) + ", value2=") + this.value2) + ")"); } } diff --git a/test/transform/resource/after-ecj/GetterLazyGenerics.java b/test/transform/resource/after-ecj/GetterLazyGenerics.java index 3a2a06c1ae..41674de399 100644 --- a/test/transform/resource/after-ecj/GetterLazyGenerics.java +++ b/test/transform/resource/after-ecj/GetterLazyGenerics.java @@ -7,7 +7,7 @@ class GetterLazyGenerics { public static E getAny() { return null; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) E getField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated E getField() { java.lang.Object $value = this.field.get(); if (($value == null)) { @@ -24,7 +24,7 @@ public static E getAny() { } return (E) (($value == this.field) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) long getField2() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated long getField2() { java.lang.Object $value = this.field2.get(); if (($value == null)) { @@ -41,4 +41,4 @@ public static E getAny() { } return (java.lang.Long) $value; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java b/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java index dadd8e71ec..f56a9dd2a7 100644 --- a/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java +++ b/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java @@ -6,7 +6,7 @@ class Inner { Inner() { super(); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getString() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getString() { java.lang.Object $value = this.string.get(); if (($value == null)) { diff --git a/test/transform/resource/after-ecj/GetterLazyInvalid.java b/test/transform/resource/after-ecj/GetterLazyInvalid.java index da89c333ee..227331c72d 100644 --- a/test/transform/resource/after-ecj/GetterLazyInvalid.java +++ b/test/transform/resource/after-ecj/GetterLazyInvalid.java @@ -27,7 +27,7 @@ class GetterLazyInvalidNone { GetterLazyInvalidClass() { super(); } - public @java.lang.SuppressWarnings("all") String getFieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFieldName() { return this.fieldName; } } diff --git a/test/transform/resource/after-ecj/GetterLazyNative.java b/test/transform/resource/after-ecj/GetterLazyNative.java index c2769c5123..32946ee036 100644 --- a/test/transform/resource/after-ecj/GetterLazyNative.java +++ b/test/transform/resource/after-ecj/GetterLazyNative.java @@ -11,7 +11,7 @@ class GetterLazyNative { GetterLazyNative() { super(); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) boolean isBooleanField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated boolean isBooleanField() { java.lang.Object $value = this.booleanField.get(); if (($value == null)) { @@ -28,7 +28,7 @@ class GetterLazyNative { } return (java.lang.Boolean) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) byte getByteField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated byte getByteField() { java.lang.Object $value = this.byteField.get(); if (($value == null)) { @@ -45,7 +45,7 @@ class GetterLazyNative { } return (java.lang.Byte) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) short getShortField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated short getShortField() { java.lang.Object $value = this.shortField.get(); if (($value == null)) { @@ -62,7 +62,7 @@ class GetterLazyNative { } return (java.lang.Short) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) int getIntField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated int getIntField() { java.lang.Object $value = this.intField.get(); if (($value == null)) { @@ -79,7 +79,7 @@ class GetterLazyNative { } return (java.lang.Integer) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) long getLongField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated long getLongField() { java.lang.Object $value = this.longField.get(); if (($value == null)) { @@ -96,7 +96,7 @@ class GetterLazyNative { } return (java.lang.Long) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) float getFloatField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated float getFloatField() { java.lang.Object $value = this.floatField.get(); if (($value == null)) { @@ -113,7 +113,7 @@ class GetterLazyNative { } return (java.lang.Float) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) double getDoubleField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated double getDoubleField() { java.lang.Object $value = this.doubleField.get(); if (($value == null)) { @@ -130,7 +130,7 @@ class GetterLazyNative { } return (java.lang.Double) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) char getCharField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated char getCharField() { java.lang.Object $value = this.charField.get(); if (($value == null)) { @@ -147,7 +147,7 @@ class GetterLazyNative { } return (java.lang.Character) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) int[] getIntArrayField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated int[] getIntArrayField() { java.lang.Object $value = this.intArrayField.get(); if (($value == null)) { diff --git a/test/transform/resource/after-ecj/GetterLazyTransient.java b/test/transform/resource/after-ecj/GetterLazyTransient.java index b97fe53315..3db9c8d4ad 100644 --- a/test/transform/resource/after-ecj/GetterLazyTransient.java +++ b/test/transform/resource/after-ecj/GetterLazyTransient.java @@ -5,7 +5,7 @@ class GetterLazyTransient { GetterLazyTransient() { super(); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) int getNonTransientField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated int getNonTransientField() { java.lang.Object $value = this.nonTransientField.get(); if (($value == null)) { @@ -22,7 +22,7 @@ class GetterLazyTransient { } return (java.lang.Integer) $value; } - public @java.lang.SuppressWarnings("all") int getNonLazyTransientField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getNonLazyTransientField() { return this.nonLazyTransientField; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterNone.java b/test/transform/resource/after-ecj/GetterNone.java index f08726d093..801f3cd2bf 100644 --- a/test/transform/resource/after-ecj/GetterNone.java +++ b/test/transform/resource/after-ecj/GetterNone.java @@ -6,7 +6,7 @@ GetterNone() { super(); } - public @java.lang.SuppressWarnings("all") int getI() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/GetterOnClass.java b/test/transform/resource/after-ecj/GetterOnClass.java index 7668c9d326..6f1cad0f07 100644 --- a/test/transform/resource/after-ecj/GetterOnClass.java +++ b/test/transform/resource/after-ecj/GetterOnClass.java @@ -4,7 +4,7 @@ GetterOnClass1() { super(); } - public @java.lang.SuppressWarnings("all") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPublic() { return this.isPublic; } } @@ -15,10 +15,10 @@ GetterOnClass2() { super(); } - @java.lang.SuppressWarnings("all") boolean isPackage() { + @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPackage() { return this.isPackage; } - protected @java.lang.SuppressWarnings("all") boolean isProtected() { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean isProtected() { return this.isProtected; } } @@ -28,7 +28,7 @@ GetterOnClass3() { super(); } - @java.lang.SuppressWarnings("all") boolean isPackage() { + @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPackage() { return this.isPackage; } } @@ -38,7 +38,7 @@ GetterOnClass4() { super(); } - private @java.lang.SuppressWarnings("all") boolean isPrivate() { + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPrivate() { return this.isPrivate; } } @@ -48,7 +48,7 @@ GetterOnClass5() { super(); } - public @java.lang.SuppressWarnings("all") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPublic() { return this.isPublic; } } @@ -58,10 +58,10 @@ GetterOnClass6() { super(); } - public @java.lang.SuppressWarnings("all") String getCouldBeNull() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getCouldBeNull() { return this.couldBeNull; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") String getNonNull() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated String getNonNull() { return this.nonNull; } } diff --git a/test/transform/resource/after-ecj/GetterOnMethod.java b/test/transform/resource/after-ecj/GetterOnMethod.java index a21f628c8d..456b68a5ac 100644 --- a/test/transform/resource/after-ecj/GetterOnMethod.java +++ b/test/transform/resource/after-ecj/GetterOnMethod.java @@ -7,13 +7,13 @@ class GetterOnMethod { GetterOnMethod() { super(); } - public @Deprecated @java.lang.SuppressWarnings("all") int getI() { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") int getJ() { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @lombok.Generated int getJ() { return this.j; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") int getK() { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @lombok.Generated int getK() { return this.k; } } diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java index bfaa5dd4a8..e2b9db3369 100644 --- a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java +++ b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java @@ -12,28 +12,28 @@ class GetterOnMethodErrors2 { GetterOnMethodErrors2() { super(); } - public @java.lang.SuppressWarnings("all") int getBad1() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getBad1() { return this.bad1; } - public @java.lang.SuppressWarnings("all") int getBad2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getBad2() { return this.bad2; } - public @java.lang.SuppressWarnings("all") int getBad3() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getBad3() { return this.bad3; } - public @java.lang.SuppressWarnings("all") int getBad4() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getBad4() { return this.bad4; } - public @java.lang.SuppressWarnings("all") int getGood1() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getGood1() { return this.good1; } - public @java.lang.SuppressWarnings("all") int getGood2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getGood2() { return this.good2; } - public @Deprecated @java.lang.SuppressWarnings("all") int getGood3() { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated int getGood3() { return this.good3; } - public @Deprecated @Test @java.lang.SuppressWarnings("all") int getGood4() { + public @Deprecated @Test @java.lang.SuppressWarnings("all") @lombok.Generated int getGood4() { return this.good4; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterOnMethodOnType.java b/test/transform/resource/after-ecj/GetterOnMethodOnType.java index 2b39abf254..f1a2a10843 100644 --- a/test/transform/resource/after-ecj/GetterOnMethodOnType.java +++ b/test/transform/resource/after-ecj/GetterOnMethodOnType.java @@ -4,10 +4,10 @@ GetterOnMethodOnType() { super(); } - public @Deprecated @java.lang.SuppressWarnings("all") int getTest() { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated int getTest() { return this.test; } - public @Deprecated @java.lang.SuppressWarnings("all") String getName() { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterOnStatic.java b/test/transform/resource/after-ecj/GetterOnStatic.java index ee90b89763..441266f4b3 100644 --- a/test/transform/resource/after-ecj/GetterOnStatic.java +++ b/test/transform/resource/after-ecj/GetterOnStatic.java @@ -6,10 +6,10 @@ class Getter { Getter() { super(); } - public static @java.lang.SuppressWarnings("all") boolean isFoo() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated boolean isFoo() { return Getter.foo; } - public static @java.lang.SuppressWarnings("all") int getBar() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated int getBar() { return Getter.bar; } } diff --git a/test/transform/resource/after-ecj/GetterPlain.java b/test/transform/resource/after-ecj/GetterPlain.java index 10f0f9d75b..2d18ac7e75 100644 --- a/test/transform/resource/after-ecj/GetterPlain.java +++ b/test/transform/resource/after-ecj/GetterPlain.java @@ -5,10 +5,10 @@ class GetterPlain { GetterPlain() { super(); } - public @java.lang.SuppressWarnings("all") int getI() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } - public @java.lang.SuppressWarnings("all") int getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterSetterJavadoc.java b/test/transform/resource/after-ecj/GetterSetterJavadoc.java index c3308c51be..03ac4075ff 100644 --- a/test/transform/resource/after-ecj/GetterSetterJavadoc.java +++ b/test/transform/resource/after-ecj/GetterSetterJavadoc.java @@ -5,7 +5,7 @@ * * @return Sky is blue1 */ - public @java.lang.SuppressWarnings("all") int getFieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getFieldName() { return this.fieldName; } /** @@ -13,10 +13,10 @@ * * @param fieldName Hello, World1 */ - public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterSetterJavadoc1))) @@ -28,19 +28,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterSetterJavadoc1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getFieldName()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("GetterSetterJavadoc1(fieldName=" + this.getFieldName()) + ")"); } - public @java.lang.SuppressWarnings("all") GetterSetterJavadoc1() { + public @java.lang.SuppressWarnings("all") @lombok.Generated GetterSetterJavadoc1() { super(); } } @@ -54,7 +54,7 @@ class GetterSetterJavadoc2 { * * @return Sky is blue2 */ - public @java.lang.SuppressWarnings("all") int getFieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getFieldName() { return this.fieldName; } /** @@ -62,7 +62,7 @@ class GetterSetterJavadoc2 { * * @param fieldName Hello, World2 */ - public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } } @@ -75,14 +75,14 @@ class GetterSetterJavadoc3 { * Getter section * @return Sky is blue3 */ - public @java.lang.SuppressWarnings("all") int getFieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getFieldName() { return this.fieldName; } /** * Setter section * @param fieldName Hello, World3 */ - public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } } @@ -96,7 +96,7 @@ class GetterSetterJavadoc3 { * * @return Sky is blue4 */ - public @java.lang.SuppressWarnings("all") int fieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int fieldName() { return this.fieldName; } /** @@ -105,7 +105,7 @@ class GetterSetterJavadoc3 { * @param fieldName Hello, World4 * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") GetterSetterJavadoc4 fieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated GetterSetterJavadoc4 fieldName(final int fieldName) { this.fieldName = fieldName; return this; } @@ -119,7 +119,7 @@ class GetterSetterJavadoc3 { * Getter section * @return Sky is blue5 */ - public @java.lang.SuppressWarnings("all") int fieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int fieldName() { return this.fieldName; } /** @@ -127,8 +127,8 @@ class GetterSetterJavadoc3 { * @param fieldName Hello, World5 * @return Sky is blue5 */ - public @java.lang.SuppressWarnings("all") GetterSetterJavadoc5 fieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated GetterSetterJavadoc5 fieldName(final int fieldName) { this.fieldName = fieldName; return this; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterTypeAnnos.java b/test/transform/resource/after-ecj/GetterTypeAnnos.java index 9ffc7f1cd4..59deba6362 100644 --- a/test/transform/resource/after-ecj/GetterTypeAnnos.java +++ b/test/transform/resource/after-ecj/GetterTypeAnnos.java @@ -11,7 +11,7 @@ class GetterTypeAnnos { GetterTypeAnnos() { super(); } - public @TA @java.lang.SuppressWarnings("all") List getFoo() { + public @TA @java.lang.SuppressWarnings("all") @lombok.Generated List getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterWithDollar.java b/test/transform/resource/after-ecj/GetterWithDollar.java index f4bc799cb5..1f07a8cfed 100644 --- a/test/transform/resource/after-ecj/GetterWithDollar.java +++ b/test/transform/resource/after-ecj/GetterWithDollar.java @@ -3,7 +3,7 @@ class GetterWithDollar1 { GetterWithDollar1() { super(); } - public @java.lang.SuppressWarnings("all") int get$i() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int get$i() { return this.$i; } } @@ -13,10 +13,10 @@ class GetterWithDollar2 { GetterWithDollar2() { super(); } - public @java.lang.SuppressWarnings("all") int get$i() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int get$i() { return this.$i; } - public @java.lang.SuppressWarnings("all") int getI() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java index 745529a0d9..a016e411ac 100644 --- a/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java @@ -4,10 +4,10 @@ class GetterWithJavaBeansSpecCapitalization { GetterWithJavaBeansSpecCapitalization() { super(); } - public @java.lang.SuppressWarnings("all") int getA() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getA() { return this.a; } - public @java.lang.SuppressWarnings("all") int getaField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getaField() { return this.aField; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java b/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java index 393fe42a83..97a1dad874 100644 --- a/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java +++ b/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java @@ -1,29 +1,29 @@ import lombok.Builder; public @Builder class I2335_BuilderMultipleObtainVia { - public static @java.lang.SuppressWarnings("all") class I2335_BuilderMultipleObtainViaBuilder { - private @java.lang.SuppressWarnings("all") String theString; - private @java.lang.SuppressWarnings("all") Long theLong; - @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainViaBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class I2335_BuilderMultipleObtainViaBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String theString; + private @java.lang.SuppressWarnings("all") @lombok.Generated Long theLong; + @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainViaBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theString(final String theString) { + public @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theString(final String theString) { this.theString = theString; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theLong(final Long theLong) { + public @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theLong(final Long theLong) { this.theLong = theLong; return this; } - public @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainVia build() { return new I2335_BuilderMultipleObtainVia(this.theString, this.theLong); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder(theString=" + this.theString) + ", theLong=") + this.theLong) + ")"); } } @@ -46,10 +46,10 @@ public void setTheString(String theString) { public void setTheLong(Long theLong) { this.theLong = theLong; } - public static @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder builder() { return new I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder(); } - public @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder toBuilder() { final String theString = this.getTheString(); final Long theLong = this.getTheLong(); return new I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder().theString(theString).theLong(theLong); diff --git a/test/transform/resource/after-ecj/InnerClass.java b/test/transform/resource/after-ecj/InnerClass.java index 3200422599..43da8956a3 100644 --- a/test/transform/resource/after-ecj/InnerClass.java +++ b/test/transform/resource/after-ecj/InnerClass.java @@ -1,7 +1,7 @@ class A { @lombok.AllArgsConstructor class B { String s; - public @java.lang.SuppressWarnings("all") B(final String s) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B(final String s) { super(); this.s = s; } @@ -20,10 +20,10 @@ A.B test(String s) { } }; } - public @java.lang.SuppressWarnings("all") A getA() { + public @java.lang.SuppressWarnings("all") @lombok.Generated A getA() { return this.a; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof C.D))) @@ -35,17 +35,17 @@ A.B test(String s) { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $a = this.getA(); result = ((result * PRIME) + (($a == null) ? 43 : $a.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("C.D(a=" + this.getA()) + ")"); } - public @java.lang.SuppressWarnings("all") D(final A a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated D(final A a) { super(); this.a = a; } diff --git a/test/transform/resource/after-ecj/JacksonBuilderSingular.java b/test/transform/resource/after-ecj/JacksonBuilderSingular.java index 50f6a797be..309a09accf 100644 --- a/test/transform/resource/after-ecj/JacksonBuilderSingular.java +++ b/test/transform/resource/after-ecj/JacksonBuilderSingular.java @@ -8,16 +8,16 @@ import lombok.Singular; import lombok.extern.jackson.Jacksonized; public @Jacksonized @Builder @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonBuilderSingular.JacksonBuilderSingularBuilder.class) class JacksonBuilderSingular { - public static @java.lang.SuppressWarnings("all") @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonBuilderSingularBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList any$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList any$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList values; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableMap.Builder guavaAny; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder guavaValues; - @java.lang.SuppressWarnings("all") JacksonBuilderSingularBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonBuilderSingularBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList any$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList any$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList values; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableMap.Builder guavaAny; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder guavaValues; + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingularBuilder() { super(); } - public @JsonAnySetter @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final String anyKey, final Object anyValue) { + public @JsonAnySetter @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final String anyKey, final Object anyValue) { if ((this.any$key == null)) { this.any$key = new java.util.ArrayList(); @@ -27,7 +27,7 @@ this.any$value.add(anyValue); return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final java.util.Map any) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final java.util.Map any) { if ((any == null)) { throw new java.lang.NullPointerException("any cannot be null"); @@ -44,7 +44,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder clearAny() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder clearAny() { if ((this.any$key != null)) { this.any$key.clear(); @@ -52,13 +52,13 @@ } return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder value(final String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder value(final String value) { if ((this.values == null)) this.values = new java.util.ArrayList(); this.values.add(value); return this; } - public @JsonProperty("v_a_l_u_e_s") @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder values(final java.util.Collection values) { + public @JsonProperty("v_a_l_u_e_s") @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder values(final java.util.Collection values) { if ((values == null)) { throw new java.lang.NullPointerException("values cannot be null"); @@ -68,18 +68,18 @@ this.values.addAll(values); return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder clearValues() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder clearValues() { if ((this.values != null)) this.values.clear(); return this; } - public @JsonAnySetter @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final String key, final Object value) { + public @JsonAnySetter @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final String key, final Object value) { if ((this.guavaAny == null)) this.guavaAny = com.google.common.collect.ImmutableMap.builder(); this.guavaAny.put(key, value); return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final java.util.Map guavaAny) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final java.util.Map guavaAny) { if ((guavaAny == null)) { throw new java.lang.NullPointerException("guavaAny cannot be null"); @@ -89,17 +89,17 @@ this.guavaAny.putAll(guavaAny); return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaAny() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaAny() { this.guavaAny = null; return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValue(final String guavaValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValue(final String guavaValue) { if ((this.guavaValues == null)) this.guavaValues = com.google.common.collect.ImmutableList.builder(); this.guavaValues.add(guavaValue); return this; } - public @JsonProperty("guava_v_a_l_u_e_s") @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValues(final java.lang.Iterable guavaValues) { + public @JsonProperty("guava_v_a_l_u_e_s") @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValues(final java.lang.Iterable guavaValues) { if ((guavaValues == null)) { throw new java.lang.NullPointerException("guavaValues cannot be null"); @@ -109,11 +109,11 @@ this.guavaValues.addAll(guavaValues); return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaValues() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaValues() { this.guavaValues = null; return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular build() { java.util.Map any; switch (((this.any$key == null) ? 0 : this.any$key.size())) { case 0 : @@ -143,7 +143,7 @@ com.google.common.collect.ImmutableList guavaValues = ((this.guavaValues == null) ? com.google.common.collect.ImmutableList.of() : this.guavaValues.build()); return new JacksonBuilderSingular(any, values, guavaAny, guavaValues); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((("JacksonBuilderSingular.JacksonBuilderSingularBuilder(any$key=" + this.any$key) + ", any$value=") + this.any$value) + ", values=") + this.values) + ", guavaAny=") + this.guavaAny) + ", guavaValues=") + this.guavaValues) + ")"); } } @@ -151,14 +151,14 @@ private @JsonProperty("v_a_l_u_e_s") @Singular List values; private @JsonAnySetter @Singular("guavaAny") ImmutableMap guavaAny; private @JsonProperty("guava_v_a_l_u_e_s") @Singular ImmutableList guavaValues; - @java.lang.SuppressWarnings("all") JacksonBuilderSingular(final Map any, final List values, final ImmutableMap guavaAny, final ImmutableList guavaValues) { + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular(final Map any, final List values, final ImmutableMap guavaAny, final ImmutableList guavaValues) { super(); this.any = any; this.values = values; this.guavaAny = guavaAny; this.guavaValues = guavaValues; } - public static @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder builder() { return new JacksonBuilderSingular.JacksonBuilderSingularBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/JacksonJsonProperty.java b/test/transform/resource/after-ecj/JacksonJsonProperty.java index c6d3d29002..50f236bf77 100644 --- a/test/transform/resource/after-ecj/JacksonJsonProperty.java +++ b/test/transform/resource/after-ecj/JacksonJsonProperty.java @@ -4,34 +4,34 @@ import lombok.Builder; import lombok.Setter; public @Builder class JacksonJsonProperty { - public static @java.lang.SuppressWarnings("all") class JacksonJsonPropertyBuilder { - private @java.lang.SuppressWarnings("all") String kebabCaseProp; - @java.lang.SuppressWarnings("all") JacksonJsonPropertyBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class JacksonJsonPropertyBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String kebabCaseProp; + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonJsonPropertyBuilder() { super(); } /** * @return {@code this}. */ - public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") JacksonJsonProperty.JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { + public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") @lombok.Generated JacksonJsonProperty.JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; return this; } - public @java.lang.SuppressWarnings("all") JacksonJsonProperty build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonJsonProperty build() { return new JacksonJsonProperty(this.kebabCaseProp); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("JacksonJsonProperty.JacksonJsonPropertyBuilder(kebabCaseProp=" + this.kebabCaseProp) + ")"); } } public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @Setter String kebabCaseProp; - @java.lang.SuppressWarnings("all") JacksonJsonProperty(final String kebabCaseProp) { + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonJsonProperty(final String kebabCaseProp) { super(); this.kebabCaseProp = kebabCaseProp; } - public static @java.lang.SuppressWarnings("all") JacksonJsonProperty.JacksonJsonPropertyBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonJsonProperty.JacksonJsonPropertyBuilder builder() { return new JacksonJsonProperty.JacksonJsonPropertyBuilder(); } - public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") void setKebabCaseProp(final String kebabCaseProp) { + public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") @lombok.Generated void setKebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java b/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java index 6b95a6a2f2..fc2d095fc1 100644 --- a/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java +++ b/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java @@ -2,46 +2,46 @@ import lombok.Builder; import lombok.extern.jackson.Jacksonized; @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedBuilderComplex.TestVoidName.class) class JacksonizedBuilderComplex { - public static @java.lang.SuppressWarnings("all") @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "with",buildMethodName = "execute") class TestVoidName { - private @java.lang.SuppressWarnings("all") T number; - private @java.lang.SuppressWarnings("all") int arg2; - private @java.lang.SuppressWarnings("all") String arg3; - private @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex selfRef; - @java.lang.SuppressWarnings("all") TestVoidName() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "with",buildMethodName = "execute") class TestVoidName { + private @java.lang.SuppressWarnings("all") @lombok.Generated T number; + private @java.lang.SuppressWarnings("all") @lombok.Generated int arg2; + private @java.lang.SuppressWarnings("all") @lombok.Generated String arg3; + private @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex selfRef; + @java.lang.SuppressWarnings("all") @lombok.Generated TestVoidName() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName withNumber(final T number) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex.TestVoidName withNumber(final T number) { this.number = number; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName withArg2(final int arg2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex.TestVoidName withArg2(final int arg2) { this.arg2 = arg2; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName withArg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex.TestVoidName withArg3(final String arg3) { this.arg3 = arg3; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName withSelfRef(final JacksonizedBuilderComplex selfRef) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex.TestVoidName withSelfRef(final JacksonizedBuilderComplex selfRef) { this.selfRef = selfRef; return this; } - public @java.lang.SuppressWarnings("all") void execute() { + public @java.lang.SuppressWarnings("all") @lombok.Generated void execute() { JacksonizedBuilderComplex.testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("JacksonizedBuilderComplex.TestVoidName(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")"); } } @@ -50,7 +50,7 @@ } private static @Jacksonized @Builder(buildMethodName = "execute",setterPrefix = "with") void testVoidWithGenerics(T number, int arg2, String arg3, JacksonizedBuilderComplex selfRef) { } - public static @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex.TestVoidName builder() { return new JacksonizedBuilderComplex.TestVoidName(); } } diff --git a/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java b/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java index 87910d4770..cc23c03a5f 100644 --- a/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java +++ b/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java @@ -1,31 +1,30 @@ import java.util.List; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @lombok.extern.jackson.Jacksonized @JsonIgnoreProperties(ignoreUnknown = true) @lombok.Builder(access = lombok.AccessLevel.PROTECTED) @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder.class) class JacksonizedBuilderSimple { - protected static @java.lang.SuppressWarnings("all") @JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonizedBuilderSimpleBuilder { - private @java.lang.SuppressWarnings("all") int yes; - private @java.lang.SuppressWarnings("all") List also; - @java.lang.SuppressWarnings("all") JacksonizedBuilderSimpleBuilder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated @JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonizedBuilderSimpleBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int yes; + private @java.lang.SuppressWarnings("all") @lombok.Generated List also; + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimpleBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder yes(final int yes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder also(final List also) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder also(final List also) { this.also = also; return this; } - public @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimple build() { return new JacksonizedBuilderSimple(this.yes, this.also); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder(yes=" + this.yes) + ", also=") + this.also) + ")"); } } @@ -33,12 +32,12 @@ private final int yes; private List also; private int $butNotMe; - @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple(final int yes, final List also) { + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimple(final int yes, final List also) { super(); this.yes = yes; this.also = also; } - protected static @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder builder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder builder() { return new JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder(); } } diff --git a/test/transform/resource/after-ecj/JacksonizedOnRecord.java b/test/transform/resource/after-ecj/JacksonizedOnRecord.java index 3a27e2602f..c837ce98bf 100644 --- a/test/transform/resource/after-ecj/JacksonizedOnRecord.java +++ b/test/transform/resource/after-ecj/JacksonizedOnRecord.java @@ -4,26 +4,26 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; public @lombok.extern.jackson.Jacksonized @lombok.Builder @JsonIgnoreProperties @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedOnRecord.JacksonizedOnRecordBuilder.class) record JacksonizedOnRecord(String string, List values) { - public static @java.lang.SuppressWarnings("all") @JsonIgnoreProperties @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonizedOnRecordBuilder { - private @java.lang.SuppressWarnings("all") String string; - private @java.lang.SuppressWarnings("all") java.util.ArrayList values; - @java.lang.SuppressWarnings("all") JacksonizedOnRecordBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated @JsonIgnoreProperties @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonizedOnRecordBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String string; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList values; + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecordBuilder() { super(); } /** * @return {@code this}. */ - public @JsonProperty("test") @java.lang.SuppressWarnings("all") JacksonizedOnRecord.JacksonizedOnRecordBuilder string(final @Nullable String string) { + public @JsonProperty("test") @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord.JacksonizedOnRecordBuilder string(final @Nullable String string) { this.string = string; return this; } - public @JsonAnySetter @java.lang.SuppressWarnings("all") JacksonizedOnRecord.JacksonizedOnRecordBuilder value(final String value) { + public @JsonAnySetter @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord.JacksonizedOnRecordBuilder value(final String value) { if ((this.values == null)) this.values = new java.util.ArrayList(); this.values.add(value); return this; } - public @java.lang.SuppressWarnings("all") JacksonizedOnRecord.JacksonizedOnRecordBuilder values(final java.util.Collection values) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord.JacksonizedOnRecordBuilder values(final java.util.Collection values) { if ((values == null)) { throw new java.lang.NullPointerException("values cannot be null"); @@ -33,12 +33,12 @@ this.values.addAll(values); return this; } - public @java.lang.SuppressWarnings("all") JacksonizedOnRecord.JacksonizedOnRecordBuilder clearValues() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord.JacksonizedOnRecordBuilder clearValues() { if ((this.values != null)) this.values.clear(); return this; } - public @java.lang.SuppressWarnings("all") JacksonizedOnRecord build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord build() { java.util.List values; switch (((this.values == null) ? 0 : this.values.size())) { case 0 : @@ -52,13 +52,13 @@ } return new JacksonizedOnRecord(this.string, values); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("JacksonizedOnRecord.JacksonizedOnRecordBuilder(string=" + this.string) + ", values=") + this.values) + ")"); } } /* Implicit */ private final String string; /* Implicit */ private final List values; - public static @java.lang.SuppressWarnings("all") JacksonizedOnRecord.JacksonizedOnRecordBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord.JacksonizedOnRecordBuilder builder() { return new JacksonizedOnRecord.JacksonizedOnRecordBuilder(); } } diff --git a/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java b/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java index 348d91a20a..2d6d7f0b61 100644 --- a/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java +++ b/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java @@ -1,40 +1,40 @@ public class JacksonizedSuperBuilderSimple { public static @lombok.extern.jackson.Jacksonized @lombok.experimental.SuperBuilder @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl.class) class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final int field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final int field1) { this.field1 = field1; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("JacksonizedSuperBuilderSimple.Parent.ParentBuilder(field1=" + this.field1) + ")"); } } - static final @java.lang.SuppressWarnings("all") @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class ParentBuilderImpl extends JacksonizedSuperBuilderSimple.Parent.ParentBuilder { + static final @java.lang.SuppressWarnings("all") @lombok.Generated @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class ParentBuilderImpl extends JacksonizedSuperBuilderSimple.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderSimple.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderSimple.Parent build() { return new JacksonizedSuperBuilderSimple.Parent(this); } } int field1; - protected @java.lang.SuppressWarnings("all") Parent(final JacksonizedSuperBuilderSimple.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final JacksonizedSuperBuilderSimple.Parent.ParentBuilder b) { super(); this.field1 = b.field1; } - public static @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderSimple.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderSimple.Parent.ParentBuilder builder() { return new JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl(); } } @@ -44,4 +44,4 @@ public JacksonizedSuperBuilderSimple() { public static void test() { Parent x = Parent.builder().field1(5).build(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java b/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java index a72da70b2c..b991dbf6e3 100644 --- a/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java +++ b/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java @@ -1,39 +1,39 @@ public @lombok.extern.jackson.Jacksonized @lombok.experimental.SuperBuilder @com.fasterxml.jackson.databind.annotation.JsonDeserialize class JacksonizedSuperBuilderWithJsonDeserialize { - public static abstract @java.lang.SuppressWarnings("all") class JacksonizedSuperBuilderWithJsonDeserializeBuilder> { - private @java.lang.SuppressWarnings("all") int field1; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class JacksonizedSuperBuilderWithJsonDeserializeBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public JacksonizedSuperBuilderWithJsonDeserializeBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final int field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final int field1) { this.field1 = field1; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder(field1=" + this.field1) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl extends JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl extends JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder { private JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderWithJsonDeserialize build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderWithJsonDeserialize build() { return new JacksonizedSuperBuilderWithJsonDeserialize(this); } } int field1; - protected @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderWithJsonDeserialize(final JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderWithJsonDeserialize(final JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder b) { super(); this.field1 = b.field1; } - public static @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder builder() { return new JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/JavadocMultiline.java b/test/transform/resource/after-ecj/JavadocMultiline.java index bf05897580..0341783084 100644 --- a/test/transform/resource/after-ecj/JavadocMultiline.java +++ b/test/transform/resource/after-ecj/JavadocMultiline.java @@ -10,13 +10,13 @@ * @return A list of booleans to set for this object. This is a Javadoc return that is long * enough to wrap to multiple lines. */ - public @java.lang.SuppressWarnings("all") java.util.List getBooleans() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.util.List getBooleans() { return this.booleans; } /** * This is a list of booleans. */ - public @java.lang.SuppressWarnings("all") java.util.List getBooleans2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.util.List getBooleans2() { return this.booleans2; } /** @@ -25,7 +25,7 @@ * @param booleans A list of booleans to set for this object. This is a Javadoc param that is * long enough to wrap to multiple lines. */ - public @java.lang.SuppressWarnings("all") void setBooleans(final java.util.List booleans) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setBooleans(final java.util.List booleans) { this.booleans = booleans; } /** @@ -34,7 +34,7 @@ * @param booleans A list of booleans to set for this object. This is a Javadoc param that is * long enough to wrap to multiple lines. */ - public @java.lang.SuppressWarnings("all") void setBooleans2(final java.util.List booleans2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setBooleans2(final java.util.List booleans2) { this.booleans2 = booleans2; } } diff --git a/test/transform/resource/after-ecj/MultiFieldGetter.java b/test/transform/resource/after-ecj/MultiFieldGetter.java index 151c61c852..727710f30a 100644 --- a/test/transform/resource/after-ecj/MultiFieldGetter.java +++ b/test/transform/resource/after-ecj/MultiFieldGetter.java @@ -6,10 +6,10 @@ class MultiFieldGetter { MultiFieldGetter() { super(); } - protected @java.lang.SuppressWarnings("all") int getX() { + protected @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - protected @java.lang.SuppressWarnings("all") int getY() { + protected @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } } @@ -19,10 +19,10 @@ class MultiFieldGetter { MultiFieldGetter2() { super(); } - @java.lang.SuppressWarnings("all") int getX() { + @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - @java.lang.SuppressWarnings("all") int getY() { + @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } } diff --git a/test/transform/resource/after-ecj/NoArgsConstructorForce.java b/test/transform/resource/after-ecj/NoArgsConstructorForce.java index 59713673e3..4dccf3ee63 100644 --- a/test/transform/resource/after-ecj/NoArgsConstructorForce.java +++ b/test/transform/resource/after-ecj/NoArgsConstructorForce.java @@ -4,10 +4,10 @@ private final Object[] o; private final java.util.List[] fullQualifiedList; private final String alreadyInitialized = "yes"; - public @java.lang.SuppressWarnings("all") NoArgsConstructorForce() { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsConstructorForce() { super(); this.i = null; this.o = null; this.fullQualifiedList = null; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java b/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java index a2bfe3bde1..272018c162 100644 --- a/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java +++ b/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java @@ -1,10 +1,10 @@ public class NoPrivateNoArgsConstructor { public static @lombok.Data class NoPrivateNoArgsConstructorData { private final int i; - public @java.lang.SuppressWarnings("all") int getI() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData))) @@ -16,29 +16,29 @@ public class NoPrivateNoArgsConstructor { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getI()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData(i=" + this.getI()) + ")"); } - public @java.lang.SuppressWarnings("all") NoPrivateNoArgsConstructorData(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoPrivateNoArgsConstructorData(final int i) { super(); this.i = i; } } public static final @lombok.Value class NoPrivateNoArgsConstructorValue { private final int i; - public @java.lang.SuppressWarnings("all") int getI() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue))) @@ -48,16 +48,16 @@ public class NoPrivateNoArgsConstructor { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getI()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue(i=" + this.getI()) + ")"); } - public @java.lang.SuppressWarnings("all") NoPrivateNoArgsConstructorValue(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoPrivateNoArgsConstructorValue(final int i) { super(); this.i = i; } @@ -65,4 +65,4 @@ public class NoPrivateNoArgsConstructor { public NoPrivateNoArgsConstructor() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java b/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java index 6f351854e3..88ce76fe1f 100644 --- a/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java +++ b/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java @@ -10,7 +10,7 @@ public NonNullExistingConstructorOnRecord(@NonNull String b) { throw new java.lang.NullPointerException("b is marked non-null but is null"); } } - public @java.lang.SuppressWarnings("all") NonNullExistingConstructorOnRecord(@NonNull String a, @NonNull String b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NonNullExistingConstructorOnRecord(@NonNull String a, @NonNull String b) { super(); if ((a == null)) { diff --git a/test/transform/resource/after-ecj/NonNullOnRecordSimple.java b/test/transform/resource/after-ecj/NonNullOnRecordSimple.java index ee1510ea41..8a3002275a 100644 --- a/test/transform/resource/after-ecj/NonNullOnRecordSimple.java +++ b/test/transform/resource/after-ecj/NonNullOnRecordSimple.java @@ -3,7 +3,7 @@ public record NonNullOnRecordSimple(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - public @java.lang.SuppressWarnings("all") NonNullOnRecordSimple(@NonNull String a, @NonNull String b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NonNullOnRecordSimple(@NonNull String a, @NonNull String b) { super(); if ((a == null)) { diff --git a/test/transform/resource/after-ecj/NonNullOnRecordTypeUse.java b/test/transform/resource/after-ecj/NonNullOnRecordTypeUse.java index 4f040c2e78..ae2b344f0d 100644 --- a/test/transform/resource/after-ecj/NonNullOnRecordTypeUse.java +++ b/test/transform/resource/after-ecj/NonNullOnRecordTypeUse.java @@ -4,7 +4,7 @@ public record NonNullOnRecordTypeUse(int a, int b, int c) { /* Implicit */ private final int[] a; /* Implicit */ private final int @NonNull [] b; /* Implicit */ private final int[] @NonNull [] c; - public @java.lang.SuppressWarnings("all") NonNullOnRecordTypeUse(@NonNull int[] a, int @NonNull [] b, int[] @NonNull [] c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NonNullOnRecordTypeUse(@NonNull int[] a, int @NonNull [] b, int[] @NonNull [] c) { super(); if ((a == null)) { diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java index bf43cb7f17..d3308c482c 100644 --- a/test/transform/resource/after-ecj/NonNullPlain.java +++ b/test/transform/resource/after-ecj/NonNullPlain.java @@ -5,7 +5,7 @@ @lombok.NonNull int i; @lombok.NonNull String s; @NotNull Object o; - public @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) { super(); if ((s == null)) { @@ -14,26 +14,26 @@ this.i = i; this.s = s; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") int getI() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") String getS() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated String getS() { return this.s; } - public @java.lang.SuppressWarnings("all") Object getO() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Object getO() { return this.o; } - public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setI(final @lombok.NonNull int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") void setS(final @lombok.NonNull String s) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setS(final @lombok.NonNull String s) { if ((s == null)) { throw new java.lang.NullPointerException("s is marked non-null but is null"); } this.s = s; } - public @java.lang.SuppressWarnings("all") void setO(final Object o) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setO(final Object o) { this.o = o; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NonNullWithAlternateException.java b/test/transform/resource/after-ecj/NonNullWithAlternateException.java index 9a2a4e3d0d..1cae6b344d 100644 --- a/test/transform/resource/after-ecj/NonNullWithAlternateException.java +++ b/test/transform/resource/after-ecj/NonNullWithAlternateException.java @@ -10,11 +10,11 @@ public void testMethod(@lombok.NonNull String arg) { } System.out.println(arg); } - public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final @lombok.NonNull String test) { if ((test == null)) { throw new java.lang.IllegalArgumentException("test is marked non-null but is null"); } this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NonNullWithAssertion.java b/test/transform/resource/after-ecj/NonNullWithAssertion.java index d6f2b0f16c..3892c08b18 100644 --- a/test/transform/resource/after-ecj/NonNullWithAssertion.java +++ b/test/transform/resource/after-ecj/NonNullWithAssertion.java @@ -11,8 +11,8 @@ public void testMethodWithIf(@lombok.NonNull String arg) { if ((arg == null)) throw new NullPointerException("Oops"); } - public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final @lombok.NonNull String test) { assert (test != null): "test is marked non-null but is null"; this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NonNullWithGuava.java b/test/transform/resource/after-ecj/NonNullWithGuava.java index c7f5a7fe21..78e66b5625 100644 --- a/test/transform/resource/after-ecj/NonNullWithGuava.java +++ b/test/transform/resource/after-ecj/NonNullWithGuava.java @@ -29,7 +29,7 @@ public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { com.google.common.base.Preconditions.checkNotNull(arg, "arg is marked non-null but is null"); test = checkNotNull(test); } - public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final @lombok.NonNull String test) { com.google.common.base.Preconditions.checkNotNull(test, "test is marked non-null but is null"); this.test = test; } diff --git a/test/transform/resource/after-ecj/NonNullWithJdk.java b/test/transform/resource/after-ecj/NonNullWithJdk.java index 7d52226049..85877cbb89 100644 --- a/test/transform/resource/after-ecj/NonNullWithJdk.java +++ b/test/transform/resource/after-ecj/NonNullWithJdk.java @@ -30,7 +30,7 @@ public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { java.util.Objects.requireNonNull(arg, "arg is marked non-null but is null"); test = requireNonNull(test); } - public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final @lombok.NonNull String test) { java.util.Objects.requireNonNull(test, "test is marked non-null but is null"); this.test = test; } diff --git a/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java b/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java index f4a1c9922a..62984573f8 100644 --- a/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java @@ -2,19 +2,19 @@ import lombok.Singular; class NullAnnotatedCheckerFrameworkSuperBuilder { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") int y; - private @java.lang.SuppressWarnings("all") int z; - private @java.lang.SuppressWarnings("all") java.util.ArrayList names; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int y; + private @java.lang.SuppressWarnings("all") @lombok.Generated int z; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList names; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B x(final int x) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B x(final int x) { this.x$value = x; x$set = true; return self(); @@ -22,24 +22,24 @@ public ParentBuilder() { /** * @return {@code this}. */ - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B y(final int y) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B y(final int y) { this.y = y; return self(); } /** * @return {@code this}. */ - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B z(final int z) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B z(final int z) { this.z = z; return self(); } - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B name(final String name) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B name(final String name) { if ((this.names == null)) this.names = new java.util.ArrayList(); this.names.add(name); return self(); } - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B names(final java.util. @org.checkerframework.checker.nullness.qual.NonNull Collection names) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B names(final java.util. @org.checkerframework.checker.nullness.qual.NonNull Collection names) { if ((names == null)) { throw new java.lang.NullPointerException("names cannot be null"); @@ -49,25 +49,25 @@ public ParentBuilder() { this.names.addAll(names); return self(); } - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B clearNames() { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B clearNames() { if ((this.names != null)) this.names.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return (((((((("NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ", z=") + this.z) + ", names=") + this.names) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull Parent build() { return new NullAnnotatedCheckerFrameworkSuperBuilder.Parent(this); } } @@ -75,10 +75,10 @@ private ParentBuilderImpl() { int y; int z; @Singular List names; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - protected @java.lang.SuppressWarnings("all") Parent(final NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { super(); if (b.x$set) this.x = b.x$value; @@ -99,22 +99,22 @@ private ParentBuilderImpl() { } this.names = names; } - public static @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.nullness.qual.NonNull ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.nullness.qual.NonNull ParentBuilder builder() { return new NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class ZChild extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ZChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") int a$value; - private @java.lang.SuppressWarnings("all") boolean a$set; - private @java.lang.SuppressWarnings("all") int b; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ZChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int a$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean a$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int b; public ZChildBuilder() { super(); } /** * @return {@code this}. */ - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B a(final int a) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B a(final int a) { this.a$value = a; a$set = true; return self(); @@ -122,33 +122,33 @@ public ZChildBuilder() { /** * @return {@code this}. */ - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B b(final int b) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B b(final int b) { this.b = b; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return (((((("NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder(super=" + super.toString()) + ", a$value=") + this.a$value) + ", b=") + this.b) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ZChildBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ZChildBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { private ZChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull ZChild build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull ZChild build() { return new NullAnnotatedCheckerFrameworkSuperBuilder.ZChild(this); } } @lombok.Builder.Default int a; int b; - private static @java.lang.SuppressWarnings("all") int $default$a() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$a() { return 1; } - protected @java.lang.SuppressWarnings("all") ZChild(final NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated ZChild(final NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { super(b); if (b.a$set) this.a = b.a$value; @@ -156,11 +156,11 @@ private ZChildBuilderImpl() { this.a = NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.$default$a(); this.b = b.b; } - public static @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.nullness.qual.NonNull ZChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.nullness.qual.NonNull ZChildBuilder builder() { return new NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl(); } } NullAnnotatedCheckerFrameworkSuperBuilder() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NullLibrary1.java b/test/transform/resource/after-ecj/NullLibrary1.java index 5856f3b423..76940da1aa 100644 --- a/test/transform/resource/after-ecj/NullLibrary1.java +++ b/test/transform/resource/after-ecj/NullLibrary1.java @@ -3,10 +3,10 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @org.eclipse.jdt.annotation.NonNull @java.lang.SuppressWarnings("all") NullLibrary1 withFoo(final String foo) { + public @org.eclipse.jdt.annotation.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary1 withFoo(final String foo) { return ((this.foo == foo) ? this : new NullLibrary1(foo)); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.@org.eclipse.jdt.annotation.Nullable Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.@org.eclipse.jdt.annotation.Nullable Object o) { if ((o == this)) return true; if ((! (o instanceof NullLibrary1))) @@ -20,20 +20,20 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.@org.eclipse.jdt.annotation.Nullable Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.@org.eclipse.jdt.annotation.Nullable Object other) { return (other instanceof NullLibrary1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $foo = this.foo; result = ((result * PRIME) + (($foo == null) ? 43 : $foo.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.@org.eclipse.jdt.annotation.NonNull String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.@org.eclipse.jdt.annotation.NonNull String toString() { return (("NullLibrary1(foo=" + this.foo) + ")"); } - public @java.lang.SuppressWarnings("all") NullLibrary1(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary1(final String foo) { super(); this.foo = foo; } diff --git a/test/transform/resource/after-ecj/NullLibrary2.java b/test/transform/resource/after-ecj/NullLibrary2.java index e6a0723c49..7178d5dc93 100644 --- a/test/transform/resource/after-ecj/NullLibrary2.java +++ b/test/transform/resource/after-ecj/NullLibrary2.java @@ -3,10 +3,10 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") NullLibrary2 withFoo(final String foo) { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary2 withFoo(final String foo) { return ((this.foo == foo) ? this : new NullLibrary2(foo)); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @org.springframework.lang.Nullable java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final @org.springframework.lang.Nullable java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof NullLibrary2))) @@ -20,20 +20,20 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final @org.springframework.lang.Nullable java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final @org.springframework.lang.Nullable java.lang.Object other) { return (other instanceof NullLibrary2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $foo = this.foo; result = ((result * PRIME) + (($foo == null) ? 43 : $foo.hashCode())); return result; } - public @java.lang.Override @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("NullLibrary2(foo=" + this.foo) + ")"); } - public @java.lang.SuppressWarnings("all") NullLibrary2(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary2(final String foo) { super(); this.foo = foo; } diff --git a/test/transform/resource/after-ecj/NullLibrary3.java b/test/transform/resource/after-ecj/NullLibrary3.java index 6b6df80269..bd8d2630f9 100644 --- a/test/transform/resource/after-ecj/NullLibrary3.java +++ b/test/transform/resource/after-ecj/NullLibrary3.java @@ -3,14 +3,14 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @jakarta.annotation.Nonnull @java.lang.SuppressWarnings("all") NullLibrary3 withFoo(final @jakarta.annotation.Nonnull String foo) { + public @jakarta.annotation.Nonnull @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary3 withFoo(final @jakarta.annotation.Nonnull String foo) { if ((foo == null)) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); } return ((this.foo == foo) ? this : new NullLibrary3(foo)); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @jakarta.annotation.Nullable java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final @jakarta.annotation.Nullable java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof NullLibrary3))) @@ -24,20 +24,20 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final @jakarta.annotation.Nullable java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final @jakarta.annotation.Nullable java.lang.Object other) { return (other instanceof NullLibrary3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $foo = this.foo; result = ((result * PRIME) + (($foo == null) ? 43 : $foo.hashCode())); return result; } - public @java.lang.Override @jakarta.annotation.Nonnull @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @jakarta.annotation.Nonnull @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("NullLibrary3(foo=" + this.foo) + ")"); } - public @java.lang.SuppressWarnings("all") NullLibrary3(final @jakarta.annotation.Nonnull String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary3(final @jakarta.annotation.Nonnull String foo) { super(); if ((foo == null)) { @@ -45,4 +45,4 @@ } this.foo = foo; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/OnXJava7StyleOn8.java b/test/transform/resource/after-ecj/OnXJava7StyleOn8.java index f6d1c84568..a2538abd27 100644 --- a/test/transform/resource/after-ecj/OnXJava7StyleOn8.java +++ b/test/transform/resource/after-ecj/OnXJava7StyleOn8.java @@ -20,31 +20,31 @@ public class OnXJava7StyleOn8 { public OnXJava7StyleOn8() { super(); } - public @Foo @java.lang.SuppressWarnings("all") String getA() { + public @Foo @java.lang.SuppressWarnings("all") @lombok.Generated String getA() { return this.a; } - public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) { + public @Foo() @java.lang.SuppressWarnings("all") @lombok.Generated void setB(final String b) { this.b = b; } - public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setC(final @Foo("a") String c) { this.c = c; } - public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setD(final @Bar(stuff = "b") String d) { this.d = d; } - public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() { + public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @lombok.Generated String getE() { return this.e; } - public @Array @java.lang.SuppressWarnings("all") String getF() { + public @Array @java.lang.SuppressWarnings("all") @lombok.Generated String getF() { return this.f; } - public @Array() @java.lang.SuppressWarnings("all") String getG() { + public @Array() @java.lang.SuppressWarnings("all") @lombok.Generated String getG() { return this.g; } - public @Array({}) @java.lang.SuppressWarnings("all") String getH() { + public @Array({}) @java.lang.SuppressWarnings("all") @lombok.Generated String getH() { return this.h; } - public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") String getI() { + public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") @lombok.Generated String getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/OnXJava8Style.java b/test/transform/resource/after-ecj/OnXJava8Style.java index 540f614b54..804718e17d 100644 --- a/test/transform/resource/after-ecj/OnXJava8Style.java +++ b/test/transform/resource/after-ecj/OnXJava8Style.java @@ -20,31 +20,31 @@ public class OnXJava8Style { public OnXJava8Style() { super(); } - public @Foo @java.lang.SuppressWarnings("all") String getA() { + public @Foo @java.lang.SuppressWarnings("all") @lombok.Generated String getA() { return this.a; } - public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) { + public @Foo() @java.lang.SuppressWarnings("all") @lombok.Generated void setB(final String b) { this.b = b; } - public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setC(final @Foo("a") String c) { this.c = c; } - public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setD(final @Bar(stuff = "b") String d) { this.d = d; } - public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() { + public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @lombok.Generated String getE() { return this.e; } - public @Array @java.lang.SuppressWarnings("all") String getF() { + public @Array @java.lang.SuppressWarnings("all") @lombok.Generated String getF() { return this.f; } - public @Array() @java.lang.SuppressWarnings("all") String getG() { + public @Array() @java.lang.SuppressWarnings("all") @lombok.Generated String getG() { return this.g; } - public @Array({}) @java.lang.SuppressWarnings("all") String getH() { + public @Array({}) @java.lang.SuppressWarnings("all") @lombok.Generated String getH() { return this.h; } - public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") String getI() { + public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") @lombok.Generated String getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java b/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java index f0927bf8a5..41f45dbfdd 100644 --- a/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java +++ b/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java @@ -6,10 +6,10 @@ private Base() { } public static @lombok.Data class PrivateNoArgsConstructorNotOnExtends extends Base { private final int a; - public @java.lang.SuppressWarnings("all") int getA() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getA() { return this.a; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends))) @@ -23,29 +23,29 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = super.hashCode(); result = ((result * PRIME) + this.getA()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends(a=" + this.getA()) + ")"); } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorNotOnExtends(final int a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorNotOnExtends(final int a) { super(); this.a = a; } } public static @lombok.Data class PrivateNoArgsConstructorOnExtendsObject extends Object { private final int b; - public @java.lang.SuppressWarnings("all") int getB() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getB() { return this.b; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject))) @@ -57,37 +57,37 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getB()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject(b=" + this.getB()) + ")"); } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorOnExtendsObject(final int b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorOnExtendsObject(final int b) { super(); this.b = b; } - private @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorOnExtendsObject() { + private @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorOnExtendsObject() { super(); this.b = 0; } } public static @lombok.NoArgsConstructor(force = true) @lombok.Data @lombok.RequiredArgsConstructor class PrivateNoArgsConstructorExplicitBefore { private final int c; - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitBefore() { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorExplicitBefore() { super(); this.c = 0; } - public @java.lang.SuppressWarnings("all") int getC() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getC() { return this.c; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore))) @@ -99,29 +99,29 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getC()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore(c=" + this.getC()) + ")"); } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitBefore(final int c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorExplicitBefore(final int c) { super(); this.c = c; } } public static @lombok.Data @lombok.NoArgsConstructor(force = true) @lombok.RequiredArgsConstructor class PrivateNoArgsConstructorExplicitAfter { private final int d; - public @java.lang.SuppressWarnings("all") int getD() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getD() { return this.d; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter))) @@ -133,33 +133,33 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getD()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter(d=" + this.getD()) + ")"); } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitAfter() { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorExplicitAfter() { super(); this.d = 0; } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitAfter(final int d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorExplicitAfter(final int d) { super(); this.d = d; } } public static @lombok.Data @lombok.NoArgsConstructor(access = lombok.AccessLevel.NONE) @lombok.RequiredArgsConstructor class PrivateNoArgsConstructorExplicitNone { private final int e; - public @java.lang.SuppressWarnings("all") int getE() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getE() { return this.e; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone))) @@ -171,25 +171,25 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getE()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone(e=" + this.getE()) + ")"); } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitNone(final int e) { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorExplicitNone(final int e) { super(); this.e = e; } } public static @lombok.Data class PrivateNoArgsConstructorNoFields { - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields))) @@ -199,17 +199,17 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields()"; } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorNoFields() { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorNoFields() { super(); } } diff --git a/test/transform/resource/after-ecj/SetterAccessLevel.java b/test/transform/resource/after-ecj/SetterAccessLevel.java index 4c1a0b971a..76edc69cfd 100644 --- a/test/transform/resource/after-ecj/SetterAccessLevel.java +++ b/test/transform/resource/after-ecj/SetterAccessLevel.java @@ -8,19 +8,19 @@ class SetterAccessLevel { SetterAccessLevel() { super(); } - private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @lombok.Generated void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } - @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } - protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated void setProtected(final boolean isProtected) { this.isProtected = isProtected; } - public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } - public @java.lang.SuppressWarnings("all") void setValue(final boolean value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setValue(final boolean value) { this.value = value; } } diff --git a/test/transform/resource/after-ecj/SetterAlreadyExists.java b/test/transform/resource/after-ecj/SetterAlreadyExists.java index 91b011b6c0..f106d34546 100644 --- a/test/transform/resource/after-ecj/SetterAlreadyExists.java +++ b/test/transform/resource/after-ecj/SetterAlreadyExists.java @@ -37,7 +37,7 @@ class Setter5 { } void setFoo() { } - public @java.lang.SuppressWarnings("all") void setFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final String foo) { this.foo = foo; } } @@ -48,7 +48,7 @@ class Setter6 { } void setFoo(String foo, int x) { } - public @java.lang.SuppressWarnings("all") void setFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final String foo) { this.foo = foo; } } diff --git a/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java b/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java index c95b7bab1d..bb0b3782a0 100644 --- a/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java +++ b/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java @@ -11,7 +11,7 @@ class SetterAndWithMethodJavadoc { * Some value. * @param the new value */ - public @java.lang.SuppressWarnings("all") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setI(final int i) { this.i = i; } /** @@ -19,14 +19,14 @@ class SetterAndWithMethodJavadoc { * @param the new value * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") SetterAndWithMethodJavadoc withI(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated SetterAndWithMethodJavadoc withI(final int i) { return ((this.i == i) ? this : new SetterAndWithMethodJavadoc(i, this.j)); } /** * Set some other value. * @param the new other value */ - public @java.lang.SuppressWarnings("all") void setJ(final int j) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setJ(final int j) { this.j = j; } /** @@ -34,7 +34,7 @@ class SetterAndWithMethodJavadoc { * @param the other new other value * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") SetterAndWithMethodJavadoc withJ(final int j) { + public @java.lang.SuppressWarnings("all") @lombok.Generated SetterAndWithMethodJavadoc withJ(final int j) { return ((this.j == j) ? this : new SetterAndWithMethodJavadoc(this.i, j)); } } diff --git a/test/transform/resource/after-ecj/SetterDeprecated.java b/test/transform/resource/after-ecj/SetterDeprecated.java index cc0895661a..9442b3f187 100644 --- a/test/transform/resource/after-ecj/SetterDeprecated.java +++ b/test/transform/resource/after-ecj/SetterDeprecated.java @@ -5,13 +5,13 @@ class SetterDeprecated { SetterDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setAnnotation(final int annotation) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void setAnnotation(final int annotation) { this.annotation = annotation; } /** * @deprecated */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJavadoc(final int javadoc) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void setJavadoc(final int javadoc) { this.javadoc = javadoc; } } diff --git a/test/transform/resource/after-ecj/SetterInAnonymousClass.java b/test/transform/resource/after-ecj/SetterInAnonymousClass.java index fc0bf2d83b..a96fd84e4f 100644 --- a/test/transform/resource/after-ecj/SetterInAnonymousClass.java +++ b/test/transform/resource/after-ecj/SetterInAnonymousClass.java @@ -6,7 +6,7 @@ public class SetterInAnonymousClass { Inner() { super(); } - public @java.lang.SuppressWarnings("all") void setString(final String string) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setString(final String string) { this.string = string; } } diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java index 9ed77bd44c..80dd5e9cff 100644 --- a/test/transform/resource/after-ecj/SetterOnClass.java +++ b/test/transform/resource/after-ecj/SetterOnClass.java @@ -4,7 +4,7 @@ SetterOnClass1() { super(); } - public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } } @@ -15,10 +15,10 @@ SetterOnClass2() { super(); } - @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } - protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated void setProtected(final boolean isProtected) { this.isProtected = isProtected; } } @@ -28,7 +28,7 @@ SetterOnClass3() { super(); } - @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } } @@ -38,7 +38,7 @@ SetterOnClass4() { super(); } - private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @lombok.Generated void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } } @@ -48,7 +48,7 @@ SetterOnClass5() { super(); } - public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } } @@ -58,10 +58,10 @@ SetterOnClass6() { super(); } - public @java.lang.SuppressWarnings("all") void setCouldBeNull(final String couldBeNull) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setCouldBeNull(final String couldBeNull) { this.couldBeNull = couldBeNull; } - public @java.lang.SuppressWarnings("all") void setNonNull(final @lombok.NonNull String nonNull) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setNonNull(final @lombok.NonNull String nonNull) { if ((nonNull == null)) { throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); diff --git a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java index d4ea9f5de6..be25685908 100644 --- a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java +++ b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java @@ -7,13 +7,13 @@ class SetterOnMethodOnParam { SetterOnMethodOnParam() { super(); } - public @Deprecated @java.lang.SuppressWarnings("all") void setI(final int i) { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") void setJ(final @Test int j) { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @lombok.Generated void setJ(final @Test int j) { this.j = j; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") void setK(final @Test int k) { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @lombok.Generated void setK(final @Test int k) { this.k = k; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SetterOnStatic.java b/test/transform/resource/after-ecj/SetterOnStatic.java index 8a5abdd8e1..91d34a8d73 100644 --- a/test/transform/resource/after-ecj/SetterOnStatic.java +++ b/test/transform/resource/after-ecj/SetterOnStatic.java @@ -6,10 +6,10 @@ class Setter { Setter() { super(); } - public static @java.lang.SuppressWarnings("all") void setFoo(final boolean foo) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final boolean foo) { Setter.foo = foo; } - public static @java.lang.SuppressWarnings("all") void setBar(final int bar) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated void setBar(final int bar) { Setter.bar = bar; } } diff --git a/test/transform/resource/after-ecj/SetterPlain.java b/test/transform/resource/after-ecj/SetterPlain.java index a4b4029515..3991852f8d 100644 --- a/test/transform/resource/after-ecj/SetterPlain.java +++ b/test/transform/resource/after-ecj/SetterPlain.java @@ -5,10 +5,10 @@ class SetterPlain { SetterPlain() { super(); } - public @java.lang.SuppressWarnings("all") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") void setFoo(final int foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final int foo) { this.foo = foo; } } diff --git a/test/transform/resource/after-ecj/SetterTypeAnnos.java b/test/transform/resource/after-ecj/SetterTypeAnnos.java index 860694eae6..f07b7243d6 100644 --- a/test/transform/resource/after-ecj/SetterTypeAnnos.java +++ b/test/transform/resource/after-ecj/SetterTypeAnnos.java @@ -11,7 +11,7 @@ class SetterTypeAnnos { SetterTypeAnnos() { super(); } - public @java.lang.SuppressWarnings("all") void setFoo(final @TA List foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final @TA List foo) { this.foo = foo; } } diff --git a/test/transform/resource/after-ecj/SetterWithDollar.java b/test/transform/resource/after-ecj/SetterWithDollar.java index c5bc14f11d..64f8f0ad90 100644 --- a/test/transform/resource/after-ecj/SetterWithDollar.java +++ b/test/transform/resource/after-ecj/SetterWithDollar.java @@ -3,7 +3,7 @@ class SetterWithDollar1 { SetterWithDollar1() { super(); } - public @java.lang.SuppressWarnings("all") void set$i(final int $i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void set$i(final int $i) { this.$i = $i; } } @@ -13,10 +13,10 @@ class SetterWithDollar2 { SetterWithDollar2() { super(); } - public @java.lang.SuppressWarnings("all") void set$i(final int $i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void set$i(final int $i) { this.$i = $i; } - public @java.lang.SuppressWarnings("all") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setI(final int i) { this.i = i; } } diff --git a/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java index 4e99890a85..2d38d914cd 100644 --- a/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java @@ -4,10 +4,10 @@ class SetterWithJavaBeansSpecCapitalization { SetterWithJavaBeansSpecCapitalization() { super(); } - public @java.lang.SuppressWarnings("all") void setA(final int a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setA(final int a) { this.a = a; } - public @java.lang.SuppressWarnings("all") void setaField(final int aField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setaField(final int aField) { this.aField = aField; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SimpleTypeResolution.java b/test/transform/resource/after-ecj/SimpleTypeResolution.java index d8321ca49b..c072f3ed5b 100644 --- a/test/transform/resource/after-ecj/SimpleTypeResolution.java +++ b/test/transform/resource/after-ecj/SimpleTypeResolution.java @@ -9,7 +9,7 @@ class SimpleTypeResolutionSuccess { SimpleTypeResolutionSuccess() { super(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/SkipSuppressWarnings.java b/test/transform/resource/after-ecj/SkipSuppressWarnings.java index 76b79fe2ad..d9b638a4fe 100644 --- a/test/transform/resource/after-ecj/SkipSuppressWarnings.java +++ b/test/transform/resource/after-ecj/SkipSuppressWarnings.java @@ -4,10 +4,10 @@ class SkipSuppressWarnings { SkipSuppressWarnings() { super(); } - public String getField() { + public @lombok.Generated String getField() { return this.field; } - public @java.lang.SuppressWarnings({"unchecked"}) String getField2() { + public @java.lang.SuppressWarnings({"unchecked"}) @lombok.Generated String getField2() { java.lang.Object $value = this.field2.get(); if (($value == null)) { @@ -24,4 +24,4 @@ public String getField() { } return (String) (($value == this.field2) ? null : $value); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/StandardExceptions.java b/test/transform/resource/after-ecj/StandardExceptions.java index a26a16f790..b5e0f85801 100644 --- a/test/transform/resource/after-ecj/StandardExceptions.java +++ b/test/transform/resource/after-ecj/StandardExceptions.java @@ -1,16 +1,16 @@ import lombok.AccessLevel; import lombok.experimental.StandardException; @StandardException class EmptyException extends Exception { - public @java.lang.SuppressWarnings("all") EmptyException() { + public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException() { this(null, null); } - public @java.lang.SuppressWarnings("all") EmptyException(final java.lang.String message) { + public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException(final java.lang.String message) { this(message, null); } - public @java.lang.SuppressWarnings("all") EmptyException(final java.lang.Throwable cause) { + public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException(final java.lang.Throwable cause) { this(((cause != null) ? cause.getMessage() : null), cause); } - public @java.lang.SuppressWarnings("all") EmptyException(final java.lang.String message, final java.lang.Throwable cause) { + public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException(final java.lang.String message, final java.lang.Throwable cause) { super(message); if ((cause != null)) super.initCause(cause); @@ -20,15 +20,15 @@ public NoArgsException() { super(); } - protected @java.lang.SuppressWarnings("all") NoArgsException(final java.lang.String message) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsException(final java.lang.String message) { this(message, null); } - protected @java.lang.SuppressWarnings("all") NoArgsException(final java.lang.Throwable cause) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsException(final java.lang.Throwable cause) { this(((cause != null) ? cause.getMessage() : null), cause); } - protected @java.lang.SuppressWarnings("all") NoArgsException(final java.lang.String message, final java.lang.Throwable cause) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsException(final java.lang.String message, final java.lang.Throwable cause) { super(message); if ((cause != null)) super.initCause(cause); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/StaticConstructor.java b/test/transform/resource/after-ecj/StaticConstructor.java index 93308faa78..d639753209 100644 --- a/test/transform/resource/after-ecj/StaticConstructor.java +++ b/test/transform/resource/after-ecj/StaticConstructor.java @@ -1,11 +1,11 @@ import lombok.AllArgsConstructor; public @AllArgsConstructor(staticName = "of") class StaticConstructor { String name; - private @java.lang.SuppressWarnings("all") StaticConstructor(final String name) { + private @java.lang.SuppressWarnings("all") @lombok.Generated StaticConstructor(final String name) { super(); this.name = name; } - public static @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") StaticConstructor of(final String name) { + public static @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated StaticConstructor of(final String name) { return new StaticConstructor(name); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderAbstract.java b/test/transform/resource/after-ecj/SuperBuilderAbstract.java index c5d97c4502..1370ed55ba 100644 --- a/test/transform/resource/after-ecj/SuperBuilderAbstract.java +++ b/test/transform/resource/after-ecj/SuperBuilderAbstract.java @@ -1,104 +1,104 @@ public class SuperBuilderAbstract { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int parentField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int parentField; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B parentField(final int parentField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B parentField(final int parentField) { this.parentField = parentField; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderAbstract.Parent.ParentBuilder(parentField=" + this.parentField) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderAbstract.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderAbstract.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstract.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstract.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.Parent build() { return new SuperBuilderAbstract.Parent(this); } } int parentField; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderAbstract.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderAbstract.Parent.ParentBuilder b) { super(); this.parentField = b.parentField; } - public static @java.lang.SuppressWarnings("all") SuperBuilderAbstract.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.Parent.ParentBuilder builder() { return new SuperBuilderAbstract.Parent.ParentBuilderImpl(); } } public static abstract @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double childField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double childField; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B childField(final double childField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B childField(final double childField) { this.childField = childField; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderAbstract.Child.ChildBuilder(super=" + super.toString()) + ", childField=") + this.childField) + ")"); } } double childField; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderAbstract.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderAbstract.Child.ChildBuilder b) { super(b); this.childField = b.childField; } } public static @lombok.experimental.SuperBuilder class GrandChild extends Child { - public static abstract @java.lang.SuppressWarnings("all") class GrandChildBuilder> extends Child.ChildBuilder { - private @java.lang.SuppressWarnings("all") String grandChildField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GrandChildBuilder> extends Child.ChildBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String grandChildField; public GrandChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B grandChildField(final String grandChildField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B grandChildField(final String grandChildField) { this.grandChildField = grandChildField; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderAbstract.GrandChild.GrandChildBuilder(super=" + super.toString()) + ", grandChildField=") + this.grandChildField) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class GrandChildBuilderImpl extends SuperBuilderAbstract.GrandChild.GrandChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class GrandChildBuilderImpl extends SuperBuilderAbstract.GrandChild.GrandChildBuilder { private GrandChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstract.GrandChild build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.GrandChild build() { return new SuperBuilderAbstract.GrandChild(this); } } String grandChildField; - protected @java.lang.SuppressWarnings("all") GrandChild(final SuperBuilderAbstract.GrandChild.GrandChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated GrandChild(final SuperBuilderAbstract.GrandChild.GrandChildBuilder b) { super(b); this.grandChildField = b.grandChildField; } - public static @java.lang.SuppressWarnings("all") SuperBuilderAbstract.GrandChild.GrandChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.GrandChild.GrandChildBuilder builder() { return new SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java index 0ed393e95d..7467c511d8 100644 --- a/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java @@ -1,133 +1,133 @@ public class SuperBuilderAbstractToBuilder { public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int parentField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int parentField; public ParentBuilder() { super(); } - protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { SuperBuilderAbstractToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Parent instance, final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Parent instance, final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { b.parentField(instance.parentField); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B parentField(final int parentField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B parentField(final int parentField) { this.parentField = parentField; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderAbstractToBuilder.Parent.ParentBuilder(parentField=" + this.parentField) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderAbstractToBuilder.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderAbstractToBuilder.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.Parent build() { return new SuperBuilderAbstractToBuilder.Parent(this); } } int parentField; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { super(); this.parentField = b.parentField; } - public @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.Parent.ParentBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl(); } } public static abstract @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double childField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double childField; public ChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderAbstractToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Child instance, final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Child instance, final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { b.childField(instance.childField); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B childField(final double childField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B childField(final double childField) { this.childField = childField; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderAbstractToBuilder.Child.ChildBuilder(super=" + super.toString()) + ", childField=") + this.childField) + ")"); } } double childField; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { super(b); this.childField = b.childField; } } public static @lombok.experimental.SuperBuilder(toBuilder = true) class GrandChild extends Child { - public static abstract @java.lang.SuppressWarnings("all") class GrandChildBuilder> extends Child.ChildBuilder { - private @java.lang.SuppressWarnings("all") String grandChildField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GrandChildBuilder> extends Child.ChildBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String grandChildField; public GrandChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.GrandChild instance, final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.GrandChild instance, final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { b.grandChildField(instance.grandChildField); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B grandChildField(final String grandChildField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B grandChildField(final String grandChildField) { this.grandChildField = grandChildField; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder(super=" + super.toString()) + ", grandChildField=") + this.grandChildField) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class GrandChildBuilderImpl extends SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class GrandChildBuilderImpl extends SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder { private GrandChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.GrandChild build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.GrandChild build() { return new SuperBuilderAbstractToBuilder.GrandChild(this); } } String grandChildField; - protected @java.lang.SuppressWarnings("all") GrandChild(final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated GrandChild(final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { super(b); this.grandChildField = b.grandChildField; } - public @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder toBuilder() { return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder builder() { return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderBasic.java b/test/transform/resource/after-ecj/SuperBuilderBasic.java index ad31a14b89..7cc0e350bc 100644 --- a/test/transform/resource/after-ecj/SuperBuilderBasic.java +++ b/test/transform/resource/after-ecj/SuperBuilderBasic.java @@ -1,26 +1,26 @@ import java.util.List; public class SuperBuilderBasic { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final int field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final int field1) { this.field1 = field1; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -30,31 +30,31 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderBasic.Parent.ParentBuilder(field1=" + this.field1) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderBasic.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderBasic.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasic.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasic.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Parent build() { return new SuperBuilderBasic.Parent(this); } } int field1; @lombok.Singular List items; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { super(); this.field1 = b.field1; java.util.List items; @@ -70,46 +70,46 @@ private ParentBuilderImpl() { } this.items = items; } - public static @java.lang.SuppressWarnings("all") SuperBuilderBasic.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Parent.ParentBuilder builder() { return new SuperBuilderBasic.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends SuperBuilderBasic.Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends SuperBuilderBasic.Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends SuperBuilderBasic.Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderBasic.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderBasic.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderBasic.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasic.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasic.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Child build() { return new SuperBuilderBasic.Child(this); } } double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderBasic.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderBasic.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public static @java.lang.SuppressWarnings("all") SuperBuilderBasic.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Child.ChildBuilder builder() { return new SuperBuilderBasic.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java index f29dfd3768..2d9262db0c 100644 --- a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java @@ -1,20 +1,20 @@ import java.util.List; public class SuperBuilderBasicToBuilder { public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; - private @java.lang.SuppressWarnings("all") int obtainViaField; - private @java.lang.SuppressWarnings("all") int obtainViaMethod; - private @java.lang.SuppressWarnings("all") String obtainViaStaticMethod; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated int obtainViaField; + private @java.lang.SuppressWarnings("all") @lombok.Generated int obtainViaMethod; + private @java.lang.SuppressWarnings("all") @lombok.Generated String obtainViaStaticMethod; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } - protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { SuperBuilderBasicToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Parent instance, final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Parent instance, final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { b.field1(instance.field1); b.obtainViaField(instance.field1); b.obtainViaMethod(instance.method()); @@ -24,38 +24,38 @@ public ParentBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final int field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final int field1) { this.field1 = field1; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B obtainViaField(final int obtainViaField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B obtainViaField(final int obtainViaField) { this.obtainViaField = obtainViaField; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B obtainViaMethod(final int obtainViaMethod) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B obtainViaMethod(final int obtainViaMethod) { this.obtainViaMethod = obtainViaMethod; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B obtainViaStaticMethod(final String obtainViaStaticMethod) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B obtainViaStaticMethod(final String obtainViaStaticMethod) { this.obtainViaStaticMethod = obtainViaStaticMethod; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -65,25 +65,25 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((("SuperBuilderBasicToBuilder.Parent.ParentBuilder(field1=" + this.field1) + ", obtainViaField=") + this.obtainViaField) + ", obtainViaMethod=") + this.obtainViaMethod) + ", obtainViaStaticMethod=") + this.obtainViaStaticMethod) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderBasicToBuilder.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderBasicToBuilder.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Parent build() { return new SuperBuilderBasicToBuilder.Parent(this); } } @@ -98,7 +98,7 @@ private int method() { private static String staticMethod(Parent instance) { return "staticMethod"; } - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { super(); this.field1 = b.field1; this.obtainViaField = b.obtainViaField; @@ -117,60 +117,60 @@ private static String staticMethod(Parent instance) { } this.items = items; } - public @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Parent.ParentBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderBasicToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Child instance, final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Child instance, final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { b.field3(instance.field3); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderBasicToBuilder.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderBasicToBuilder.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderBasicToBuilder.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Child build() { return new SuperBuilderBasicToBuilder.Child(this); } } private double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Child.ChildBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Child.ChildBuilder toBuilder() { return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Child.ChildBuilder builder() { return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomName.java b/test/transform/resource/after-ecj/SuperBuilderCustomName.java index fc834090de..528db4f319 100644 --- a/test/transform/resource/after-ecj/SuperBuilderCustomName.java +++ b/test/transform/resource/after-ecj/SuperBuilderCustomName.java @@ -1,40 +1,40 @@ import java.util.List; @lombok.experimental.SuperBuilder class SuperBuilderCustomName { - public static abstract @java.lang.SuppressWarnings("all") class SimpleTestBuilder, B extends SuperBuilderCustomName.SimpleTestBuilder> { - private @java.lang.SuppressWarnings("all") int field; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SimpleTestBuilder, B extends SuperBuilderCustomName.SimpleTestBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field; public SimpleTestBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field(final int field) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field(final int field) { this.field = field; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderCustomName.SimpleTestBuilder(field=" + this.field) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class SimpleTestBuilderImpl extends SuperBuilderCustomName.SimpleTestBuilder, SuperBuilderCustomName.SimpleTestBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class SimpleTestBuilderImpl extends SuperBuilderCustomName.SimpleTestBuilder, SuperBuilderCustomName.SimpleTestBuilderImpl> { private SimpleTestBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomName.SimpleTestBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomName.SimpleTestBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomName build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomName build() { return new SuperBuilderCustomName(this); } } private final int field; - protected @java.lang.SuppressWarnings("all") SuperBuilderCustomName(final SuperBuilderCustomName.SimpleTestBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomName(final SuperBuilderCustomName.SimpleTestBuilder b) { super(); this.field = b.field; } - public static @java.lang.SuppressWarnings("all") SuperBuilderCustomName.SimpleTestBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomName.SimpleTestBuilder builder() { return new SuperBuilderCustomName.SimpleTestBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomized.java b/test/transform/resource/after-ecj/SuperBuilderCustomized.java index e84ffe144c..2fd5562784 100644 --- a/test/transform/resource/after-ecj/SuperBuilderCustomized.java +++ b/test/transform/resource/after-ecj/SuperBuilderCustomized.java @@ -2,7 +2,7 @@ public class SuperBuilderCustomized { public static @lombok.experimental.SuperBuilder class Parent { public static abstract class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public ParentBuilder() { super(); } @@ -14,20 +14,20 @@ public B field1(int field1) { this.field1 = (field1 + 1); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderCustomized.Parent.ParentBuilder(field1=" + this.field1) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomized.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomized.Parent build() { return new SuperBuilderCustomized.Parent(this); } } @@ -51,25 +51,25 @@ private ChildBuilderImpl() { this.resetToDefault(); return new Child(this); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomized.Child.ChildBuilderImpl self() { return this; } } - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field2; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field2; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field2(final double field2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field2(final double field2) { this.field2 = field2; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderCustomized.Child.ChildBuilder(super=" + super.toString()) + ", field2=") + this.field2) + ")"); } } @@ -77,7 +77,7 @@ public ChildBuilder() { public static ChildBuilder builder() { return new ChildBuilderImpl().field2(10.0); } - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderCustomized.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderCustomized.Child.ChildBuilder b) { super(b); this.field2 = b.field2; } diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java b/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java index 142181ec6e..6337df34f8 100644 --- a/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java @@ -2,7 +2,7 @@ public class SuperBuilderCustomizedWithSetterPrefix { public static @lombok.experimental.SuperBuilder(setterPrefix = "set") class Parent { public static abstract class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public ParentBuilder() { super(); } @@ -10,29 +10,29 @@ public B setField1(int field1) { this.field1 = (field1 + 1); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder(field1=" + this.field1) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomizedWithSetterPrefix.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomizedWithSetterPrefix.Parent build() { return new SuperBuilderCustomizedWithSetterPrefix.Parent(this); } } int field1; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder b) { super(); this.field1 = b.field1; } - public static @java.lang.SuppressWarnings("all") SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder builder() { return new SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderInitializer.java b/test/transform/resource/after-ecj/SuperBuilderInitializer.java index 9143be9431..ce63789960 100644 --- a/test/transform/resource/after-ecj/SuperBuilderInitializer.java +++ b/test/transform/resource/after-ecj/SuperBuilderInitializer.java @@ -1,32 +1,32 @@ import lombok.experimental.SuperBuilder; class SuperBuilderInitializer { public static @SuperBuilder class One { - public static abstract @java.lang.SuppressWarnings("all") class OneBuilder> { - private @java.lang.SuppressWarnings("all") String world; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class OneBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated String world; public OneBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B world(final String world) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B world(final String world) { this.world = world; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderInitializer.One.OneBuilder(world=" + this.world) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class OneBuilderImpl extends SuperBuilderInitializer.One.OneBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class OneBuilderImpl extends SuperBuilderInitializer.One.OneBuilder { private OneBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderInitializer.One.OneBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderInitializer.One.OneBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderInitializer.One build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderInitializer.One build() { return new SuperBuilderInitializer.One(this); } } @@ -40,11 +40,11 @@ private OneBuilderImpl() { } () { } - protected @java.lang.SuppressWarnings("all") One(final SuperBuilderInitializer.One.OneBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated One(final SuperBuilderInitializer.One.OneBuilder b) { super(); this.world = b.world; } - public static @java.lang.SuppressWarnings("all") SuperBuilderInitializer.One.OneBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderInitializer.One.OneBuilder builder() { return new SuperBuilderInitializer.One.OneBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderJavadoc.java b/test/transform/resource/after-ecj/SuperBuilderJavadoc.java index f06b6008dc..ab65e7bc10 100644 --- a/test/transform/resource/after-ecj/SuperBuilderJavadoc.java +++ b/test/transform/resource/after-ecj/SuperBuilderJavadoc.java @@ -1,10 +1,10 @@ import java.util.List; public abstract @lombok.experimental.SuperBuilder class SuperBuilderJavadoc { public static abstract class SuperBuilderJavadocBuilder> { - private @java.lang.SuppressWarnings("all") int basic; - private @java.lang.SuppressWarnings("all") int getsetwith; - private @java.lang.SuppressWarnings("all") int predef; - private @java.lang.SuppressWarnings("all") int predefWithJavadoc; + private @java.lang.SuppressWarnings("all") @lombok.Generated int basic; + private @java.lang.SuppressWarnings("all") @lombok.Generated int getsetwith; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predef; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predefWithJavadoc; public SuperBuilderJavadocBuilder() { super(); } @@ -22,7 +22,7 @@ public B predefWithJavadoc(final int x) { * @param tag is moved to the setter. * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B basic(final int basic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B basic(final int basic) { this.basic = basic; return self(); } @@ -31,13 +31,13 @@ public B predefWithJavadoc(final int x) { * @param tag is moved to the setters and wither. * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B getsetwith(final int getsetwith) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B getsetwith(final int getsetwith) { this.getsetwith = getsetwith; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("SuperBuilderJavadoc.SuperBuilderJavadocBuilder(basic=" + this.basic) + ", getsetwith=") + this.getsetwith) + ", predef=") + this.predef) + ", predefWithJavadoc=") + this.predefWithJavadoc) + ")"); } } @@ -45,7 +45,7 @@ public B predefWithJavadoc(final int x) { private @lombok.Getter @lombok.Setter @lombok.experimental.Wither int getsetwith; private final int predef; private final int predefWithJavadoc; - protected @java.lang.SuppressWarnings("all") SuperBuilderJavadoc(final SuperBuilderJavadoc.SuperBuilderJavadocBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderJavadoc(final SuperBuilderJavadoc.SuperBuilderJavadocBuilder b) { super(); this.basic = b.basic; this.getsetwith = b.getsetwith; @@ -56,14 +56,14 @@ public B predefWithJavadoc(final int x) { * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @return tag is moved to the getter. */ - public @java.lang.SuppressWarnings("all") int getGetsetwith() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getGetsetwith() { return this.getsetwith; } /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @param tag is moved to the setters and wither. */ - public @java.lang.SuppressWarnings("all") void setGetsetwith(final int getsetwith) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setGetsetwith(final int getsetwith) { this.getsetwith = getsetwith; } /** @@ -71,5 +71,5 @@ public B predefWithJavadoc(final int x) { * @param tag is moved to the setters and wither. * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public abstract @java.lang.SuppressWarnings("all") SuperBuilderJavadoc withGetsetwith(final int getsetwith); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderJavadoc withGetsetwith(final int getsetwith); } diff --git a/test/transform/resource/after-ecj/SuperBuilderNameClashes.java b/test/transform/resource/after-ecj/SuperBuilderNameClashes.java index 7f8507cebb..5ef99a5623 100644 --- a/test/transform/resource/after-ecj/SuperBuilderNameClashes.java +++ b/test/transform/resource/after-ecj/SuperBuilderNameClashes.java @@ -1,59 +1,59 @@ public class SuperBuilderNameClashes { public static @lombok.experimental.SuperBuilder class GenericsClash { - public static abstract @java.lang.SuppressWarnings("all") class GenericsClashBuilder, B2 extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GenericsClashBuilder, B2 extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder> { public GenericsClashBuilder() { super(); } - protected abstract @java.lang.SuppressWarnings("all") B2 self(); - public abstract @java.lang.SuppressWarnings("all") C3 build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B2 self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C3 build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder()"; } } - private static final @java.lang.SuppressWarnings("all") class GenericsClashBuilderImpl extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder, SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class GenericsClashBuilderImpl extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder, SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl> { private GenericsClashBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.GenericsClash build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.GenericsClash build() { return new SuperBuilderNameClashes.GenericsClash(this); } } - protected @java.lang.SuppressWarnings("all") GenericsClash(final SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated GenericsClash(final SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder b) { super(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder builder() { return new SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class B { - public static abstract @java.lang.SuppressWarnings("all") class BBuilder> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class BBuilder> { public BBuilder() { super(); } - protected abstract @java.lang.SuppressWarnings("all") B2 self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B2 self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "SuperBuilderNameClashes.B.BBuilder()"; } } - private static final @java.lang.SuppressWarnings("all") class BBuilderImpl extends SuperBuilderNameClashes.B.BBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class BBuilderImpl extends SuperBuilderNameClashes.B.BBuilder { private BBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.B.BBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.B.BBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.B build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.B build() { return new SuperBuilderNameClashes.B(this); } } - protected @java.lang.SuppressWarnings("all") B(final SuperBuilderNameClashes.B.BBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B(final SuperBuilderNameClashes.B.BBuilder b) { super(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.B.BBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.B.BBuilder builder() { return new SuperBuilderNameClashes.B.BBuilderImpl(); } } @@ -63,41 +63,41 @@ public C2() { } } public static @lombok.experimental.SuperBuilder class C { - public static abstract @java.lang.SuppressWarnings("all") class CBuilder> { - private @java.lang.SuppressWarnings("all") C2 c2; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class CBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated C2 c2; public CBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B c2(final C2 c2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B c2(final C2 c2) { this.c2 = c2; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C3 build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C3 build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderNameClashes.C.CBuilder(c2=" + this.c2) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class CBuilderImpl extends SuperBuilderNameClashes.C.CBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class CBuilderImpl extends SuperBuilderNameClashes.C.CBuilder { private CBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.C.CBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.C.CBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.C build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.C build() { return new SuperBuilderNameClashes.C(this); } } C2 c2; - protected @java.lang.SuppressWarnings("all") C(final SuperBuilderNameClashes.C.CBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated C(final SuperBuilderNameClashes.C.CBuilder b) { super(); this.c2 = b.c2; } - public static @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.C.CBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.C.CBuilder builder() { return new SuperBuilderNameClashes.C.CBuilderImpl(); } } @@ -108,35 +108,35 @@ interface B4 { interface B3 { } public static @lombok.experimental.SuperBuilder class ExtendsClauseCollision extends B implements B2.B4, B3 { - public static abstract @java.lang.SuppressWarnings("all") class ExtendsClauseCollisionBuilder> extends B.BBuilder { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ExtendsClauseCollisionBuilder> extends B.BBuilder { public ExtendsClauseCollisionBuilder() { super(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B4 self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B4 self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder(super=" + super.toString()) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ExtendsClauseCollisionBuilderImpl extends SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ExtendsClauseCollisionBuilderImpl extends SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder { private ExtendsClauseCollisionBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.ExtendsClauseCollision build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.ExtendsClauseCollision build() { return new SuperBuilderNameClashes.ExtendsClauseCollision(this); } } - protected @java.lang.SuppressWarnings("all") ExtendsClauseCollision(final SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated ExtendsClauseCollision(final SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder b) { super(b); } - public static @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder builder() { return new SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl(); } } public SuperBuilderNameClashes() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java b/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java index 0c51d4ee1e..5a175532de 100644 --- a/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java +++ b/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java @@ -1,31 +1,31 @@ public class SuperBuilderNestedGenericTypes { public static abstract @lombok.experimental.SuperBuilder class Generic> { - public static abstract @java.lang.SuppressWarnings("all") class GenericBuilder, C extends SuperBuilderNestedGenericTypes.Generic, B extends SuperBuilderNestedGenericTypes.Generic.GenericBuilder> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GenericBuilder, C extends SuperBuilderNestedGenericTypes.Generic, B extends SuperBuilderNestedGenericTypes.Generic.GenericBuilder> { public GenericBuilder() { super(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "SuperBuilderNestedGenericTypes.Generic.GenericBuilder()"; } } - protected @java.lang.SuppressWarnings("all") Generic(final SuperBuilderNestedGenericTypes.Generic.GenericBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Generic(final SuperBuilderNestedGenericTypes.Generic.GenericBuilder b) { super(); } } public static abstract @lombok.experimental.SuperBuilder class NestedGeneric> extends Generic>> { - public static abstract @java.lang.SuppressWarnings("all") class NestedGenericBuilder, C extends SuperBuilderNestedGenericTypes.NestedGeneric, B extends SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder> extends Generic.GenericBuilder>, C, B> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class NestedGenericBuilder, C extends SuperBuilderNestedGenericTypes.NestedGeneric, B extends SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder> extends Generic.GenericBuilder>, C, B> { public NestedGenericBuilder() { super(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder(super=" + super.toString()) + ")"); } } - protected @java.lang.SuppressWarnings("all") NestedGeneric(final SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated NestedGeneric(final SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder b) { super(b); } } @@ -34,4 +34,4 @@ public interface OtherGeneric { public SuperBuilderNestedGenericTypes() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java b/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java index 1915e765f6..6c03494ace 100644 --- a/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java @@ -7,14 +7,14 @@ @Target(ElementType.TYPE_USE) @interface MyAnnotation { } @lombok.experimental.SuperBuilder class SuperBuilderSingularAnnotatedTypes { - public static abstract @java.lang.SuppressWarnings("all") class SuperBuilderSingularAnnotatedTypesBuilder> { - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> foos; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderSingularAnnotatedTypesBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> foos; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; public SuperBuilderSingularAnnotatedTypesBuilder() { super(); } - public @java.lang.SuppressWarnings("all") B foo(final @MyAnnotation @NonNull String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foo(final @MyAnnotation @NonNull String foo) { if ((foo == null)) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -24,7 +24,7 @@ public SuperBuilderSingularAnnotatedTypesBuilder() { this.foos.add(foo); return self(); } - public @java.lang.SuppressWarnings("all") B foos(final java.util.Collection foos) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foos(final java.util.Collection foos) { if ((foos == null)) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -34,12 +34,12 @@ public SuperBuilderSingularAnnotatedTypesBuilder() { this.foos.addAll(foos); return self(); } - public @java.lang.SuppressWarnings("all") B clearFoos() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearFoos() { if ((this.foos != null)) this.foos.clear(); return self(); } - public @java.lang.SuppressWarnings("all") B bar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B bar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { if ((barKey == null)) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); @@ -57,7 +57,7 @@ public SuperBuilderSingularAnnotatedTypesBuilder() { this.bars$value.add(barValue); return self(); } - public @java.lang.SuppressWarnings("all") B bars(final java.util.Map bars) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B bars(final java.util.Map bars) { if ((bars == null)) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -74,7 +74,7 @@ public SuperBuilderSingularAnnotatedTypesBuilder() { } return self(); } - public @java.lang.SuppressWarnings("all") B clearBars() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearBars() { if ((this.bars$key != null)) { this.bars$key.clear(); @@ -82,26 +82,26 @@ public SuperBuilderSingularAnnotatedTypesBuilder() { } return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder(foos=" + this.foos) + ", bars$key=") + this.bars$key) + ", bars$value=") + this.bars$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class SuperBuilderSingularAnnotatedTypesBuilderImpl extends SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderSingularAnnotatedTypesBuilderImpl extends SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder { private SuperBuilderSingularAnnotatedTypesBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularAnnotatedTypes build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularAnnotatedTypes build() { return new SuperBuilderSingularAnnotatedTypes(this); } } private @Singular Set<@MyAnnotation @NonNull String> foos; private @Singular Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; - protected @java.lang.SuppressWarnings("all") SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder b) { super(); java.util.Set<@MyAnnotation @NonNull String> foos; switch (((b.foos == null) ? 0 : b.foos.size())) { @@ -133,7 +133,7 @@ private SuperBuilderSingularAnnotatedTypesBuilderImpl() { } this.bars = bars; } - public static @java.lang.SuppressWarnings("all") SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder builder() { return new SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java b/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java index da9d0c3b73..551fdc5d66 100644 --- a/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java +++ b/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java @@ -1,20 +1,20 @@ import java.util.Set; @lombok.experimental.SuperBuilder class SuperBuilderSingularCustomized { public static abstract class SuperBuilderSingularCustomizedBuilder> { - private @java.lang.SuppressWarnings("all") java.util.ArrayList foos; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList foos; public SuperBuilderSingularCustomizedBuilder() { super(); } public B custom(final String value) { return self(); } - public @java.lang.SuppressWarnings("all") B foo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foo(final String foo) { if ((this.foos == null)) this.foos = new java.util.ArrayList(); this.foos.add(foo); return self(); } - public @java.lang.SuppressWarnings("all") B foos(final java.util.Collection foos) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foos(final java.util.Collection foos) { if ((foos == null)) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -24,30 +24,30 @@ public B custom(final String value) { this.foos.addAll(foos); return self(); } - public @java.lang.SuppressWarnings("all") B clearFoos() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearFoos() { if ((this.foos != null)) this.foos.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder(foos=" + this.foos) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class SuperBuilderSingularCustomizedBuilderImpl extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderSingularCustomizedBuilderImpl extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder { private SuperBuilderSingularCustomizedBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularCustomized build() { return new SuperBuilderSingularCustomized(this); } } private @lombok.Singular Set foos; - protected @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized(final SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularCustomized(final SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder b) { super(); java.util.Set foos; switch (((b.foos == null) ? 0 : b.foos.size())) { @@ -64,7 +64,7 @@ private SuperBuilderSingularCustomizedBuilderImpl() { } this.foos = foos; } - public static @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder builder() { return new SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java b/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java index 62146b9964..d007fa2246 100644 --- a/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java +++ b/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java @@ -1,32 +1,32 @@ public class SuperBuilderSingularToBuilderGuava { public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder cards; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder frogs; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder rawSet; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedSet.Builder passes; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableTable.Builder users; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder cards; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder frogs; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSet.Builder rawSet; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSortedSet.Builder passes; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableTable.Builder users; public ParentBuilder() { super(); } - protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Parent instance, final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Parent instance, final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { b.cards(((instance.cards == null) ? com.google.common.collect.ImmutableList.of() : instance.cards)); b.frogs(((instance.frogs == null) ? com.google.common.collect.ImmutableList.of() : instance.frogs)); b.rawSet(((instance.rawSet == null) ? com.google.common.collect.ImmutableSet.of() : instance.rawSet)); b.passes(((instance.passes == null) ? com.google.common.collect.ImmutableSortedSet.of() : instance.passes)); b.users(((instance.users == null) ? com.google.common.collect.ImmutableTable.of() : instance.users)); } - public @java.lang.SuppressWarnings("all") B card(final T card) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B card(final T card) { if ((this.cards == null)) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return self(); } - public @java.lang.SuppressWarnings("all") B cards(final java.lang.Iterable cards) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B cards(final java.lang.Iterable cards) { if ((cards == null)) { throw new java.lang.NullPointerException("cards cannot be null"); @@ -36,17 +36,17 @@ public ParentBuilder() { this.cards.addAll(cards); return self(); } - public @java.lang.SuppressWarnings("all") B clearCards() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearCards() { this.cards = null; return self(); } - public @java.lang.SuppressWarnings("all") B frog(final Number frog) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B frog(final Number frog) { if ((this.frogs == null)) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return self(); } - public @java.lang.SuppressWarnings("all") B frogs(final java.lang.Iterable frogs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B frogs(final java.lang.Iterable frogs) { if ((frogs == null)) { throw new java.lang.NullPointerException("frogs cannot be null"); @@ -56,17 +56,17 @@ public ParentBuilder() { this.frogs.addAll(frogs); return self(); } - public @java.lang.SuppressWarnings("all") B clearFrogs() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearFrogs() { this.frogs = null; return self(); } - public @java.lang.SuppressWarnings("all") B rawSet(final java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B rawSet(final java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return self(); } - public @java.lang.SuppressWarnings("all") B rawSet(final java.lang.Iterable rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B rawSet(final java.lang.Iterable rawSet) { if ((rawSet == null)) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -76,17 +76,17 @@ public ParentBuilder() { this.rawSet.addAll(rawSet); return self(); } - public @java.lang.SuppressWarnings("all") B clearRawSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearRawSet() { this.rawSet = null; return self(); } - public @java.lang.SuppressWarnings("all") B pass(final String pass) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B pass(final String pass) { if ((this.passes == null)) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return self(); } - public @java.lang.SuppressWarnings("all") B passes(final java.lang.Iterable passes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B passes(final java.lang.Iterable passes) { if ((passes == null)) { throw new java.lang.NullPointerException("passes cannot be null"); @@ -96,17 +96,17 @@ public ParentBuilder() { this.passes.addAll(passes); return self(); } - public @java.lang.SuppressWarnings("all") B clearPasses() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearPasses() { this.passes = null; return self(); } - public @java.lang.SuppressWarnings("all") B user(final Number rowKey, final Number columnKey, final String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B 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 self(); } - public @java.lang.SuppressWarnings("all") B users(final com.google.common.collect.Table users) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B users(final com.google.common.collect.Table users) { if ((users == null)) { throw new java.lang.NullPointerException("users cannot be null"); @@ -116,24 +116,24 @@ public ParentBuilder() { this.users.putAll(users); return self(); } - public @java.lang.SuppressWarnings("all") B clearUsers() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearUsers() { this.users = null; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((("SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ", users=") + this.users) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder, SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder, SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Parent build() { return new SuperBuilderSingularToBuilderGuava.Parent(this); } } @@ -142,7 +142,7 @@ private ParentBuilderImpl() { private @SuppressWarnings("all") @lombok.Singular("rawSet") com.google.common.collect.ImmutableSet rawSet; private @lombok.Singular com.google.common.collect.ImmutableSortedSet passes; private @lombok.Singular com.google.common.collect.ImmutableTable users; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { super(); com.google.common.collect.ImmutableList cards = ((b.cards == null) ? com.google.common.collect.ImmutableList.of() : b.cards.build()); this.cards = cards; @@ -155,60 +155,60 @@ private ParentBuilderImpl() { com.google.common.collect.ImmutableTable users = ((b.users == null) ? com.google.common.collect.ImmutableTable.of() : b.users.build()); this.users = users; } - public @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder toBuilder() { return new SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder builder() { return new SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder, B extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderSingularToBuilderGuava.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Child instance, final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Child instance, final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { b.field3(instance.field3); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderSingularToBuilderGuava.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder, SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder, SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl> { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Child build() { return new SuperBuilderSingularToBuilderGuava.Child(this); } } private double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Child.ChildBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Child.ChildBuilder toBuilder() { return new SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Child.ChildBuilder builder() { return new SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl(); } } @@ -218,4 +218,4 @@ public SuperBuilderSingularToBuilderGuava() { public static void test() { Child x = Child.builder().card(1).build().toBuilder().build(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java b/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java index 9dea5ba0d6..27691d0b24 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java @@ -9,80 +9,80 @@ public class SuperBuilderWithAnnotatedTypeParam { public @Documented @Target({ElementType.TYPE_USE, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface MyAnnotation { } public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") A field1; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final A field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { this.field1 = field1; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder(field1=" + this.field1) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder, SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder, SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Parent build() { return new SuperBuilderWithAnnotatedTypeParam.Parent(this); } } A field1; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder b) { super(); this.field1 = b.field1; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder builder() { return new SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent<@MyAnnotation String> { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder<@MyAnnotation String, C, B> { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder<@MyAnnotation String, C, B> { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Child build() { return new SuperBuilderWithAnnotatedTypeParam.Child(this); } } double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder builder() { return new SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java index 08acadfcff..d60c08ff49 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java @@ -1,63 +1,63 @@ class SuperBuilderWithCustomBuilderClassName { static @lombok.experimental.SuperBuilder class SuperClass { - public static abstract @java.lang.SuppressWarnings("all") class Builder> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class Builder> { public Builder() { super(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "SuperBuilderWithCustomBuilderClassName.SuperClass.Builder()"; } } - private static final @java.lang.SuppressWarnings("all") class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SuperClass.Builder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SuperClass.Builder { private BuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SuperClass build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SuperClass build() { return new SuperBuilderWithCustomBuilderClassName.SuperClass(this); } } - protected @java.lang.SuppressWarnings("all") SuperClass(final SuperBuilderWithCustomBuilderClassName.SuperClass.Builder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperClass(final SuperBuilderWithCustomBuilderClassName.SuperClass.Builder b) { super(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SuperClass.Builder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SuperClass.Builder builder() { return new SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl(); } } static @lombok.experimental.SuperBuilder class SubClass extends SuperClass { - public static abstract @java.lang.SuppressWarnings("all") class Builder> extends SuperClass.Builder { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class Builder> extends SuperClass.Builder { public Builder() { super(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithCustomBuilderClassName.SubClass.Builder(super=" + super.toString()) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SubClass.Builder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SubClass.Builder { private BuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SubClass build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SubClass build() { return new SuperBuilderWithCustomBuilderClassName.SubClass(this); } } - protected @java.lang.SuppressWarnings("all") SubClass(final SuperBuilderWithCustomBuilderClassName.SubClass.Builder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SubClass(final SuperBuilderWithCustomBuilderClassName.SubClass.Builder b) { super(b); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SubClass.Builder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SubClass.Builder builder() { return new SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl(); } } SuperBuilderWithCustomBuilderClassName() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java index 7706e78849..bda0f840e4 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java @@ -1,26 +1,26 @@ import java.util.List; public class SuperBuilderWithCustomBuilderMethod { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") A field1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final A field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { this.field1 = field1; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -30,77 +30,77 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder(field1=" + this.field1) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder, SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder, SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderMethod.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderMethod.Parent build() { return new SuperBuilderWithCustomBuilderMethod.Parent(this); } } A field1; @lombok.Singular List items; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder b) { super(); this.field1 = b.field1; java.util.List items; switch (((b.items == null) ? 0 : b.items.size())) { - case 0 : + case 0 : items = java.util.Collections.emptyList(); break; - case 1 : + case 1 : items = java.util.Collections.singletonList(b.items.get(0)); break; - default : + default : items = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.items)); } this.items = items; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder builder() { return new SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder, B extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder, SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder, SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl> { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderMethod.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderMethod.Child build() { return new SuperBuilderWithCustomBuilderMethod.Child(this); } } @@ -108,7 +108,7 @@ private ChildBuilderImpl() { public static ChildBuilder builder() { return new ChildBuilderImpl().item("default item"); } - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java index b4edad5b84..73771675c4 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java @@ -1,18 +1,18 @@ import java.util.List; public class SuperBuilderWithDefaults { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithDefaults.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") long millis$value; - private @java.lang.SuppressWarnings("all") boolean millis$set; - private @java.lang.SuppressWarnings("all") N numberField$value; - private @java.lang.SuppressWarnings("all") boolean numberField$set; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithDefaults.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated long millis$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean millis$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated N numberField$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean numberField$set; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B millis(final long millis) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B millis(final long millis) { this.millis$value = millis; millis$set = true; return self(); @@ -20,37 +20,37 @@ public ParentBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B numberField(final N numberField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B numberField(final N numberField) { this.numberField$value = numberField; numberField$set = true; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithDefaults.Parent.ParentBuilder(millis$value=" + this.millis$value) + ", numberField$value=") + this.numberField$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithDefaults.Parent.ParentBuilder, SuperBuilderWithDefaults.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithDefaults.Parent.ParentBuilder, SuperBuilderWithDefaults.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Parent build() { return new SuperBuilderWithDefaults.Parent(this); } } private @lombok.Builder.Default long millis; private @lombok.Builder.Default N numberField; - private static @java.lang.SuppressWarnings("all") long $default$millis() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated long $default$millis() { return System.currentTimeMillis(); } - private static @java.lang.SuppressWarnings("all") N $default$numberField() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated N $default$numberField() { return null; } - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder b) { super(); if (b.millis$set) this.millis = b.millis$value; @@ -61,54 +61,54 @@ private ParentBuilderImpl() { else this.numberField = SuperBuilderWithDefaults.Parent.$default$numberField(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Parent.ParentBuilder builder() { return new SuperBuilderWithDefaults.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double doubleField$value; - private @java.lang.SuppressWarnings("all") boolean doubleField$set; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double doubleField$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean doubleField$set; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B doubleField(final double doubleField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B doubleField(final double doubleField) { this.doubleField$value = doubleField; doubleField$set = true; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithDefaults.Child.ChildBuilder(super=" + super.toString()) + ", doubleField$value=") + this.doubleField$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithDefaults.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithDefaults.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Child build() { return new SuperBuilderWithDefaults.Child(this); } } private @lombok.Builder.Default double doubleField; - private static @java.lang.SuppressWarnings("all") double $default$doubleField() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated double $default$doubleField() { return Math.PI; } - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithDefaults.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithDefaults.Child.ChildBuilder b) { super(b); - if (b.doubleField$set) + if (b.doubleField$set) this.doubleField = b.doubleField$value; else this.doubleField = SuperBuilderWithDefaults.Child.$default$doubleField(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Child.ChildBuilder builder() { return new SuperBuilderWithDefaults.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java index d4744e9b3d..e5a7602e70 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java @@ -2,96 +2,96 @@ import lombok.Builder; public class SuperBuilderWithDefaultsAndTargetTyping { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") String foo$value; - private @java.lang.SuppressWarnings("all") boolean foo$set; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated String foo$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean foo$set; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B foo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foo(final String foo) { this.foo$value = foo; foo$set = true; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder(foo$value=" + this.foo$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Parent build() { return new SuperBuilderWithDefaultsAndTargetTyping.Parent(this); } } private @lombok.Builder.Default String foo; - private static @java.lang.SuppressWarnings("all") String $default$foo() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder b) { super(); if (b.foo$set) this.foo = b.foo$value; else this.foo = SuperBuilderWithDefaultsAndTargetTyping.Parent.$default$foo(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder builder() { return new SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") String foo$value; - private @java.lang.SuppressWarnings("all") boolean foo$set; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String foo$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean foo$set; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B foo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foo(final String foo) { this.foo$value = foo; foo$set = true; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder(super=" + super.toString()) + ", foo$value=") + this.foo$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Child build() { return new SuperBuilderWithDefaultsAndTargetTyping.Child(this); } } private @lombok.Builder.Default String foo; - private static @java.lang.SuppressWarnings("all") String $default$foo() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder b) { super(b); if (b.foo$set) this.foo = b.foo$value; else this.foo = SuperBuilderWithDefaultsAndTargetTyping.Child.$default$foo(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder builder() { return new SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java b/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java index d42c3ca767..1d35434e07 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java @@ -1,32 +1,32 @@ public @lombok.experimental.SuperBuilder class SuperBuilderWithExistingConstructor { - public static abstract @java.lang.SuppressWarnings("all") class SuperBuilderWithExistingConstructorBuilder> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderWithExistingConstructorBuilder> { public SuperBuilderWithExistingConstructorBuilder() { super(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder()"; } } - private static final @java.lang.SuppressWarnings("all") class SuperBuilderWithExistingConstructorBuilderImpl extends SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderWithExistingConstructorBuilderImpl extends SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder { private SuperBuilderWithExistingConstructorBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstructor build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithExistingConstructor build() { return new SuperBuilderWithExistingConstructor(this); } } public SuperBuilderWithExistingConstructor() { super(); } - protected @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstructor(final SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithExistingConstructor(final SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder b) { super(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder builder() { return new SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java index b8a4fab9d2..4c254905f5 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java @@ -1,26 +1,26 @@ import java.util.List; public class SuperBuilderWithGenerics { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithGenerics.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") A field1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenerics.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final A field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { this.field1 = field1; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -30,86 +30,86 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenerics.Parent.ParentBuilder(field1=" + this.field1) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithGenerics.Parent.ParentBuilder, SuperBuilderWithGenerics.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithGenerics.Parent.ParentBuilder, SuperBuilderWithGenerics.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Parent build() { return new SuperBuilderWithGenerics.Parent(this); } } A field1; @lombok.Singular List items; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder b) { super(); this.field1 = b.field1; java.util.List items; switch (((b.items == null) ? 0 : b.items.size())) { - case 0 : + case 0 : items = java.util.Collections.emptyList(); break; - case 1 : + case 1 : items = java.util.Collections.singletonList(b.items.get(0)); break; - default : + default : items = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.items)); } this.items = items; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder, B extends SuperBuilderWithGenerics.Child.ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithGenerics.Child.ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenerics.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithGenerics.Child.ChildBuilder, SuperBuilderWithGenerics.Child.ChildBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithGenerics.Child.ChildBuilder, SuperBuilderWithGenerics.Child.ChildBuilderImpl> { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Child build() { return new SuperBuilderWithGenerics.Child(this); } } double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithGenerics.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithGenerics.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Child.ChildBuilder builder() { return new SuperBuilderWithGenerics.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java index d42f9d199a..0a3f8c8413 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java @@ -1,26 +1,26 @@ import java.util.List; public class SuperBuilderWithGenerics2 { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithGenerics2.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") A field1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenerics2.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final A field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { this.field1 = field1; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -30,86 +30,86 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenerics2.Parent.ParentBuilder(field1=" + this.field1) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithGenerics2.Parent.ParentBuilder, SuperBuilderWithGenerics2.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithGenerics2.Parent.ParentBuilder, SuperBuilderWithGenerics2.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Parent build() { return new SuperBuilderWithGenerics2.Parent(this); } } A field1; @lombok.Singular List items; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder b) { super(); this.field1 = b.field1; java.util.List items; switch (((b.items == null) ? 0 : b.items.size())) { - case 0 : + case 0 : items = java.util.Collections.emptyList(); break; - case 1 : + case 1 : items = java.util.Collections.singletonList(b.items.get(0)); break; - default : + default : items = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.items)); } this.items = items; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics2.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder(builderMethodName = "builder2") class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder, B extends SuperBuilderWithGenerics2.Child.ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") A field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithGenerics2.Child.ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final A field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final A field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenerics2.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithGenerics2.Child.ChildBuilder, SuperBuilderWithGenerics2.Child.ChildBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithGenerics2.Child.ChildBuilder, SuperBuilderWithGenerics2.Child.ChildBuilderImpl> { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Child build() { return new SuperBuilderWithGenerics2.Child(this); } } A field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithGenerics2.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithGenerics2.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Child.ChildBuilder builder2() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Child.ChildBuilder builder2() { return new SuperBuilderWithGenerics2.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java index 0b3698356e..0f3cf78867 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java @@ -1,41 +1,41 @@ import java.util.List; public class SuperBuilderWithGenerics3 { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithGenerics3.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") String str; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenerics3.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated String str; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B str(final String str) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B str(final String str) { this.str = str; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithGenerics3.Parent.ParentBuilder(str=" + this.str) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithGenerics3.Parent.ParentBuilder, SuperBuilderWithGenerics3.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithGenerics3.Parent.ParentBuilder, SuperBuilderWithGenerics3.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Parent build() { return new SuperBuilderWithGenerics3.Parent(this); } } private final String str; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithGenerics3.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithGenerics3.Parent.ParentBuilder b) { super(); this.str = b.str; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics3.Parent.ParentBuilderImpl(); } } @@ -45,41 +45,41 @@ public SomeInnerStaticClass() { super(); } } - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenerics3.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithGenerics3.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithGenerics3.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Child build() { return new SuperBuilderWithGenerics3.Child(this); } } double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithGenerics3.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithGenerics3.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Child.ChildBuilder builder() { return new SuperBuilderWithGenerics3.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java index e7d5dfae55..dba6c743b2 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java @@ -1,29 +1,29 @@ import java.util.Map; public class SuperBuilderWithGenericsAndToBuilder { public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") A field1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items$value; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items$value; public ParentBuilder() { super(); } - protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { b.field1(instance.field1); b.items(((instance.items == null) ? java.util.Collections.emptyMap() : instance.items)); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final A field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { this.field1 = field1; return self(); } - public @java.lang.SuppressWarnings("all") B item(final Integer itemKey, final String itemValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final Integer itemKey, final String itemValue) { if ((this.items$key == null)) { this.items$key = new java.util.ArrayList(); @@ -33,7 +33,7 @@ public ParentBuilder() { this.items$value.add(itemValue); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Map items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Map items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -50,7 +50,7 @@ public ParentBuilder() { } return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items$key != null)) { this.items$key.clear(); @@ -58,37 +58,37 @@ public ParentBuilder() { } return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder(field1=" + this.field1) + ", items$key=") + this.items$key) + ", items$value=") + this.items$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder, SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder, SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Parent build() { return new SuperBuilderWithGenericsAndToBuilder.Parent(this); } } A field1; @lombok.Singular Map items; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { super(); this.field1 = b.field1; java.util.Map items; switch (((b.items$key == null) ? 0 : b.items$key.size())) { - case 0 : + case 0 : items = java.util.Collections.emptyMap(); break; - case 1 : + case 1 : items = java.util.Collections.singletonMap(b.items$key.get(0), b.items$value.get(0)); break; - default : + default : items = new java.util.LinkedHashMap(((b.items$key.size() < 0x40000000) ? ((1 + b.items$key.size()) + ((b.items$key.size() - 3) / 3)) : java.lang.Integer.MAX_VALUE)); for (int $i = 0;; ($i < b.items$key.size()); $i ++) items.put(b.items$key.get($i), b.items$value.get($i)); @@ -96,60 +96,60 @@ private ParentBuilderImpl() { } this.items = items; } - public @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Child instance, final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Child instance, final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { b.field3(instance.field3); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder, SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder, SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl> { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Child build() { return new SuperBuilderWithGenericsAndToBuilder.Child(this); } } double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder toBuilder() { return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder builder() { return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java index c71576499b..85410ccfc7 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java @@ -1,16 +1,16 @@ import java.util.List; public class SuperBuilderWithNonNull { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") String nonNullParentField$value; - private @java.lang.SuppressWarnings("all") boolean nonNullParentField$set; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated String nonNullParentField$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean nonNullParentField$set; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B nonNullParentField(final @lombok.NonNull String nonNullParentField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B nonNullParentField(final @lombok.NonNull String nonNullParentField) { if ((nonNullParentField == null)) { throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); @@ -19,28 +19,28 @@ public ParentBuilder() { nonNullParentField$set = true; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithNonNull.Parent.ParentBuilder(nonNullParentField$value=" + this.nonNullParentField$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithNonNull.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithNonNull.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Parent build() { return new SuperBuilderWithNonNull.Parent(this); } } final @lombok.NonNull @lombok.Builder.Default String nonNullParentField; - private static @java.lang.SuppressWarnings("all") String $default$nonNullParentField() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated String $default$nonNullParentField() { return "default"; } - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithNonNull.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithNonNull.Parent.ParentBuilder b) { super(); if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField$value; @@ -51,20 +51,20 @@ private ParentBuilderImpl() { throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); } } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Parent.ParentBuilder builder() { return new SuperBuilderWithNonNull.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") String nonNullChildField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String nonNullChildField; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B nonNullChildField(final @lombok.NonNull String nonNullChildField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B nonNullChildField(final @lombok.NonNull String nonNullChildField) { if ((nonNullChildField == null)) { throw new java.lang.NullPointerException("nonNullChildField is marked non-null but is null"); @@ -72,25 +72,25 @@ public ChildBuilder() { this.nonNullChildField = nonNullChildField; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithNonNull.Child.ChildBuilder(super=" + super.toString()) + ", nonNullChildField=") + this.nonNullChildField) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithNonNull.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithNonNull.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Child build() { return new SuperBuilderWithNonNull.Child(this); } } @lombok.NonNull String nonNullChildField; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithNonNull.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithNonNull.Child.ChildBuilder b) { super(b); this.nonNullChildField = b.nonNullChildField; if ((nonNullChildField == null)) @@ -98,7 +98,7 @@ private ChildBuilderImpl() { throw new java.lang.NullPointerException("nonNullChildField is marked non-null but is null"); } } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Child.ChildBuilder builder() { return new SuperBuilderWithNonNull.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java b/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java index 1c5e25c2d9..3d2dffb45c 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java @@ -1,79 +1,79 @@ public class SuperBuilderWithOverloadedGeneratedMethods { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int self; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int self; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B self(final int self) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B self(final int self) { this.self = self; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder(self=" + this.self) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Parent build() { return new SuperBuilderWithOverloadedGeneratedMethods.Parent(this); } } int self; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder b) { super(); this.self = b.self; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder builder() { return new SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double build; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double build; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B build(final double build) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B build(final double build) { this.build = build; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder(super=" + super.toString()) + ", build=") + this.build) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Child build() { return new SuperBuilderWithOverloadedGeneratedMethods.Child(this); } } double build; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder b) { super(b); this.build = b.build; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder builder() { return new SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java b/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java index ec035ba1fb..ef266001b3 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java @@ -1,32 +1,32 @@ @lombok.experimental.SuperBuilder class SuperBuilderWithPrefixes { - public static abstract @java.lang.SuppressWarnings("all") class SuperBuilderWithPrefixesBuilder> { - private @java.lang.SuppressWarnings("all") int field; - private @java.lang.SuppressWarnings("all") int otherField; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderWithPrefixesBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field; + private @java.lang.SuppressWarnings("all") @lombok.Generated int otherField; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public SuperBuilderWithPrefixesBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field(final int field) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field(final int field) { this.field = field; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B otherField(final int otherField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B otherField(final int otherField) { this.otherField = otherField; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -36,32 +36,32 @@ public SuperBuilderWithPrefixesBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder(field=" + this.field) + ", otherField=") + this.otherField) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class SuperBuilderWithPrefixesBuilderImpl extends SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderWithPrefixesBuilderImpl extends SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder { private SuperBuilderWithPrefixesBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithPrefixes build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithPrefixes build() { return new SuperBuilderWithPrefixes(this); } } int mField; int xOtherField; @lombok.Singular java.util.List mItems; - protected @java.lang.SuppressWarnings("all") SuperBuilderWithPrefixes(final SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithPrefixes(final SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder b) { super(); this.mField = b.field; this.xOtherField = b.otherField; @@ -78,7 +78,7 @@ private SuperBuilderWithPrefixesBuilderImpl() { } this.mItems = items; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder builder() { return new SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java index 9f13b7acbf..3742c8a452 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java @@ -1,20 +1,20 @@ import java.util.List; public class SuperBuilderWithSetterPrefix { public static @lombok.experimental.SuperBuilder(toBuilder = true,setterPrefix = "with") class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; - private @java.lang.SuppressWarnings("all") int obtainViaField; - private @java.lang.SuppressWarnings("all") int obtainViaMethod; - private @java.lang.SuppressWarnings("all") String obtainViaStaticMethod; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated int obtainViaField; + private @java.lang.SuppressWarnings("all") @lombok.Generated int obtainViaMethod; + private @java.lang.SuppressWarnings("all") @lombok.Generated String obtainViaStaticMethod; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } - protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { SuperBuilderWithSetterPrefix.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Parent instance, final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Parent instance, final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { b.withField1(instance.field1); b.withObtainViaField(instance.field1); b.withObtainViaMethod(instance.method()); @@ -24,38 +24,38 @@ public ParentBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B withField1(final int field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withField1(final int field1) { this.field1 = field1; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B withObtainViaField(final int obtainViaField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withObtainViaField(final int obtainViaField) { this.obtainViaField = obtainViaField; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B withObtainViaMethod(final int obtainViaMethod) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withObtainViaMethod(final int obtainViaMethod) { this.obtainViaMethod = obtainViaMethod; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B withObtainViaStaticMethod(final String obtainViaStaticMethod) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withObtainViaStaticMethod(final String obtainViaStaticMethod) { this.obtainViaStaticMethod = obtainViaStaticMethod; return self(); } - public @java.lang.SuppressWarnings("all") B withItem(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withItem(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B withItems(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withItems(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -65,25 +65,25 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((("SuperBuilderWithSetterPrefix.Parent.ParentBuilder(field1=" + this.field1) + ", obtainViaField=") + this.obtainViaField) + ", obtainViaMethod=") + this.obtainViaMethod) + ", obtainViaStaticMethod=") + this.obtainViaStaticMethod) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithSetterPrefix.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithSetterPrefix.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Parent build() { return new SuperBuilderWithSetterPrefix.Parent(this); } } @@ -98,7 +98,7 @@ private int method() { private static String staticMethod(Parent instance) { return "staticMethod"; } - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { super(); this.field1 = b.field1; this.obtainViaField = b.obtainViaField; @@ -117,60 +117,60 @@ private static String staticMethod(Parent instance) { } this.items = items; } - public @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Parent.ParentBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Parent.ParentBuilder toBuilder() { return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Parent.ParentBuilder builder() { return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder(toBuilder = true,setterPrefix = "set") class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderWithSetterPrefix.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Child instance, final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Child instance, final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { b.setField3(instance.field3); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B setField3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B setField3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithSetterPrefix.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithSetterPrefix.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithSetterPrefix.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Child build() { return new SuperBuilderWithSetterPrefix.Child(this); } } private double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Child.ChildBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Child.ChildBuilder toBuilder() { return new SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Child.ChildBuilder builder() { return new SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/ToStringArray.java b/test/transform/resource/after-ecj/ToStringArray.java index e6e69c851c..0903ee43a5 100644 --- a/test/transform/resource/after-ecj/ToStringArray.java +++ b/test/transform/resource/after-ecj/ToStringArray.java @@ -6,7 +6,7 @@ public ToStringArray() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ToStringArray(primitiveArray=" + java.util.Arrays.toString(this.primitiveArray)) + ", objectArray=") + java.util.Arrays.deepToString(this.objectArray)) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringArrayTypeAnnotations.java b/test/transform/resource/after-ecj/ToStringArrayTypeAnnotations.java index ef3ed4c1aa..4050c12b4d 100644 --- a/test/transform/resource/after-ecj/ToStringArrayTypeAnnotations.java +++ b/test/transform/resource/after-ecj/ToStringArrayTypeAnnotations.java @@ -10,7 +10,7 @@ public ToStringArrayTypeAnnotations() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("ToStringArrayTypeAnnotations(primitiveArray1=" + java.util.Arrays.toString(this.primitiveArray1)) + ", primitiveArray2=") + java.util.Arrays.toString(this.primitiveArray2)) + ", objectArray1=") + java.util.Arrays.deepToString(this.objectArray1)) + ", objectArray2=") + java.util.Arrays.deepToString(this.objectArray2)) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringAutoExclude.java b/test/transform/resource/after-ecj/ToStringAutoExclude.java index c25b5bfd96..a4c8ee795f 100644 --- a/test/transform/resource/after-ecj/ToStringAutoExclude.java +++ b/test/transform/resource/after-ecj/ToStringAutoExclude.java @@ -5,7 +5,7 @@ ToStringAutoExclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ToStringAutoExclude(x=" + this.x) + ", b=") + this.b) + ")"); } } @@ -16,7 +16,7 @@ ToStringAutoExclude2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("ToStringAutoExclude2(x=" + this.x) + ", $a=") + this.$a) + ", b=") + this.b) + ")"); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ToStringAutoSuper.java b/test/transform/resource/after-ecj/ToStringAutoSuper.java index fb468ddc08..d9b6651652 100644 --- a/test/transform/resource/after-ecj/ToStringAutoSuper.java +++ b/test/transform/resource/after-ecj/ToStringAutoSuper.java @@ -2,7 +2,7 @@ ToStringAutoSuperWithNoParent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "ToStringAutoSuperWithNoParent()"; } } @@ -10,7 +10,7 @@ ToStringAutoSuperWithParent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringAutoSuperWithParent(super=" + super.toString()) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringConfiguration.java b/test/transform/resource/after-ecj/ToStringConfiguration.java index 8bb99146ff..e81c925ccf 100644 --- a/test/transform/resource/after-ecj/ToStringConfiguration.java +++ b/test/transform/resource/after-ecj/ToStringConfiguration.java @@ -5,10 +5,10 @@ ToStringConfiguration() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration(" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } @@ -17,7 +17,7 @@ ToStringConfiguration2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration2(x=" + this.x) + ")"); } } @@ -26,10 +26,10 @@ ToStringConfiguration3() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration3(" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ToStringEnum.java b/test/transform/resource/after-ecj/ToStringEnum.java index d4ab5a93a4..1b9a745424 100644 --- a/test/transform/resource/after-ecj/ToStringEnum.java +++ b/test/transform/resource/after-ecj/ToStringEnum.java @@ -6,7 +6,7 @@ ToStringEnum1() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return ("ToStringEnum1." + this.name()); } } @@ -19,7 +19,7 @@ ToStringEnum2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("ToStringEnum2." + this.name()) + "(x=") + this.x) + ", name=") + this.name) + ")"); } } @@ -31,11 +31,11 @@ class ToStringEnum3 { MemberEnum() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return ("ToStringEnum3.MemberEnum." + this.name()); } } ToStringEnum3() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ToStringExplicitInclude.java b/test/transform/resource/after-ecj/ToStringExplicitInclude.java index adb3109e16..53a4c00a43 100644 --- a/test/transform/resource/after-ecj/ToStringExplicitInclude.java +++ b/test/transform/resource/after-ecj/ToStringExplicitInclude.java @@ -3,7 +3,7 @@ ToStringExplicitInclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "ToStringExplicitInclude()"; } } diff --git a/test/transform/resource/after-ecj/ToStringExplicitIncludeConf.java b/test/transform/resource/after-ecj/ToStringExplicitIncludeConf.java index a2b801c6bc..94f145feae 100644 --- a/test/transform/resource/after-ecj/ToStringExplicitIncludeConf.java +++ b/test/transform/resource/after-ecj/ToStringExplicitIncludeConf.java @@ -4,7 +4,7 @@ ToStringExplicitIncludeConf() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringExplicitIncludeConf(y=" + this.y) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringInAnonymousClass.java b/test/transform/resource/after-ecj/ToStringInAnonymousClass.java index 02ad2a88fe..20e7fbfeeb 100644 --- a/test/transform/resource/after-ecj/ToStringInAnonymousClass.java +++ b/test/transform/resource/after-ecj/ToStringInAnonymousClass.java @@ -6,7 +6,7 @@ public class ToStringInAnonymousClass { Inner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Inner(string=" + this.string) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringInner.java b/test/transform/resource/after-ecj/ToStringInner.java index a862482326..c3b5f13077 100644 --- a/test/transform/resource/after-ecj/ToStringInner.java +++ b/test/transform/resource/after-ecj/ToStringInner.java @@ -5,7 +5,7 @@ ToStringInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringInner(y=" + this.y) + ")"); } } @@ -14,7 +14,7 @@ ToStringStaticInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")"); } } @@ -24,7 +24,7 @@ class ToStringMiddle { ToStringMoreInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")"); } } @@ -37,7 +37,7 @@ class ToStringMiddle { ToStringOuter() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringNewStyle.java b/test/transform/resource/after-ecj/ToStringNewStyle.java index cdc6f5bcca..03e8279de0 100644 --- a/test/transform/resource/after-ecj/ToStringNewStyle.java +++ b/test/transform/resource/after-ecj/ToStringNewStyle.java @@ -14,7 +14,7 @@ public ToStringNewStyle() { @ToString.Include int f() { return 0; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((((((("ToStringNewStyle(a=" + this.b) + ", c=") + this.c) + ", e=") + this.d) + ", f=") + this.f()) + ", g=") + this.g) + ", i=") + this.i) + ", h=") + this.h) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringPlain.java b/test/transform/resource/after-ecj/ToStringPlain.java index 7c9b47f59d..fd9f0d4f94 100644 --- a/test/transform/resource/after-ecj/ToStringPlain.java +++ b/test/transform/resource/after-ecj/ToStringPlain.java @@ -5,7 +5,7 @@ ToString1() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ToString1(x=" + this.x) + ", name=") + this.name) + ")"); } } @@ -15,7 +15,7 @@ ToString2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ToString2(x=" + this.x) + ", name=") + this.name) + ")"); } } diff --git a/test/transform/resource/after-ecj/Tolerate.java b/test/transform/resource/after-ecj/Tolerate.java index fa3f862459..30969918ad 100644 --- a/test/transform/resource/after-ecj/Tolerate.java +++ b/test/transform/resource/after-ecj/Tolerate.java @@ -7,10 +7,10 @@ public @lombok.experimental.Tolerate void setPattern(String pattern) { setPattern(Pattern.compile(pattern)); } - public @java.lang.SuppressWarnings("all") void setPattern(final Pattern pattern) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setPattern(final Pattern pattern) { this.pattern = pattern; } - public @java.lang.SuppressWarnings("all") Pattern getPattern() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Pattern getPattern() { return this.pattern; } } @@ -22,16 +22,16 @@ public Tolerate2 withPattern(String nameGlob, String extensionGlob) { return withPattern(((nameGlob.replace("*", ".*") + "\\.") + extensionGlob.replace("*", ".*"))); } - public @java.lang.SuppressWarnings("all") Pattern getPattern() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Pattern getPattern() { return this.pattern; } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") Tolerate2 withPattern(final Pattern pattern) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Tolerate2 withPattern(final Pattern pattern) { return ((this.pattern == pattern) ? this : new Tolerate2(pattern)); } - public @java.lang.SuppressWarnings("all") Tolerate2(final Pattern pattern) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Tolerate2(final Pattern pattern) { super(); this.pattern = pattern; } diff --git a/test/transform/resource/after-ecj/TypeUseAnnotations.java b/test/transform/resource/after-ecj/TypeUseAnnotations.java index 7041b59efd..20f8a2c030 100644 --- a/test/transform/resource/after-ecj/TypeUseAnnotations.java +++ b/test/transform/resource/after-ecj/TypeUseAnnotations.java @@ -15,10 +15,10 @@ class Inner { TypeUseAnnotations() { super(); } - public @java.lang.SuppressWarnings("all") List<@TA(x = 5) String> getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated List<@TA(x = 5) String> getFoo() { return this.foo; } - public @java.lang.SuppressWarnings("all") List getBar() { + public @java.lang.SuppressWarnings("all") @lombok.Generated List getBar() { return this.bar; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/UtilityClass.java b/test/transform/resource/after-ecj/UtilityClass.java index 1db3d5402a..db83c53c97 100644 --- a/test/transform/resource/after-ecj/UtilityClass.java +++ b/test/transform/resource/after-ecj/UtilityClass.java @@ -19,7 +19,7 @@ static void someMethod() { new InnerClass(); new InnerStaticClass(); } - private @java.lang.SuppressWarnings("all") UtilityClass() { + private @java.lang.SuppressWarnings("all") @lombok.Generated UtilityClass() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -30,7 +30,7 @@ static class InnerInner { static int member; () { } - private @java.lang.SuppressWarnings("all") InnerInnerInner() { + private @java.lang.SuppressWarnings("all") @lombok.Generated InnerInnerInner() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -44,7 +44,7 @@ enum UtilityInsideEnum { static int member; () { } - private @java.lang.SuppressWarnings("all") InsideEnum() { + private @java.lang.SuppressWarnings("all") @lombok.Generated InsideEnum() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -62,7 +62,7 @@ interface UtilityInsideInterface { static int member; () { } - private @java.lang.SuppressWarnings("all") InsideInterface() { + private @java.lang.SuppressWarnings("all") @lombok.Generated InsideInterface() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -71,4 +71,4 @@ interface UtilityInsideInterface { UtilityInner() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/UtilityClassGeneric.java b/test/transform/resource/after-ecj/UtilityClassGeneric.java index 2e163d24a3..d339a5faa7 100644 --- a/test/transform/resource/after-ecj/UtilityClassGeneric.java +++ b/test/transform/resource/after-ecj/UtilityClassGeneric.java @@ -14,7 +14,7 @@ static DTO convert(Object json) { static Object convert(DTO dto) { return null; } - private @java.lang.SuppressWarnings("all") UtilityClassGeneric() { + private @java.lang.SuppressWarnings("all") @lombok.Generated UtilityClassGeneric() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } diff --git a/test/transform/resource/after-ecj/UtilityClassInner.java b/test/transform/resource/after-ecj/UtilityClassInner.java index eebc5d135a..9086367cf8 100644 --- a/test/transform/resource/after-ecj/UtilityClassInner.java +++ b/test/transform/resource/after-ecj/UtilityClassInner.java @@ -1,6 +1,6 @@ class UtilityClassInner { static final @lombok.experimental.UtilityClass class UtilClass { - private @java.lang.SuppressWarnings("all") UtilClass() { + private @java.lang.SuppressWarnings("all") @lombok.Generated UtilClass() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -8,4 +8,4 @@ class UtilityClassInner { UtilityClassInner() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ValueCallSuper.java b/test/transform/resource/after-ecj/ValueCallSuper.java index 72422a4a9e..b004edf74e 100644 --- a/test/transform/resource/after-ecj/ValueCallSuper.java +++ b/test/transform/resource/after-ecj/ValueCallSuper.java @@ -4,7 +4,7 @@ class ValueParent { } } final @lombok.Value class ValueCallSuper extends ValueParent { - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueCallSuper))) @@ -16,17 +16,17 @@ class ValueParent { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof ValueCallSuper); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = super.hashCode(); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "ValueCallSuper()"; } - public @java.lang.SuppressWarnings("all") ValueCallSuper() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ValueCallSuper() { super(); } } diff --git a/test/transform/resource/after-ecj/ValueInAnonymousClass.java b/test/transform/resource/after-ecj/ValueInAnonymousClass.java index 49cf8fc2f8..eb28b81e3e 100644 --- a/test/transform/resource/after-ecj/ValueInAnonymousClass.java +++ b/test/transform/resource/after-ecj/ValueInAnonymousClass.java @@ -3,10 +3,10 @@ public class ValueInAnonymousClass { Object annonymous = new Object() { final @Value class Inner { private final String string; - public @java.lang.SuppressWarnings("all") String getString() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getString() { return this.string; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Inner))) @@ -18,17 +18,17 @@ public class ValueInAnonymousClass { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $string = this.getString(); result = ((result * PRIME) + (($string == null) ? 43 : $string.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Inner(string=" + this.getString()) + ")"); } - public @java.lang.SuppressWarnings("all") Inner(final String string) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner(final String string) { super(); this.string = string; } diff --git a/test/transform/resource/after-ecj/ValuePlain.java b/test/transform/resource/after-ecj/ValuePlain.java index 442a63ac9c..4b03937b95 100644 --- a/test/transform/resource/after-ecj/ValuePlain.java +++ b/test/transform/resource/after-ecj/ValuePlain.java @@ -2,13 +2,13 @@ final @lombok.Value class Value1 { private final int x; private final String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value1))) @@ -22,7 +22,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -30,10 +30,10 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Value1(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Value1(final int x, final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Value1(final int x, final String name) { super(); this.x = x; this.name = name; @@ -42,13 +42,13 @@ @Value @lombok.experimental.NonFinal class Value2 { public final int x; private final String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value2))) @@ -64,10 +64,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Value2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -75,10 +75,10 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Value2(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Value2(final int x, final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Value2(final int x, final String name) { super(); this.x = x; this.name = name; @@ -87,13 +87,13 @@ final @Value class Value3 { private @lombok.experimental.NonFinal int x; private final int y; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") int getY() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value3))) @@ -105,17 +105,17 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); result = ((result * PRIME) + this.getY()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Value3(x=" + this.getX()) + ", y=") + this.getY()) + ")"); } - public @java.lang.SuppressWarnings("all") Value3(final int x, final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Value3(final int x, final int y) { super(); this.x = x; this.y = y; diff --git a/test/transform/resource/after-ecj/ValueStaticConstructorOf.java b/test/transform/resource/after-ecj/ValueStaticConstructorOf.java index 878835660a..15d140d7a2 100644 --- a/test/transform/resource/after-ecj/ValueStaticConstructorOf.java +++ b/test/transform/resource/after-ecj/ValueStaticConstructorOf.java @@ -7,13 +7,13 @@ private ValueStaticConstructorOf(String name, Double price) { this.name = name; this.price = price; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") Double getPrice() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Double getPrice() { return this.price; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueStaticConstructorOf))) @@ -29,7 +29,7 @@ private ValueStaticConstructorOf(String name, Double price) { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $price = this.getPrice(); @@ -38,10 +38,10 @@ private ValueStaticConstructorOf(String name, Double price) { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ValueStaticConstructorOf(name=" + this.getName()) + ", price=") + this.getPrice()) + ")"); } - public static @java.lang.SuppressWarnings("all") ValueStaticConstructorOf of(final String name, final Double price) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ValueStaticConstructorOf of(final String name, final Double price) { return new ValueStaticConstructorOf(name, price); } } diff --git a/test/transform/resource/after-ecj/ValueStaticField.java b/test/transform/resource/after-ecj/ValueStaticField.java index d1e74708b2..adbf620f73 100644 --- a/test/transform/resource/after-ecj/ValueStaticField.java +++ b/test/transform/resource/after-ecj/ValueStaticField.java @@ -4,21 +4,21 @@ static String PASSWORD = "Ken sent me"; () { } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueStaticField))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "ValueStaticField()"; } - public @java.lang.SuppressWarnings("all") ValueStaticField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ValueStaticField() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java index 8117dbb040..5be622c83a 100644 --- a/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java @@ -1,9 +1,9 @@ final @lombok.Value class ValueWithJavaBeansSpecCapitalization { private final int aField; - public @java.lang.SuppressWarnings("all") int getaField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getaField() { return this.aField; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueWithJavaBeansSpecCapitalization))) @@ -13,16 +13,16 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getaField()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ValueWithJavaBeansSpecCapitalization(aField=" + this.getaField()) + ")"); } - public @java.lang.SuppressWarnings("all") ValueWithJavaBeansSpecCapitalization(final int aField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ValueWithJavaBeansSpecCapitalization(final int aField) { super(); this.aField = aField; } diff --git a/test/transform/resource/after-ecj/WithAlreadyExists.java b/test/transform/resource/after-ecj/WithAlreadyExists.java index 9dbd6d8aa1..46ea5bb86c 100644 --- a/test/transform/resource/after-ecj/WithAlreadyExists.java +++ b/test/transform/resource/after-ecj/WithAlreadyExists.java @@ -40,7 +40,7 @@ void withFoo() { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") With5 withFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated With5 withFoo(final String foo) { return ((this.foo == foo) ? this : new With5(foo)); } } @@ -54,7 +54,7 @@ void withFoo(String foo, int x) { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") With6 withFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated With6 withFoo(final String foo) { return ((this.foo == foo) ? this : new With6(foo)); } } diff --git a/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java b/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java index 52a7f3a342..f27118379c 100644 --- a/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java +++ b/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java @@ -7,16 +7,16 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor withTest(final J test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithAndAllArgsConstructor withTest(final J test) { return ((this.test == test) ? this : new WithAndAllArgsConstructor(test, this.test2, this.y, this.z)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor withTest2(final java.util.List test2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithAndAllArgsConstructor withTest2(final java.util.List test2) { return ((this.test2 == test2) ? this : new WithAndAllArgsConstructor(this.test, test2, this.y, this.z)); } - public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor(final J test, final java.util.List test2, final int y, final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithAndAllArgsConstructor(final J test, final java.util.List test2, final int y, final int z) { super(); this.test = test; this.test2 = test2; diff --git a/test/transform/resource/after-ecj/WithByInAnonymousClass.java b/test/transform/resource/after-ecj/WithByInAnonymousClass.java index 1bc3e80c0a..4f9d7b7150 100644 --- a/test/transform/resource/after-ecj/WithByInAnonymousClass.java +++ b/test/transform/resource/after-ecj/WithByInAnonymousClass.java @@ -6,7 +6,7 @@ public class WithByInAnonymousClass { private Inner(String string) { super(); } - public @java.lang.SuppressWarnings("all") Inner withStringBy(final java.util.function.Function transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner withStringBy(final java.util.function.Function transformer) { return new Inner(transformer.apply(this.string)); } } diff --git a/test/transform/resource/after-ecj/WithByNullAnnos.java b/test/transform/resource/after-ecj/WithByNullAnnos.java index ff140192a3..4b731cc51e 100644 --- a/test/transform/resource/after-ecj/WithByNullAnnos.java +++ b/test/transform/resource/after-ecj/WithByNullAnnos.java @@ -1,11 +1,11 @@ import java.util.List; public @lombok.RequiredArgsConstructor class WithByNullAnnos { final @lombok.experimental.WithBy List test; - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") WithByNullAnnos withTestBy(final java.util.function. @org.checkerframework.checker.nullness.qual.NonNull Function, ? extends List> transformer) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated WithByNullAnnos withTestBy(final java.util.function. @org.checkerframework.checker.nullness.qual.NonNull Function, ? extends List> transformer) { return new WithByNullAnnos(transformer.apply(this.test)); } - public @java.lang.SuppressWarnings("all") WithByNullAnnos(final List test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByNullAnnos(final List test) { super(); this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/WithByOnRecord.java b/test/transform/resource/after-ecj/WithByOnRecord.java index a6ec01fb09..a2363f3f22 100644 --- a/test/transform/resource/after-ecj/WithByOnRecord.java +++ b/test/transform/resource/after-ecj/WithByOnRecord.java @@ -3,10 +3,10 @@ public @WithBy record WithByOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - public @java.lang.SuppressWarnings("all") WithByOnRecord withABy(final java.util.function.Function transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByOnRecord withABy(final java.util.function.Function transformer) { return new WithByOnRecord(transformer.apply(this.a), this.b); } - public @java.lang.SuppressWarnings("all") WithByOnRecord withBBy(final java.util.function.Function transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByOnRecord withBBy(final java.util.function.Function transformer) { return new WithByOnRecord(this.a, transformer.apply(this.b)); } } diff --git a/test/transform/resource/after-ecj/WithByOnRecordComponent.java b/test/transform/resource/after-ecj/WithByOnRecordComponent.java index 5502eb062d..4d3fc72fb3 100644 --- a/test/transform/resource/after-ecj/WithByOnRecordComponent.java +++ b/test/transform/resource/after-ecj/WithByOnRecordComponent.java @@ -3,7 +3,7 @@ public record WithByOnRecordComponent(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - public @java.lang.SuppressWarnings("all") WithByOnRecordComponent withABy(final java.util.function.Function transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByOnRecordComponent withABy(final java.util.function.Function transformer) { return new WithByOnRecordComponent(transformer.apply(this.a), this.b); } } diff --git a/test/transform/resource/after-ecj/WithByTypes.java b/test/transform/resource/after-ecj/WithByTypes.java index b997ffba8d..15cb2dca09 100644 --- a/test/transform/resource/after-ecj/WithByTypes.java +++ b/test/transform/resource/after-ecj/WithByTypes.java @@ -11,7 +11,7 @@ public static void example() { new WithByTypes(0, 0, (short) 0, ' ', (byte) 0, 0.0, 0.0F, true, "").withHBy(( x) -> (! x)).withFBy(( x) -> (x + 0.5)); } - public @java.lang.SuppressWarnings("all") WithByTypes(final int a, final long b, final short c, final char d, final byte e, final double f, final float g, final boolean h, final T i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes(final int a, final long b, final short c, final char d, final byte e, final double f, final float g, final boolean h, final T i) { super(); this.a = a; this.b = b; @@ -23,31 +23,31 @@ public static void example() { this.h = h; this.i = i; } - public @java.lang.SuppressWarnings("all") WithByTypes withABy(final java.util.function.IntUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withABy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(transformer.applyAsInt(this.a), this.b, this.c, this.d, this.e, this.f, this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withBBy(final java.util.function.LongUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withBBy(final java.util.function.LongUnaryOperator transformer) { return new WithByTypes(this.a, transformer.applyAsLong(this.b), this.c, this.d, this.e, this.f, this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withCBy(final java.util.function.IntUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withCBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, (short) transformer.applyAsInt(this.c), this.d, this.e, this.f, this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withDBy(final java.util.function.IntUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withDBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, (char) transformer.applyAsInt(this.d), this.e, this.f, this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withEBy(final java.util.function.IntUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withEBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, (byte) transformer.applyAsInt(this.e), this.f, this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withFBy(final java.util.function.DoubleUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withFBy(final java.util.function.DoubleUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, transformer.applyAsDouble(this.f), this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withGBy(final java.util.function.DoubleUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withGBy(final java.util.function.DoubleUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, (float) transformer.applyAsDouble(this.g), this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withHBy(final java.util.function.UnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withHBy(final java.util.function.UnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, this.g, transformer.apply(this.h), this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withIBy(final java.util.function.Function transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withIBy(final java.util.function.Function transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, this.g, this.h, transformer.apply(this.i)); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/WithInAnonymousClass.java b/test/transform/resource/after-ecj/WithInAnonymousClass.java index fef9602280..8a6db1debd 100644 --- a/test/transform/resource/after-ecj/WithInAnonymousClass.java +++ b/test/transform/resource/after-ecj/WithInAnonymousClass.java @@ -9,7 +9,7 @@ private Inner(String string) { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") Inner withString(final String string) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner withString(final String string) { return ((this.string == string) ? this : new Inner(string)); } } diff --git a/test/transform/resource/after-ecj/WithMethodAbstract.java b/test/transform/resource/after-ecj/WithMethodAbstract.java index e0b14fc206..324b5011b4 100644 --- a/test/transform/resource/after-ecj/WithMethodAbstract.java +++ b/test/transform/resource/after-ecj/WithMethodAbstract.java @@ -6,5 +6,5 @@ abstract class WithMethodAbstract { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public abstract @java.lang.SuppressWarnings("all") WithMethodAbstract withFoo(final String foo); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated WithMethodAbstract withFoo(final String foo); } diff --git a/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java b/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java index d5f2bbcc40..8cd97772b0 100644 --- a/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java +++ b/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java @@ -8,14 +8,14 @@ class WithMethodMarkedDeprecated { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WithMethodMarkedDeprecated withAnnotation(final int annotation) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated WithMethodMarkedDeprecated withAnnotation(final int annotation) { return ((this.annotation == annotation) ? this : new WithMethodMarkedDeprecated(annotation, this.javadoc)); } /** * @deprecated * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WithMethodMarkedDeprecated withJavadoc(final int javadoc) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated WithMethodMarkedDeprecated withJavadoc(final int javadoc) { return ((this.javadoc == javadoc) ? this : new WithMethodMarkedDeprecated(this.annotation, javadoc)); } } diff --git a/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java b/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java index d4604af52b..7805bcb20b 100644 --- a/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java +++ b/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java @@ -7,8 +7,7 @@ class WithMethodMarkedDeprecatedAnnOnly { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WithMethodMarkedDeprecatedAnnOnly withAnnotation(final int annotation) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated WithMethodMarkedDeprecatedAnnOnly withAnnotation(final int annotation) { return ((this.annotation == annotation) ? this : new WithMethodMarkedDeprecatedAnnOnly(annotation)); } } - diff --git a/test/transform/resource/after-ecj/WithNested.java b/test/transform/resource/after-ecj/WithNested.java index 25a8bcedd5..9ce69f37aa 100644 --- a/test/transform/resource/after-ecj/WithNested.java +++ b/test/transform/resource/after-ecj/WithNested.java @@ -4,10 +4,10 @@ public interface WithNested { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithNested.IAmStaticReally withX(final String x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithNested.IAmStaticReally withX(final String x) { return ((this.x == x) ? this : new WithNested.IAmStaticReally(x)); } - public @java.lang.SuppressWarnings("all") IAmStaticReally(final String x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated IAmStaticReally(final String x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/WithOnClass.java b/test/transform/resource/after-ecj/WithOnClass.java index 1c635fcee0..2483fc585d 100644 --- a/test/transform/resource/after-ecj/WithOnClass.java +++ b/test/transform/resource/after-ecj/WithOnClass.java @@ -7,7 +7,7 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnClass1 withPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass1 withPublic(final boolean isPublic) { return ((this.isPublic == isPublic) ? this : new WithOnClass1(this.isNone, isPublic)); } } @@ -21,13 +21,13 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - @java.lang.SuppressWarnings("all") WithOnClass2 withPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass2 withPackage(final boolean isPackage) { return ((this.isPackage == isPackage) ? this : new WithOnClass2(this.isNone, this.isProtected, isPackage)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - protected @java.lang.SuppressWarnings("all") WithOnClass2 withProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass2 withProtected(final boolean isProtected) { return ((this.isProtected == isProtected) ? this : new WithOnClass2(this.isNone, isProtected, this.isPackage)); } } @@ -40,13 +40,13 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnClass3 withCouldBeNull(final String couldBeNull) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass3 withCouldBeNull(final String couldBeNull) { return ((this.couldBeNull == couldBeNull) ? this : new WithOnClass3(couldBeNull, this.nonNull)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnClass3 withNonNull(final @lombok.NonNull String nonNull) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass3 withNonNull(final @lombok.NonNull String nonNull) { if ((nonNull == null)) { throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); @@ -64,7 +64,7 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnClass4 withY(final int fY) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass4 withY(final int fY) { return ((this.fY == fY) ? this : new WithOnClass4(fY)); } } diff --git a/test/transform/resource/after-ecj/WithOnNestedRecord.java b/test/transform/resource/after-ecj/WithOnNestedRecord.java index a83ac94cc9..ecd76658b8 100644 --- a/test/transform/resource/after-ecj/WithOnNestedRecord.java +++ b/test/transform/resource/after-ecj/WithOnNestedRecord.java @@ -3,17 +3,16 @@ public record WithOnNestedRecord() { public @With record Nested(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnNestedRecord.Nested withA(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnNestedRecord.Nested withA(final String a) { return ((this.a == a) ? this : new WithOnNestedRecord.Nested(a, this.b)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnNestedRecord.Nested withB(final String b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnNestedRecord.Nested withB(final String b) { return ((this.b == b) ? this : new WithOnNestedRecord.Nested(this.a, b)); } } diff --git a/test/transform/resource/after-ecj/WithOnRecord.java b/test/transform/resource/after-ecj/WithOnRecord.java index 1b34e661ac..b8bf738ebf 100644 --- a/test/transform/resource/after-ecj/WithOnRecord.java +++ b/test/transform/resource/after-ecj/WithOnRecord.java @@ -6,13 +6,13 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnRecord withA(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnRecord withA(final String a) { return ((this.a == a) ? this : new WithOnRecord(a, this.b)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnRecord withB(final String b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnRecord withB(final String b) { return ((this.b == b) ? this : new WithOnRecord(this.a, b)); } } diff --git a/test/transform/resource/after-ecj/WithOnRecordComponent.java b/test/transform/resource/after-ecj/WithOnRecordComponent.java index 7d210a0adf..49c052571c 100644 --- a/test/transform/resource/after-ecj/WithOnRecordComponent.java +++ b/test/transform/resource/after-ecj/WithOnRecordComponent.java @@ -6,7 +6,7 @@ public record WithOnRecordComponent(String a, String b) { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnRecordComponent withA(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnRecordComponent withA(final String a) { return ((this.a == a) ? this : new WithOnRecordComponent(a, this.b)); } } diff --git a/test/transform/resource/after-ecj/WithPlain.java b/test/transform/resource/after-ecj/WithPlain.java index 9f888abe48..7f6f77f9d8 100644 --- a/test/transform/resource/after-ecj/WithPlain.java +++ b/test/transform/resource/after-ecj/WithPlain.java @@ -10,13 +10,13 @@ class WithPlain { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") WithPlain withI(final int i) { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated WithPlain withI(final int i) { return ((this.i == i) ? this : new WithPlain(i, this.foo)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") WithPlain withFoo(final int foo) { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated WithPlain withFoo(final int foo) { return ((this.foo == foo) ? this : new WithPlain(this.i, foo)); } } diff --git a/test/transform/resource/after-ecj/WithWithGenerics.java b/test/transform/resource/after-ecj/WithWithGenerics.java index 98b1809297..c971c656f6 100644 --- a/test/transform/resource/after-ecj/WithWithGenerics.java +++ b/test/transform/resource/after-ecj/WithWithGenerics.java @@ -9,19 +9,19 @@ public WithWithGenerics(J test, java.util.List test2, java.util.List withTest(final J test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithWithGenerics withTest(final J test) { return ((this.test == test) ? this : new WithWithGenerics(test, this.test2, this.test3)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithWithGenerics withTest2(final java.util.List test2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithWithGenerics withTest2(final java.util.List test2) { return ((this.test2 == test2) ? this : new WithWithGenerics(this.test, test2, this.test3)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithWithGenerics withTest3(final java.util.List test3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithWithGenerics withTest3(final java.util.List test3) { return ((this.test3 == test3) ? this : new WithWithGenerics(this.test, this.test2, test3)); } } diff --git a/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java index fb035da4a3..1f4e152fed 100644 --- a/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java @@ -6,7 +6,7 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithWithJavaBeansSpecCapitalization withaField(final int aField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithWithJavaBeansSpecCapitalization withaField(final int aField) { return ((this.aField == aField) ? this : new WithWithJavaBeansSpecCapitalization(aField)); } } diff --git a/test/transform/resource/after-ecj/WithWithTypeAnnos.java b/test/transform/resource/after-ecj/WithWithTypeAnnos.java index 8f1b3f6972..5b1f498e81 100644 --- a/test/transform/resource/after-ecj/WithWithTypeAnnos.java +++ b/test/transform/resource/after-ecj/WithWithTypeAnnos.java @@ -15,7 +15,7 @@ class WithWithTypeAnnos { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithWithTypeAnnos withFoo(final @TA List foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithWithTypeAnnos withFoo(final @TA List foo) { return ((this.foo == foo) ? this : new WithWithTypeAnnos(foo)); } } diff --git a/test/transform/resource/after-ecj/WitherAccessLevel.java b/test/transform/resource/after-ecj/WitherAccessLevel.java index b6457534b8..b0610a1157 100644 --- a/test/transform/resource/after-ecj/WitherAccessLevel.java +++ b/test/transform/resource/after-ecj/WitherAccessLevel.java @@ -12,31 +12,31 @@ class WitherAccessLevel { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - private @java.lang.SuppressWarnings("all") WitherAccessLevel withPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @lombok.Generated WitherAccessLevel withPrivate(final boolean isPrivate) { return ((this.isPrivate == isPrivate) ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - @java.lang.SuppressWarnings("all") WitherAccessLevel withPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @lombok.Generated WitherAccessLevel withPackage(final boolean isPackage) { return ((this.isPackage == isPackage) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - protected @java.lang.SuppressWarnings("all") WitherAccessLevel withProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated WitherAccessLevel withProtected(final boolean isProtected) { return ((this.isProtected == isProtected) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WitherAccessLevel withPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WitherAccessLevel withPublic(final boolean isPublic) { return ((this.isPublic == isPublic) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WitherAccessLevel withValue(final boolean value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WitherAccessLevel withValue(final boolean value) { return ((this.value == value) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value)); } } diff --git a/test/transform/resource/after-ecj/WitherLegacyStar.java b/test/transform/resource/after-ecj/WitherLegacyStar.java index 2b9ebe79c9..45faa5d1e8 100644 --- a/test/transform/resource/after-ecj/WitherLegacyStar.java +++ b/test/transform/resource/after-ecj/WitherLegacyStar.java @@ -8,7 +8,7 @@ class WitherLegacyStar { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WitherLegacyStar withI(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WitherLegacyStar withI(final int i) { return ((this.i == i) ? this : new WitherLegacyStar(i)); } -} \ No newline at end of file +} diff --git a/test/transform/resource/before/GeneratedJavaxOff.java b/test/transform/resource/before/GeneratedJavaxOff.java deleted file mode 100644 index db7ee0d130..0000000000 --- a/test/transform/resource/before/GeneratedJavaxOff.java +++ /dev/null @@ -1,5 +0,0 @@ -//CONF: lombok.addJavaxGeneratedAnnotation = false -class GeneratedJavaxOff { - @lombok.Getter - int x; -} diff --git a/test/transform/resource/before/GeneratedJavaxOffLombokOff.java b/test/transform/resource/before/GeneratedJavaxOffLombokOff.java new file mode 100644 index 0000000000..0d0a36e970 --- /dev/null +++ b/test/transform/resource/before/GeneratedJavaxOffLombokOff.java @@ -0,0 +1,6 @@ +//CONF: lombok.addJavaxGeneratedAnnotation = false +//CONF: lombok.addLombokGeneratedAnnotation = false +class GeneratedJavaxOffLombokOff { + @lombok.Getter + int x; +} From a97891e5f6ba635f6447aa3f42146227f0b50a26 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:27:13 +0200 Subject: [PATCH 029/118] [tests] Continue with adjusting tests to reflect `lombok.Generated` defaulted: eclipse usually skipped tests. --- .../resource/after-ecj/DelegateGenerics.java | 6 +++--- .../resource/after-ecj/DelegateOnGetter.java | 6 +++--- .../after-ecj/DelegateOnGetterNone.java | 4 ++-- .../resource/after-ecj/DelegateOnMethods.java | 2 +- .../after-ecj/DelegateTypesAndExcludes.java | 4 ++-- .../after-ecj/DelegateWithDeprecated.java | 6 +++--- .../after-ecj/DelegateWithVarargs.java | 8 ++++---- .../after-ecj/DelegateWithVarargs2.java | 2 +- .../after-ecj/LoggerFloggerRecord.java | 2 +- .../resource/after-ecj/MixGetterVal.java | 2 +- .../resource/after-ecj/OnXJava7Style.java | 18 +++++++++--------- .../resource/after-ecj/OnXJava8StyleOn7.java | 18 +++++++++--------- .../after-ecj/TrickyTypeResolution.java | 2 +- .../after-ecj/ValDelegateMethodReference.java | 16 ++++++++-------- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/test/transform/resource/after-ecj/DelegateGenerics.java b/test/transform/resource/after-ecj/DelegateGenerics.java index 97b05102a7..72819c962d 100644 --- a/test/transform/resource/after-ecj/DelegateGenerics.java +++ b/test/transform/resource/after-ecj/DelegateGenerics.java @@ -3,13 +3,13 @@ public class DelegateGenerics { public DelegateGenerics() { super(); } - public @java.lang.SuppressWarnings("all") T a(final T a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated T a(final T a) { return this.target.a(a); } - public @java.lang.SuppressWarnings("all") java.lang.String i(final java.lang.String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String i(final java.lang.String a) { return this.target.i(a); } - public @java.lang.SuppressWarnings("all") java.lang.Integer t(final java.lang.Integer t) { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Integer t(final java.lang.Integer t) { return this.target.t(t); } } diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java index c23ea91709..5378257a6d 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetter.java +++ b/test/transform/resource/after-ecj/DelegateOnGetter.java @@ -9,7 +9,7 @@ private interface Bar { DelegateOnGetter() { super(); } - public @Delegate @java.lang.SuppressWarnings({"all", "unchecked"}) Bar getBar() { + public @Delegate @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated Bar getBar() { java.lang.Object $value = this.bar.get(); if (($value == null)) { @@ -35,10 +35,10 @@ public int getInt() { } return (Bar) (($value == this.bar) ? null : $value); } - public @java.lang.SuppressWarnings("all") int getInt() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getInt() { return this.getBar().getInt(); } - public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setList(final java.util.ArrayList list) { this.getBar().setList(list); } } diff --git a/test/transform/resource/after-ecj/DelegateOnGetterNone.java b/test/transform/resource/after-ecj/DelegateOnGetterNone.java index 0cfb02c0ed..79cc34e846 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetterNone.java +++ b/test/transform/resource/after-ecj/DelegateOnGetterNone.java @@ -10,10 +10,10 @@ private interface Bar { DelegateOnGetterNone() { super(); } - public @java.lang.SuppressWarnings("all") int getInt() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getInt() { return this.bar.getInt(); } - public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setList(final java.util.ArrayList list) { this.bar.setList(list); } } diff --git a/test/transform/resource/after-ecj/DelegateOnMethods.java b/test/transform/resource/after-ecj/DelegateOnMethods.java index 6560657ce4..2b45bb09b6 100644 --- a/test/transform/resource/after-ecj/DelegateOnMethods.java +++ b/test/transform/resource/after-ecj/DelegateOnMethods.java @@ -7,7 +7,7 @@ public static interface Bar { super(); } public abstract @Delegate Bar getBar(); - public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void bar(final java.util.ArrayList list) { this.getBar().bar(list); } } diff --git a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java index 86f54139c8..096b662f43 100644 --- a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java +++ b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java @@ -27,10 +27,10 @@ private static interface Bar { DelegatePlain() { super(); } - public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void bar(final java.util.ArrayList list) { this.bar.bar(list); } - public @java.lang.SuppressWarnings("all") void foo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated void foo() { this.foo.foo(); } } diff --git a/test/transform/resource/after-ecj/DelegateWithDeprecated.java b/test/transform/resource/after-ecj/DelegateWithDeprecated.java index 71eb788935..6f789d48c1 100644 --- a/test/transform/resource/after-ecj/DelegateWithDeprecated.java +++ b/test/transform/resource/after-ecj/DelegateWithDeprecated.java @@ -9,13 +9,13 @@ private interface Bar { DelegateWithDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void deprecatedAnnotation() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void deprecatedAnnotation() { this.bar.deprecatedAnnotation(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void deprecatedComment() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void deprecatedComment() { this.bar.deprecatedComment(); } - public @java.lang.SuppressWarnings("all") void notDeprecated() { + public @java.lang.SuppressWarnings("all") @lombok.Generated void notDeprecated() { this.bar.notDeprecated(); } } diff --git a/test/transform/resource/after-ecj/DelegateWithVarargs.java b/test/transform/resource/after-ecj/DelegateWithVarargs.java index 71a0ca5a5e..83ae59a5f8 100644 --- a/test/transform/resource/after-ecj/DelegateWithVarargs.java +++ b/test/transform/resource/after-ecj/DelegateWithVarargs.java @@ -10,16 +10,16 @@ private interface Bar { DelegateWithVarargs() { super(); } - public @java.lang.SuppressWarnings("all") void array(final int[] array) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void array(final int[] array) { this.bar.array(array); } - public @java.lang.SuppressWarnings("all") void arrayVarargs(final int[]... arrayVarargs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void arrayVarargs(final int[]... arrayVarargs) { this.bar.arrayVarargs(arrayVarargs); } - public @java.lang.SuppressWarnings("all") void justOneParameter(final int... varargs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void justOneParameter(final int... varargs) { this.bar.justOneParameter(varargs); } - public @java.lang.SuppressWarnings("all") void multipleParameters(final java.lang.String first, final int... varargs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void multipleParameters(final java.lang.String first, final int... varargs) { this.bar.multipleParameters(first, varargs); } } diff --git a/test/transform/resource/after-ecj/DelegateWithVarargs2.java b/test/transform/resource/after-ecj/DelegateWithVarargs2.java index ed0cddf532..444f8a54b4 100644 --- a/test/transform/resource/after-ecj/DelegateWithVarargs2.java +++ b/test/transform/resource/after-ecj/DelegateWithVarargs2.java @@ -11,7 +11,7 @@ public void varargs(Object[]... keys) { DelegateWithVarargs2() { super(); } - public @java.lang.SuppressWarnings("all") void varargs(final java.lang.Object[]... keys) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void varargs(final java.lang.Object[]... keys) { this.bar.varargs(keys); } } diff --git a/test/transform/resource/after-ecj/LoggerFloggerRecord.java b/test/transform/resource/after-ecj/LoggerFloggerRecord.java index 7db8aabebb..47bf4cc6e6 100644 --- a/test/transform/resource/after-ecj/LoggerFloggerRecord.java +++ b/test/transform/resource/after-ecj/LoggerFloggerRecord.java @@ -3,7 +3,7 @@ class LoggerFloggerRecord { public @Flogger record Inner(String x) { /* Implicit */ private final String x; - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } } diff --git a/test/transform/resource/after-ecj/MixGetterVal.java b/test/transform/resource/after-ecj/MixGetterVal.java index d980970320..82d061ed6f 100644 --- a/test/transform/resource/after-ecj/MixGetterVal.java +++ b/test/transform/resource/after-ecj/MixGetterVal.java @@ -13,7 +13,7 @@ public void test() { final @val int a = getX(); m(a); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/OnXJava7Style.java b/test/transform/resource/after-ecj/OnXJava7Style.java index b38c2c906d..0bdb304655 100644 --- a/test/transform/resource/after-ecj/OnXJava7Style.java +++ b/test/transform/resource/after-ecj/OnXJava7Style.java @@ -20,31 +20,31 @@ public class OnXJava7Style { public OnXJava7Style() { super(); } - public @Foo @java.lang.SuppressWarnings("all") String getA() { + public @Foo @java.lang.SuppressWarnings("all") @lombok.Generated String getA() { return this.a; } - public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) { + public @Foo() @java.lang.SuppressWarnings("all") @lombok.Generated void setB(final String b) { this.b = b; } - public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setC(final @Foo("a") String c) { this.c = c; } - public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setD(final @Bar(stuff = "b") String d) { this.d = d; } - public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() { + public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @lombok.Generated String getE() { return this.e; } - public @Array @java.lang.SuppressWarnings("all") String getF() { + public @Array @java.lang.SuppressWarnings("all") @lombok.Generated String getF() { return this.f; } - public @Array() @java.lang.SuppressWarnings("all") String getG() { + public @Array() @java.lang.SuppressWarnings("all") @lombok.Generated String getG() { return this.g; } - public @Array({}) @java.lang.SuppressWarnings("all") String getH() { + public @Array({}) @java.lang.SuppressWarnings("all") @lombok.Generated String getH() { return this.h; } - public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") String getI() { + public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") @lombok.Generated String getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/OnXJava8StyleOn7.java b/test/transform/resource/after-ecj/OnXJava8StyleOn7.java index 109d975a62..6836e45df7 100644 --- a/test/transform/resource/after-ecj/OnXJava8StyleOn7.java +++ b/test/transform/resource/after-ecj/OnXJava8StyleOn7.java @@ -20,31 +20,31 @@ public class OnXJava8StyleOn7 { public OnXJava8StyleOn7() { super(); } - public @Foo @java.lang.SuppressWarnings("all") String getA() { + public @Foo @java.lang.SuppressWarnings("all") @lombok.Generated String getA() { return this.a; } - public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) { + public @Foo() @java.lang.SuppressWarnings("all") @lombok.Generated void setB(final String b) { this.b = b; } - public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setC(final @Foo("a") String c) { this.c = c; } - public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setD(final @Bar(stuff = "b") String d) { this.d = d; } - public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() { + public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @lombok.Generated String getE() { return this.e; } - public @Array @java.lang.SuppressWarnings("all") String getF() { + public @Array @java.lang.SuppressWarnings("all") @lombok.Generated String getF() { return this.f; } - public @Array() @java.lang.SuppressWarnings("all") String getG() { + public @Array() @java.lang.SuppressWarnings("all") @lombok.Generated String getG() { return this.g; } - public @Array({}) @java.lang.SuppressWarnings("all") String getH() { + public @Array({}) @java.lang.SuppressWarnings("all") @lombok.Generated String getH() { return this.h; } - public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") String getI() { + public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") @lombok.Generated String getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/TrickyTypeResolution.java b/test/transform/resource/after-ecj/TrickyTypeResolution.java index 4553aabac9..67bab8b787 100644 --- a/test/transform/resource/after-ecj/TrickyTypeResolution.java +++ b/test/transform/resource/after-ecj/TrickyTypeResolution.java @@ -20,7 +20,7 @@ class TrickySuccess { TrickySuccess() { super(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/ValDelegateMethodReference.java b/test/transform/resource/after-ecj/ValDelegateMethodReference.java index cfd0dab2bf..bcc54e268d 100644 --- a/test/transform/resource/after-ecj/ValDelegateMethodReference.java +++ b/test/transform/resource/after-ecj/ValDelegateMethodReference.java @@ -24,16 +24,16 @@ class Entity { Entity() { super(); } - public @java.lang.SuppressWarnings("all") java.lang.Boolean getABoolean() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Boolean getABoolean() { return this.innerDelegate.getABoolean(); } - public @java.lang.SuppressWarnings("all") java.lang.String getValue() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String getValue() { return this.innerDelegate.getValue(); } - public @java.lang.SuppressWarnings("all") void setABoolean(final java.lang.Boolean aBoolean) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setABoolean(final java.lang.Boolean aBoolean) { this.innerDelegate.setABoolean(aBoolean); } - public @java.lang.SuppressWarnings("all") void setValue(final java.lang.String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setValue(final java.lang.String value) { this.innerDelegate.setValue(value); } } @@ -43,16 +43,16 @@ class Entity { MyDelegate() { super(); } - public @java.lang.SuppressWarnings("all") String getValue() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getValue() { return this.value; } - public @java.lang.SuppressWarnings("all") Boolean getABoolean() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Boolean getABoolean() { return this.aBoolean; } - public @java.lang.SuppressWarnings("all") void setValue(final String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setValue(final String value) { this.value = value; } - public @java.lang.SuppressWarnings("all") void setABoolean(final Boolean aBoolean) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setABoolean(final Boolean aBoolean) { this.aBoolean = aBoolean; } } From d8f7b19071cba11d36e7f88d5b4bea74f60d6350 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:38:49 +0200 Subject: [PATCH 030/118] [tests] This seemingly humongous commit is actually nothing: All test-cases now have `@Generated` annotations where before they did not. --- .../resource/after-delombok/Accessors.java | 16 ++++ .../after-delombok/AccessorsCascade.java | 6 +- .../AccessorsConfiguration.java | 4 + .../AccessorsInAnonymousClass.java | 5 +- .../after-delombok/AccessorsMakeFinal.java | 3 +- .../AccessorsMakeFinalLombokConfig.java | 3 +- .../AccessorsNoParamWarning.java | 4 +- .../BuilderAccessWithGetter.java | 18 ++--- .../after-delombok/BuilderComplex.java | 13 ++++ .../BuilderConstructorJavadoc.java | 23 +++--- .../after-delombok/BuilderDefaults.java | 24 +++++- .../after-delombok/BuilderDefaultsArray.java | 26 ++++--- .../BuilderDefaultsGenerics.java | 18 +++++ .../BuilderDefaultsTargetTyping.java | 21 +++--- .../BuilderDefaultsWarnings.java | 19 +++++ .../after-delombok/BuilderGenericMethod.java | 9 +++ .../after-delombok/BuilderInstanceMethod.java | 13 ++++ .../after-delombok/BuilderJavadoc.java | 14 ++++ .../after-delombok/BuilderNestedInEnum.java | 14 +++- .../after-delombok/BuilderOnNestedClass.java | 18 ++--- .../after-delombok/BuilderOnNestedRecord.java | 14 ++-- .../after-delombok/BuilderSimple.java | 10 +++ .../after-delombok/BuilderSimpleOnRecord.java | 9 +++ .../BuilderSimpleWithSetterPrefix.java | 8 ++ .../BuilderSingularAnnotatedTypes.java | 17 ++++- ...ingularAnnotatedTypesWithSetterPrefix.java | 15 ++++ .../BuilderSingularGuavaListsSets.java | 26 +++++++ .../BuilderSingularGuavaMaps.java | 18 +++++ .../after-delombok/BuilderSingularLists.java | 18 +++++ .../after-delombok/BuilderSingularNoAuto.java | 18 +++++ ...BuilderSingularNoAutoWithSetterPrefix.java | 18 +++++ .../BuilderSingularNullBehavior1.java | 14 ++++ .../BuilderSingularNullBehavior2.java | 12 ++- .../BuilderSingularOnRecord.java | 17 +++++ .../BuilderSingularRedirectToGuava.java | 18 +++++ .../after-delombok/BuilderSingularSets.java | 22 ++++++ .../BuilderSingularSetsWithSetterPrefix.java | 22 ++++++ .../BuilderSingularToBuilderWithNull.java | 11 +++ ...ularToBuilderWithNullWithSetterPrefix.java | 11 +++ ...derSingularWildcardListsWithToBuilder.java | 15 ++++ .../BuilderSingularWithPrefixes.java | 10 +++ ...rSingularWithPrefixesWithSetterPrefix.java | 10 +++ .../after-delombok/BuilderTypeAnnos.java | 9 ++- .../BuilderTypeAnnosWithSetterPrefix.java | 9 ++- .../after-delombok/BuilderValueData.java | 22 +++++- .../BuilderValueDataWithSetterPrefix.java | 22 +++++- .../after-delombok/BuilderWithAccessors.java | 14 ++++ .../after-delombok/BuilderWithBadNames.java | 10 +++ .../after-delombok/BuilderWithDeprecated.java | 18 +++++ .../BuilderWithDeprecatedAnnOnly.java | 16 ++++ .../BuilderWithExistingBuilderClass.java | 8 ++ ...hExistingBuilderClassWithSetterPrefix.java | 8 ++ ...uilderWithJavaBeansSpecCapitalization.java | 18 ++++- .../BuilderWithNoBuilderMethod.java | 8 ++ .../after-delombok/BuilderWithNonNull.java | 10 ++- .../BuilderWithNonNullWithSetterPrefix.java | 8 ++ .../BuilderWithRecursiveGenerics.java | 15 ++++ .../after-delombok/BuilderWithToBuilder.java | 47 +++++++++--- .../after-delombok/BuilderWithTolerate.java | 7 ++ .../after-delombok/CheckerFrameworkBasic.java | 10 +++ .../CheckerFrameworkBuilder.java | 19 ++++- .../CheckerFrameworkSuperBuilder.java | 40 +++++++++- .../after-delombok/ClassNamedAfterGetter.java | 1 + .../after-delombok/CommentsInterspersed.java | 1 + .../ConflictingStaticConstructorNames.java | 5 ++ .../after-delombok/ConstructorInner.java | 4 +- .../resource/after-delombok/Constructors.java | 13 ++++ .../ConstructorsConfiguration.java | 1 + .../ConstructorsInAnonymousClass.java | 8 +- .../after-delombok/ConstructorsTypeAnnos.java | 1 + .../ConstructorsWithAccessors.java | 5 +- .../ConstructorsWithBuilderDefaults.java | 18 +++++ .../ConstructorsWithBuilderDefaults2.java | 24 +++++- .../ConstructorsWithSuperBuilderDefaults.java | 36 ++++----- .../after-delombok/DataConfiguration.java | 7 ++ .../resource/after-delombok/DataExtended.java | 7 ++ .../resource/after-delombok/DataIgnore.java | 6 ++ .../after-delombok/DataInAnonymousClass.java | 15 ++-- .../resource/after-delombok/DataOnEnum.java | 3 + .../after-delombok/DataOnLocalClass.java | 21 ++++++ .../resource/after-delombok/DataPlain.java | 38 ++++++++++ .../after-delombok/DataWithGetter.java | 10 +++ .../after-delombok/DataWithGetterNone.java | 7 ++ .../DataWithOverrideEqualsAndHashCode.java | 7 +- .../after-delombok/DelegateGenerics.java | 13 +--- .../after-delombok/DelegateOnGetter.java | 3 + .../after-delombok/DelegateOnGetterNone.java | 2 + .../after-delombok/DelegateOnMethods.java | 5 +- .../DelegateTypesAndExcludes.java | 13 +--- .../DelegateWithDeprecated.java | 3 + .../after-delombok/DelegateWithVarargs.java | 4 + .../after-delombok/DelegateWithVarargs2.java | 2 +- .../after-delombok/EncodingUsAscii.java | 1 + .../resource/after-delombok/EncodingUtf8.java | 1 + .../after-delombok/EqualsAndHashCode.java | 11 +++ .../EqualsAndHashCodeAnnotated.java | 6 +- .../EqualsAndHashCodeAutoExclude.java | 8 +- .../EqualsAndHashCodeCache.java | 19 +++++ .../EqualsAndHashCodeConfigKeys1.java | 6 ++ .../EqualsAndHashCodeConfigKeys2.java | 9 +++ .../EqualsAndHashCodeEmpty.java | 6 ++ .../EqualsAndHashCodeExplicitInclude.java | 5 +- .../EqualsAndHashCodeInAnonymousClass.java | 7 +- .../EqualsAndHashCodeNestedShadow.java | 6 ++ .../EqualsAndHashCodeNewStyle.java | 3 + .../EqualsAndHashCodeOfAndExclude.java | 4 + .../after-delombok/EqualsAndHashCodeRank.java | 5 +- .../EqualsAndHashCodeWithExistingMethods.java | 2 + ...EqualsAndHashCodeWithGenericsOnInners.java | 4 +- ...hCodeWithGenericsOnInnersInInterfaces.java | 3 + ...EqualsAndHashCodeWithNonNullByDefault.java | 3 + .../EqualsAndHashCodeWithOnParam.java | 4 +- ...alsAndHashCodeWithSomeExistingMethods.java | 15 +++- ...tsViaConfigAndRequiredArgsConstructor.java | 1 + .../FieldNameConstantsBasic.java | 1 + .../FieldNameConstantsConfigKeys.java | 3 +- .../FieldNameConstantsEnum.java | 1 + .../FieldNameConstantsOnRecord.java | 1 + .../FieldNameConstantsUppercased.java | 1 + .../GenerateSuppressFBWarnings.java | 1 + .../after-delombok/GeneratedJavaxJakarta.java | 2 +- .../resource/after-delombok/GeneratedOff.java | 1 + .../after-delombok/GeneratedOffJavaxOn.java | 1 + .../resource/after-delombok/GeneratedOn.java | 2 +- .../after-delombok/GetterAccessLevel.java | 9 +++ .../after-delombok/GetterAlreadyExists.java | 10 +++ .../after-delombok/GetterBoolean.java | 4 + .../after-delombok/GetterDeprecated.java | 2 + .../resource/after-delombok/GetterEnum.java | 3 + .../GetterInAnonymousClass.java | 3 +- .../resource/after-delombok/GetterLazy.java | 1 + .../after-delombok/GetterLazyArguments.java | 17 ++--- .../after-delombok/GetterLazyBoolean.java | 6 ++ .../GetterLazyEahcToString.java | 15 ++-- .../GetterLazyErrorPosition.java | 2 +- .../after-delombok/GetterLazyGenerics.java | 4 +- .../GetterLazyInAnonymousClass.java | 3 +- .../after-delombok/GetterLazyInvalid.java | 1 + .../after-delombok/GetterLazyNative.java | 9 +++ .../after-delombok/GetterLazyTransient.java | 2 + .../resource/after-delombok/GetterNone.java | 1 + .../after-delombok/GetterOnClass.java | 8 ++ .../after-delombok/GetterOnMethod.java | 3 + .../after-delombok/GetterOnMethodErrors2.java | 8 ++ .../after-delombok/GetterOnMethodOnType.java | 2 + .../after-delombok/GetterOnStatic.java | 2 + .../resource/after-delombok/GetterPlain.java | 2 + .../after-delombok/GetterSetterJavadoc.java | 19 ++++- .../after-delombok/GetterTypeAnnos.java | 1 + .../after-delombok/GetterWithDollar.java | 3 + ...GetterWithJavaBeansSpecCapitalization.java | 4 +- .../I2335_BuilderMultipleObtainVia.java | 10 +++ .../resource/after-delombok/InjectField.java | 21 ++---- .../resource/after-delombok/InnerClass.java | 6 ++ .../JacksonBuilderSingular.java | 25 ++++++- .../after-delombok/JacksonJsonProperty.java | 11 ++- .../JacksonizedBuilderComplex.java | 15 +++- .../JacksonizedBuilderSimple.java | 10 +++ .../after-delombok/JacksonizedOnRecord.java | 21 +++--- .../JacksonizedSuperBuilderSimple.java | 12 +++ ...onizedSuperBuilderWithJsonDeserialize.java | 14 +++- .../after-delombok/JavadocMultiline.java | 10 +-- .../after-delombok/LockedInInitializer.java | 3 + .../resource/after-delombok/LockedPlain.java | 4 + .../after-delombok/LockedStaticMix.java | 1 + .../after-delombok/LockedTypeMismatch.java | 1 + .../after-delombok/LoggerCommons.java | 6 +- .../resource/after-delombok/LoggerConfig.java | 1 + .../resource/after-delombok/LoggerCustom.java | 5 +- .../LoggerCustomWithPackage.java | 5 +- .../LoggerCustomWithTopicAndName.java | 6 +- .../after-delombok/LoggerFlogger.java | 5 ++ .../after-delombok/LoggerFloggerRecord.java | 3 +- .../after-delombok/LoggerJBossLog.java | 11 ++- .../resource/after-delombok/LoggerJul.java | 9 ++- .../resource/after-delombok/LoggerLog4j.java | 7 +- .../resource/after-delombok/LoggerLog4j2.java | 9 ++- .../resource/after-delombok/LoggerSlf4j.java | 11 ++- .../after-delombok/LoggerSlf4jOnRecord.java | 1 + .../after-delombok/LoggerSlf4jTypes.java | 3 + .../LoggerSlf4jWithPackage.java | 2 + .../resource/after-delombok/LoggerXSlf4j.java | 6 +- .../after-delombok/MultiFieldGetter.java | 4 + .../NoArgsConstructorForce.java | 3 +- .../NoPrivateNoArgsConstructor.java | 13 +++- .../NonNullExistingConstructorOnRecord.java | 1 + .../after-delombok/NonNullOnRecordSimple.java | 1 + .../NonNullOnRecordTypeUse.java | 1 + .../resource/after-delombok/NonNullPlain.java | 7 ++ .../NonNullWithAlternateException.java | 1 + .../after-delombok/NonNullWithAssertion.java | 5 +- .../after-delombok/NonNullWithGuava.java | 3 +- .../after-delombok/NonNullWithJdk.java | 3 +- ...AnnotatedCheckerFrameworkSuperBuilder.java | 74 ++++++++++--------- .../resource/after-delombok/NullLibrary1.java | 6 ++ .../resource/after-delombok/NullLibrary2.java | 6 ++ .../resource/after-delombok/NullLibrary3.java | 14 ++-- .../after-delombok/OnXJava8Style.java | 13 +++- .../PrivateNoArgsConstructor.java | 38 ++++++++++ .../after-delombok/SetterAccessLevel.java | 5 ++ .../after-delombok/SetterAlreadyExists.java | 2 + .../SetterAndWithMethodJavadoc.java | 4 + .../after-delombok/SetterDeprecated.java | 2 + .../SetterInAnonymousClass.java | 3 +- .../after-delombok/SetterOnClass.java | 8 ++ .../after-delombok/SetterOnMethodOnParam.java | 3 + .../after-delombok/SetterOnStatic.java | 2 + .../resource/after-delombok/SetterPlain.java | 2 + .../after-delombok/SetterTypeAnnos.java | 1 + .../after-delombok/SetterWithDollar.java | 9 +-- ...SetterWithJavaBeansSpecCapitalization.java | 2 + .../after-delombok/SimpleTypeResolution.java | 1 + .../SingularCleanupForDelombok.java | 16 +++- .../after-delombok/SkipSuppressWarnings.java | 6 +- .../after-delombok/StandardExceptions.java | 9 ++- .../after-delombok/StaticConstructor.java | 4 +- .../after-delombok/SuperBuilderAbstract.java | 31 ++++++++ .../SuperBuilderAbstractToBuilder.java | 39 ++++++++++ .../after-delombok/SuperBuilderBasic.java | 28 +++++++ .../SuperBuilderBasicToBuilder.java | 40 ++++++++++ .../SuperBuilderCustomName.java | 14 +++- .../SuperBuilderCustomized.java | 17 +++++ ...uperBuilderCustomizedWithSetterPrefix.java | 10 +++ .../SuperBuilderInitializer.java | 28 +++---- .../after-delombok/SuperBuilderJavadoc.java | 27 ++++--- .../SuperBuilderNameClashes.java | 42 +++++++++++ .../SuperBuilderNestedGenericTypes.java | 10 +++ .../SuperBuilderSingularAnnotatedTypes.java | 21 +++++- .../SuperBuilderSingularCustomized.java | 15 +++- .../SuperBuilderSingularToBuilderGuava.java | 50 ++++++++++++- .../SuperBuilderWithAnnotatedTypeParam.java | 24 ++++++ ...uperBuilderWithCustomBuilderClassName.java | 22 +++++- .../SuperBuilderWithCustomBuilderMethod.java | 27 +++++++ .../SuperBuilderWithDefaults.java | 32 ++++++++ ...perBuilderWithDefaultsAndTargetTyping.java | 59 +++++++-------- .../SuperBuilderWithExistingConstructor.java | 12 ++- .../SuperBuilderWithGenerics.java | 28 +++++++ .../SuperBuilderWithGenerics2.java | 28 +++++++ .../SuperBuilderWithGenerics3.java | 26 ++++++- .../SuperBuilderWithGenericsAndToBuilder.java | 35 +++++++++ .../SuperBuilderWithNonNull.java | 26 +++++++ ...BuilderWithOverloadedGeneratedMethods.java | 24 ++++++ .../SuperBuilderWithPrefixes.java | 20 ++++- .../SuperBuilderWithSetterPrefix.java | 40 ++++++++++ .../SynchronizedInAnonymousClass.java | 3 +- .../SynchronizedInInitializer.java | 1 + .../after-delombok/SynchronizedPlain.java | 2 + .../after-delombok/ToStringArray.java | 3 +- .../ToStringArrayTypeAnnotations.java | 5 +- .../after-delombok/ToStringAutoExclude.java | 4 +- .../after-delombok/ToStringAutoSuper.java | 3 +- .../after-delombok/ToStringConfiguration.java | 5 ++ .../resource/after-delombok/ToStringEnum.java | 5 +- .../ToStringExplicitInclude.java | 3 +- .../ToStringExplicitIncludeConf.java | 1 + .../ToStringInAnonymousClass.java | 3 +- .../after-delombok/ToStringInner.java | 5 +- .../after-delombok/ToStringNewStyle.java | 1 + .../after-delombok/ToStringPlain.java | 2 + .../resource/after-delombok/Tolerate.java | 5 ++ .../after-delombok/TypeUseAnnotations.java | 5 +- .../resource/after-delombok/UtilityClass.java | 4 + .../after-delombok/UtilityClassGeneric.java | 7 +- .../after-delombok/UtilityClassInner.java | 3 +- .../after-delombok/ValueCallSuper.java | 5 ++ .../after-delombok/ValueInAnonymousClass.java | 11 ++- .../resource/after-delombok/ValuePlain.java | 19 +++++ .../ValueStaticConstructorOf.java | 6 ++ .../after-delombok/ValueStaticField.java | 4 + .../ValueWithJavaBeansSpecCapitalization.java | 7 +- .../after-delombok/WithAlreadyExists.java | 2 + .../WithAndAllArgsConstructor.java | 3 + .../WithByInAnonymousClass.java | 4 +- .../after-delombok/WithByNullAnnos.java | 2 + .../after-delombok/WithByOnRecord.java | 2 + .../WithByOnRecordComponent.java | 1 + .../resource/after-delombok/WithByTypes.java | 12 ++- .../after-delombok/WithInAnonymousClass.java | 4 +- .../after-delombok/WithMethodAbstract.java | 1 + .../WithMethodMarkedDeprecated.java | 2 + .../WithMethodMarkedDeprecatedAnnOnly.java | 1 + .../resource/after-delombok/WithNested.java | 2 + .../resource/after-delombok/WithOnClass.java | 6 ++ .../after-delombok/WithOnNestedRecord.java | 4 +- .../resource/after-delombok/WithOnRecord.java | 2 + .../after-delombok/WithOnRecordComponent.java | 1 + .../resource/after-delombok/WithPlain.java | 2 + .../after-delombok/WithWithGenerics.java | 3 + .../WithWithJavaBeansSpecCapitalization.java | 1 + .../after-delombok/WithWithTypeAnnos.java | 1 + .../after-delombok/WitherAccessLevel.java | 5 ++ .../after-delombok/WitherLegacyStar.java | 1 + 292 files changed, 2545 insertions(+), 432 deletions(-) diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java index 0e148b887f..0b2a097bbc 100644 --- a/test/transform/resource/after-delombok/Accessors.java +++ b/test/transform/resource/after-delombok/Accessors.java @@ -1,6 +1,7 @@ class AccessorsFluent { private String fieldName = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public String fieldName() { return this.fieldName; } @@ -8,6 +9,7 @@ public String fieldName() { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -17,10 +19,12 @@ class AccessorsFluentOnClass { private String fieldName = ""; private String otherFieldWithOverride = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } @@ -28,6 +32,7 @@ public String getOtherFieldWithOverride() { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -39,6 +44,7 @@ class AccessorsChain { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; @@ -48,6 +54,7 @@ class AccessorsPrefix { private String fieldName; private String fActualField; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -56,10 +63,12 @@ class AccessorsPrefix2 { private String fieldName; private String fActualField; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFieldName(final String fieldName) { this.fieldName = fieldName; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -71,11 +80,13 @@ private String getName() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "AccessorsPrefix3(fName=" + this.getName() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof AccessorsPrefix3)) return false; @@ -87,11 +98,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof AccessorsPrefix3; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -106,6 +119,7 @@ class AccessorsFluentGenerics { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsFluentGenerics name(final String name) { this.name = name; return this; @@ -114,6 +128,7 @@ public AccessorsFluentGenerics name(final String name) { class AccessorsFluentNoChaining { private String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public void name(final String name) { this.name = name; } @@ -121,6 +136,7 @@ public void name(final String name) { class AccessorsFluentStatic { private static String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public static void name(final String name) { AccessorsFluentStatic.name = name; } diff --git a/test/transform/resource/after-delombok/AccessorsCascade.java b/test/transform/resource/after-delombok/AccessorsCascade.java index ba4d13d4a9..1c30a37235 100644 --- a/test/transform/resource/after-delombok/AccessorsCascade.java +++ b/test/transform/resource/after-delombok/AccessorsCascade.java @@ -8,6 +8,7 @@ class AccessorsInner1 { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsOuter.AccessorsInner1 setTest3(final String zTest3) { this.zTest3 = zTest3; return this; @@ -16,6 +17,7 @@ public AccessorsOuter.AccessorsInner1 setTest3(final String zTest3) { class AccessorsInner2 { private String fTest4; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setTest4(final String fTest4) { this.fTest4 = fTest4; } @@ -24,6 +26,7 @@ public void setTest4(final String fTest4) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsOuter setTest(final String fTest) { this.fTest = fTest; return this; @@ -32,8 +35,9 @@ public AccessorsOuter setTest(final String fTest) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsOuter setTest2(final String zTest2) { this.zTest2 = zTest2; return this; } -} \ 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 f52ff30758..e62a6a9f59 100644 --- a/test/transform/resource/after-delombok/AccessorsConfiguration.java +++ b/test/transform/resource/after-delombok/AccessorsConfiguration.java @@ -1,10 +1,12 @@ class AccessorsConfiguration { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public String fieldName() { return this.m_FieldName; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void fieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -12,6 +14,7 @@ public void fieldName(final String m_FieldName) { class AccessorsConfiguration2 { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setM_FieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -22,6 +25,7 @@ class AccessorsConfiguration3 { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsConfiguration3 setFieldName(final String fFieldName) { this.fFieldName = fFieldName; return this; diff --git a/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java b/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java index 27fab50980..bf527319f3 100644 --- a/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java +++ b/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java @@ -1,18 +1,17 @@ public class AccessorsInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public String string() { return this.string; } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner string(final String string) { this.string = string; return this; diff --git a/test/transform/resource/after-delombok/AccessorsMakeFinal.java b/test/transform/resource/after-delombok/AccessorsMakeFinal.java index d88e861609..0d10c2e4d1 100644 --- a/test/transform/resource/after-delombok/AccessorsMakeFinal.java +++ b/test/transform/resource/after-delombok/AccessorsMakeFinal.java @@ -4,8 +4,9 @@ class AccessorsMakeFinal1 { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public final AccessorsMakeFinal1 test(final String test) { this.test = test; return this; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/AccessorsMakeFinalLombokConfig.java b/test/transform/resource/after-delombok/AccessorsMakeFinalLombokConfig.java index 61deedeea9..d29ac79f1a 100644 --- a/test/transform/resource/after-delombok/AccessorsMakeFinalLombokConfig.java +++ b/test/transform/resource/after-delombok/AccessorsMakeFinalLombokConfig.java @@ -1,7 +1,8 @@ class AccessorsMakeFinalLombokConfig { private String test; @java.lang.SuppressWarnings("all") + @lombok.Generated public final void setTest(final String test) { this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/AccessorsNoParamWarning.java b/test/transform/resource/after-delombok/AccessorsNoParamWarning.java index 3e9c4c5f87..e38c7e6a19 100644 --- a/test/transform/resource/after-delombok/AccessorsNoParamWarning.java +++ b/test/transform/resource/after-delombok/AccessorsNoParamWarning.java @@ -1,6 +1,7 @@ class AccessorsNoParams { private String otherFieldWithOverride = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public String otherFieldWithOverride() { return this.otherFieldWithOverride; } @@ -8,7 +9,8 @@ public String otherFieldWithOverride() { class AccessorsNoParams2 { private boolean foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFoo(final boolean foo) { this.foo = foo; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderAccessWithGetter.java b/test/transform/resource/after-delombok/BuilderAccessWithGetter.java index f36403bfa1..118273ef93 100644 --- a/test/transform/resource/after-delombok/BuilderAccessWithGetter.java +++ b/test/transform/resource/after-delombok/BuilderAccessWithGetter.java @@ -1,48 +1,48 @@ public final class BuilderAccessWithGetter { private final String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAccessWithGetter(final String string) { this.string = string; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static class BuilderAccessWithGetterBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAccessWithGetterBuilder() { } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated private BuilderAccessWithGetter.BuilderAccessWithGetterBuilder string(final String string) { this.string = string; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated private BuilderAccessWithGetter build() { return new BuilderAccessWithGetter(this.string); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAccessWithGetter.BuilderAccessWithGetterBuilder(string=" + this.string + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated private static BuilderAccessWithGetter.BuilderAccessWithGetterBuilder builder() { return new BuilderAccessWithGetter.BuilderAccessWithGetterBuilder(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public String getString() { return this.string; } diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java index 591c2b4d4c..1bf5447d0d 100644 --- a/test/transform/resource/after-delombok/BuilderComplex.java +++ b/test/transform/resource/after-delombok/BuilderComplex.java @@ -3,22 +3,29 @@ class BuilderComplex { private static void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class TestVoidName { @java.lang.SuppressWarnings("all") + @lombok.Generated private T number; @java.lang.SuppressWarnings("all") + @lombok.Generated private int arg2; @java.lang.SuppressWarnings("all") + @lombok.Generated private String arg3; @java.lang.SuppressWarnings("all") + @lombok.Generated private BuilderComplex selfRef; @java.lang.SuppressWarnings("all") + @lombok.Generated TestVoidName() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderComplex.TestVoidName number(final T number) { this.number = number; return this; @@ -27,6 +34,7 @@ public BuilderComplex.TestVoidName number(final T number) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderComplex.TestVoidName arg2(final int arg2) { this.arg2 = arg2; return this; @@ -35,6 +43,7 @@ public BuilderComplex.TestVoidName arg2(final int arg2) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderComplex.TestVoidName arg3(final String arg3) { this.arg3 = arg3; return this; @@ -43,21 +52,25 @@ public BuilderComplex.TestVoidName arg3(final String arg3) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderComplex.TestVoidName selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void execute() { BuilderComplex.testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderComplex.TestVoidName(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderComplex.TestVoidName builder() { return new BuilderComplex.TestVoidName(); } diff --git a/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java b/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java index 96673b1a00..4746de45fc 100644 --- a/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java +++ b/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java @@ -1,5 +1,4 @@ import java.util.List; - class BuilderConstructorJavadoc { /** * This is a comment @@ -13,23 +12,23 @@ class BuilderConstructorJavadoc { */ BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc) { } - - public static class BuilderConstructorJavadocBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int basic; @java.lang.SuppressWarnings("all") + @lombok.Generated private int multiline; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predef; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predefWithJavadoc; - public BuilderConstructorJavadocBuilder predef(final int x) { this.predef = x; return this; } - /** * This javadoc remains untouched. * @param x 1/100 of the thing @@ -39,21 +38,20 @@ public BuilderConstructorJavadocBuilder predefWithJavadoc(final int x) { this.predefWithJavadoc = x; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderConstructorJavadocBuilder() { } - /** * @param basic tag is moved to the setter * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder basic(final int basic) { this.basic = basic; return this; } - /** * @param multiline a param comment * can be on multiple lines and can use @@ -61,25 +59,26 @@ public BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder basic(final * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder multiline(final int multiline) { this.multiline = multiline; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderConstructorJavadoc build() { return new BuilderConstructorJavadoc(this.basic, this.multiline, this.predef, this.predefWithJavadoc); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(basic=" + this.basic + ", multiline=" + this.multiline + ", predef=" + this.predef + ", predefWithJavadoc=" + this.predefWithJavadoc + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder builder() { return new BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java index 2170eed51f..10f9fdcd24 100644 --- a/test/transform/resource/after-delombok/BuilderDefaults.java +++ b/test/transform/resource/after-delombok/BuilderDefaults.java @@ -3,38 +3,49 @@ public final class BuilderDefaults { private final String name; private final long z; @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 10; } @java.lang.SuppressWarnings("all") + @lombok.Generated private static long $default$z() { return System.currentTimeMillis(); } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaults(final int x, final String name, final long z) { this.x = x; this.name = name; this.z = z; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderDefaultsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean z$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private long z$value; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaults.BuilderDefaultsBuilder x(final int x) { this.x$value = x; x$set = true; @@ -44,6 +55,7 @@ public BuilderDefaults.BuilderDefaultsBuilder x(final int x) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaults.BuilderDefaultsBuilder name(final String name) { this.name = name; return this; @@ -52,12 +64,14 @@ public BuilderDefaults.BuilderDefaultsBuilder name(final String name) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaults.BuilderDefaultsBuilder z(final long z) { this.z$value = z; z$set = true; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaults build() { int x$value = this.x$value; if (!this.x$set) x$value = BuilderDefaults.$default$x(); @@ -67,28 +81,34 @@ public BuilderDefaults build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaults.BuilderDefaultsBuilder(x$value=" + this.x$value + ", name=" + this.name + ", z$value=" + this.z$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderDefaults.BuilderDefaultsBuilder builder() { return new BuilderDefaults.BuilderDefaultsBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public long getZ() { return this.z; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderDefaults)) return false; @@ -102,6 +122,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -114,7 +135,8 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaults(x=" + this.getX() + ", name=" + this.getName() + ", z=" + this.getZ() + ")"; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderDefaultsArray.java b/test/transform/resource/after-delombok/BuilderDefaultsArray.java index 2dd6b30479..4112659827 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsArray.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsArray.java @@ -1,62 +1,64 @@ import lombok.Value; - public class BuilderDefaultsArray { int[] x; java.lang.String[][] y; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static int[] $default$x() { return new int[] {1, 2}; } - @java.lang.SuppressWarnings("all") + @lombok.Generated private static java.lang.String[][] $default$y() { return new java.lang.String[][] {}; } - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsArray(final int[] x, final java.lang.String[][] y) { this.x = x; this.y = y; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderDefaultsArrayBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int[] x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean y$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.lang.String[][] y$value; - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsArrayBuilder() { } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsArray.BuilderDefaultsArrayBuilder x(final int[] x) { this.x$value = x; x$set = true; return this; } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsArray.BuilderDefaultsArrayBuilder y(final java.lang.String[][] y) { this.y$value = y; y$set = true; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsArray build() { int[] x$value = this.x$value; if (!this.x$set) x$value = BuilderDefaultsArray.$default$x(); @@ -64,15 +66,15 @@ public BuilderDefaultsArray build() { if (!this.y$set) y$value = BuilderDefaultsArray.$default$y(); return new BuilderDefaultsArray(x$value, y$value); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaultsArray.BuilderDefaultsArrayBuilder(x$value=" + java.util.Arrays.toString(this.x$value) + ", y$value=" + java.util.Arrays.deepToString(this.y$value) + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderDefaultsArray.BuilderDefaultsArrayBuilder builder() { return new BuilderDefaultsArray.BuilderDefaultsArrayBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java index 44d9491f57..e0bee634af 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java @@ -4,44 +4,57 @@ public class BuilderDefaultsGenerics> { private T tee; private R arrr; @java.lang.SuppressWarnings("all") + @lombok.Generated private static > java.util.concurrent.Callable $default$callable() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated private static > T $default$tee() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated private static > R $default$arrr() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsGenerics(final java.util.concurrent.Callable callable, final T tee, final R arrr) { this.callable = callable; this.tee = tee; this.arrr = arrr; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderDefaultsGenericsBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean callable$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.concurrent.Callable callable$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean tee$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private T tee$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean arrr$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private R arrr$value; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsGenericsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder callable(final java.util.concurrent.Callable callable) { this.callable$value = callable; callable$set = true; @@ -51,6 +64,7 @@ public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder callable( * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder tee(final T tee) { this.tee$value = tee; tee$set = true; @@ -60,12 +74,14 @@ public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder tee(final * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder arrr(final R arrr) { this.arrr$value = arrr; arrr$set = true; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsGenerics build() { java.util.concurrent.Callable callable$value = this.callable$value; if (!this.callable$set) callable$value = BuilderDefaultsGenerics.$default$callable(); @@ -77,11 +93,13 @@ public BuilderDefaultsGenerics build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(callable$value=" + this.callable$value + ", tee$value=" + this.tee$value + ", arrr$value=" + this.arrr$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static > BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder builder() { return new BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderDefaultsTargetTyping.java b/test/transform/resource/after-delombok/BuilderDefaultsTargetTyping.java index d9907ce820..476b8a09af 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsTargetTyping.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsTargetTyping.java @@ -1,59 +1,58 @@ import java.util.Arrays; - public class BuilderDefaultsTargetTyping { String foo; - static String doSth(java.util.List i, java.util.List c) { return null; } - @java.lang.SuppressWarnings("all") + @lombok.Generated private static String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsTargetTyping(final String foo) { this.foo = foo; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderDefaultsTargetTypingBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean foo$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private String foo$value; - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsTargetTypingBuilder() { } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder foo(final String foo) { this.foo$value = foo; foo$set = true; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsTargetTyping build() { String foo$value = this.foo$value; if (!this.foo$set) foo$value = BuilderDefaultsTargetTyping.$default$foo(); return new BuilderDefaultsTargetTyping(foo$value); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder(foo$value=" + this.foo$value + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder builder() { return new BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java index c7e37abe5d..79a33da33b 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java @@ -5,26 +5,33 @@ public class BuilderDefaultsWarnings { int z; java.util.List items; @java.lang.SuppressWarnings("all") + @lombok.Generated 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") + @lombok.Generated public static class BuilderDefaultsWarningsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private long x; @java.lang.SuppressWarnings("all") + @lombok.Generated private int z; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsWarningsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) { this.x = x; return this; @@ -33,17 +40,20 @@ public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) { this.z = z; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsWarnings.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") + @lombok.Generated public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -53,11 +63,13 @@ public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.u return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsWarnings build() { java.util.List items; switch (this.items == null ? 0 : this.items.size()) { @@ -74,11 +86,13 @@ public BuilderDefaultsWarnings build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(x=" + this.x + ", z=" + this.z + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() { return new BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(); } @@ -88,21 +102,26 @@ class NoBuilderButHasDefaults { public NoBuilderButHasDefaults() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class NoBuilderButHasDefaultsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated NoBuilderButHasDefaultsBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public NoBuilderButHasDefaults build() { return new NoBuilderButHasDefaults(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() { return new NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderGenericMethod.java b/test/transform/resource/after-delombok/BuilderGenericMethod.java index 36375952ef..a3b717389c 100644 --- a/test/transform/resource/after-delombok/BuilderGenericMethod.java +++ b/test/transform/resource/after-delombok/BuilderGenericMethod.java @@ -5,18 +5,23 @@ public Map foo(int a, long b) { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated public class MapBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int a; @java.lang.SuppressWarnings("all") + @lombok.Generated private long b; @java.lang.SuppressWarnings("all") + @lombok.Generated MapBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderGenericMethod.MapBuilder a(final int a) { this.a = a; return this; @@ -25,21 +30,25 @@ public BuilderGenericMethod.MapBuilder a(final int a) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderGenericMethod.MapBuilder b(final long b) { this.b = b; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Map build() { return BuilderGenericMethod.this.foo(this.a, this.b); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderGenericMethod.MapBuilder(a=" + this.a + ", b=" + this.b + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderGenericMethod.MapBuilder builder() { return this.new MapBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java index 2ee81dcb8e..ee13797a9f 100644 --- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java +++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java @@ -4,22 +4,29 @@ public String create(int show, final int yes, List also, int $andMe) { return "" + show + yes + also + $andMe; } @java.lang.SuppressWarnings("all") + @lombok.Generated public class StringBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int show; @java.lang.SuppressWarnings("all") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") + @lombok.Generated private List also; @java.lang.SuppressWarnings("all") + @lombok.Generated private int $andMe; @java.lang.SuppressWarnings("all") + @lombok.Generated StringBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderInstanceMethod.StringBuilder show(final int show) { this.show = show; return this; @@ -28,6 +35,7 @@ public BuilderInstanceMethod.StringBuilder show(final int show) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderInstanceMethod.StringBuilder yes(final int yes) { this.yes = yes; return this; @@ -36,6 +44,7 @@ public BuilderInstanceMethod.StringBuilder yes(final int yes) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderInstanceMethod.StringBuilder also(final List also) { this.also = also; return this; @@ -44,21 +53,25 @@ public BuilderInstanceMethod.StringBuilder also(final List also) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderInstanceMethod.StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String build() { return BuilderInstanceMethod.this.create(this.show, this.yes, this.also, this.$andMe); } @java.lang.Override @java.lang.SuppressWarnings("all") + @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") + @lombok.Generated public BuilderInstanceMethod.StringBuilder builder() { return this.new StringBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderJavadoc.java b/test/transform/resource/after-delombok/BuilderJavadoc.java index f7caa2d6cb..34de4ab8a2 100644 --- a/test/transform/resource/after-delombok/BuilderJavadoc.java +++ b/test/transform/resource/after-delombok/BuilderJavadoc.java @@ -24,12 +24,16 @@ class BuilderJavadoc { private final int predefWithJavadoc; public static class BuilderJavadocBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int basic; @java.lang.SuppressWarnings("all") + @lombok.Generated private int getsetwith; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predef; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predefWithJavadoc; public BuilderJavadocBuilder predef(final int x) { this.predef = x * 10; @@ -45,6 +49,7 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderJavadocBuilder() { } /** @@ -54,6 +59,7 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderJavadoc.BuilderJavadocBuilder basic(final int basic) { this.basic = basic; return this; @@ -64,21 +70,25 @@ public BuilderJavadoc.BuilderJavadocBuilder basic(final int basic) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderJavadoc.BuilderJavadocBuilder getsetwith(final int getsetwith) { this.getsetwith = getsetwith; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderJavadoc build() { return new BuilderJavadoc(this.basic, this.getsetwith, this.predef, this.predefWithJavadoc); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderJavadoc.BuilderJavadocBuilder(basic=" + this.basic + ", getsetwith=" + this.getsetwith + ", predef=" + this.predef + ", predefWithJavadoc=" + this.predefWithJavadoc + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderJavadoc(final int basic, final int getsetwith, final int predef, final int predefWithJavadoc) { this.basic = basic; this.getsetwith = getsetwith; @@ -86,6 +96,7 @@ public java.lang.String toString() { this.predefWithJavadoc = predefWithJavadoc; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderJavadoc.BuilderJavadocBuilder builder() { return new BuilderJavadoc.BuilderJavadocBuilder(); } @@ -94,6 +105,7 @@ public static BuilderJavadoc.BuilderJavadocBuilder builder() { * @return tag is moved to the getter. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGetsetwith() { return this.getsetwith; } @@ -102,6 +114,7 @@ public int getGetsetwith() { * @param tag is moved to the setters and wither. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setGetsetwith(final int getsetwith) { this.getsetwith = getsetwith; } @@ -111,6 +124,7 @@ public void setGetsetwith(final int getsetwith) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderJavadoc withGetsetwith(final int getsetwith) { return this.getsetwith == getsetwith ? this : new BuilderJavadoc(this.basic, getsetwith, this.predef, this.predefWithJavadoc); } diff --git a/test/transform/resource/after-delombok/BuilderNestedInEnum.java b/test/transform/resource/after-delombok/BuilderNestedInEnum.java index 26dc2a0638..84fcc4352d 100644 --- a/test/transform/resource/after-delombok/BuilderNestedInEnum.java +++ b/test/transform/resource/after-delombok/BuilderNestedInEnum.java @@ -4,44 +4,54 @@ public enum TestEnum { public static final class TestBuilder { private final String field; @java.lang.SuppressWarnings("all") + @lombok.Generated TestBuilder(final String field) { this.field = field; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class TestBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String field; @java.lang.SuppressWarnings("all") + @lombok.Generated TestBuilderBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) { this.field = field; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderNestedInEnum.TestEnum.TestBuilder build() { return new BuilderNestedInEnum.TestEnum.TestBuilder(this.field); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(field=" + this.field + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() { return new BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getField() { return this.field; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderNestedInEnum.TestEnum.TestBuilder)) return false; @@ -53,6 +63,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -62,9 +73,10 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderNestedInEnum.TestEnum.TestBuilder(field=" + this.getField() + ")"; } } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderOnNestedClass.java b/test/transform/resource/after-delombok/BuilderOnNestedClass.java index 76e69f7899..98b6dfa741 100644 --- a/test/transform/resource/after-delombok/BuilderOnNestedClass.java +++ b/test/transform/resource/after-delombok/BuilderOnNestedClass.java @@ -1,47 +1,45 @@ public class BuilderOnNestedClass { private T t; - - public static class Nested { private String a; - @java.lang.SuppressWarnings("all") + @lombok.Generated Nested(final String a) { this.a = a; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static class NestedBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String a; - @java.lang.SuppressWarnings("all") + @lombok.Generated NestedBuilder() { } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderOnNestedClass.Nested.NestedBuilder a(final String a) { this.a = a; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderOnNestedClass.Nested build() { return new BuilderOnNestedClass.Nested(this.a); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderOnNestedClass.Nested.NestedBuilder(a=" + this.a + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderOnNestedClass.Nested.NestedBuilder builder() { return new BuilderOnNestedClass.Nested.NestedBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderOnNestedRecord.java b/test/transform/resource/after-delombok/BuilderOnNestedRecord.java index 83de7e06e3..8803537228 100644 --- a/test/transform/resource/after-delombok/BuilderOnNestedRecord.java +++ b/test/transform/resource/after-delombok/BuilderOnNestedRecord.java @@ -1,39 +1,39 @@ // version 14: public record BuilderOnNestedRecord(T t) { - public record Nested(String a) { - @java.lang.SuppressWarnings("all") + @lombok.Generated public static class NestedBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String a; - @java.lang.SuppressWarnings("all") + @lombok.Generated NestedBuilder() { } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderOnNestedRecord.Nested.NestedBuilder a(final String a) { this.a = a; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderOnNestedRecord.Nested build() { return new BuilderOnNestedRecord.Nested(this.a); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderOnNestedRecord.Nested.NestedBuilder(a=" + this.a + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderOnNestedRecord.Nested.NestedBuilder builder() { return new BuilderOnNestedRecord.Nested.NestedBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java index a43567b31f..79e71b3bae 100644 --- a/test/transform/resource/after-delombok/BuilderSimple.java +++ b/test/transform/resource/after-delombok/BuilderSimple.java @@ -5,23 +5,29 @@ class BuilderSimple { private List also; private int $butNotMe; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSimple(final int yes, final List also) { this.yes = yes; this.also = also; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static class BuilderSimpleBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") + @lombok.Generated private List also; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSimpleBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimple.BuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; @@ -30,21 +36,25 @@ public BuilderSimple.BuilderSimpleBuilder yes(final int yes) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimple.BuilderSimpleBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimple build() { return new BuilderSimple(this.yes, this.also); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static BuilderSimple.BuilderSimpleBuilder builder() { return new BuilderSimple.BuilderSimpleBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java b/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java index acb6f20a29..3952de248e 100644 --- a/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java +++ b/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java @@ -2,18 +2,23 @@ import java.util.List; public record BuilderSimpleOnRecord(List l, String a) { @java.lang.SuppressWarnings("all") + @lombok.Generated protected static class BuilderSimpleOnRecordBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private List l; @java.lang.SuppressWarnings("all") + @lombok.Generated private String a; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSimpleOnRecordBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder l(final List l) { this.l = l; return this; @@ -22,21 +27,25 @@ public BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder l(final List l) * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder a(final String a) { this.a = a; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimpleOnRecord build() { return new BuilderSimpleOnRecord(this.l, this.a); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder(l=" + this.l + ", a=" + this.a + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder builder() { return new BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java index 3038fe3949..f4991d73e9 100644 --- a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java @@ -2,35 +2,43 @@ class BuilderSimpleWithSetterPrefix { private int unprefixed; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSimpleWithSetterPrefix(final int unprefixed) { this.unprefixed = unprefixed; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static class BuilderSimpleWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int unprefixed; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSimpleWithSetterPrefixBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder withUnprefixed(final int unprefixed) { this.unprefixed = unprefixed; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimpleWithSetterPrefix build() { return new BuilderSimpleWithSetterPrefix(this.unprefixed); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(unprefixed=" + this.unprefixed + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder builder() { return new BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java index 7568d81215..e18982a7ce 100644 --- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java @@ -11,22 +11,29 @@ class BuilderSingularAnnotatedTypes { private Set<@MyAnnotation @NonNull String> foos; private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularAnnotatedTypes(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { this.foos = foos; this.bars = bars; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularAnnotatedTypesBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> foos; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularAnnotatedTypesBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(@MyAnnotation @NonNull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -36,6 +43,7 @@ public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(@M return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection foos) { if (foos == null) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -45,11 +53,13 @@ public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(f return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearFoos() { if (this.foos != null) this.foos.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) { if (barKey == null) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); @@ -66,6 +76,7 @@ public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(@M return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map bars) { if (bars == null) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -81,6 +92,7 @@ public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(f return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearBars() { if (this.bars$key != null) { this.bars$key.clear(); @@ -89,6 +101,7 @@ public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearB return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes build() { java.util.Set<@MyAnnotation @NonNull String> foos; switch (this.foos == null ? 0 : this.foos.size()) { @@ -120,12 +133,14 @@ public BuilderSingularAnnotatedTypes build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(foos=" + this.foos + ", bars$key=" + this.bars$key + ", bars$value=" + this.bars$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder builder() { return new BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java index d58caf4ded..6f31c6ec2f 100644 --- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java @@ -11,22 +11,29 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix { private Set<@MyAnnotation @NonNull String> foos; private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { this.foos = foos; this.bars = bars; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularAnnotatedTypesWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> foos; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(@MyAnnotation @NonNull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -36,6 +43,7 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTyp return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection foos) { if (foos == null) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -45,11 +53,13 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTyp return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() { if (this.foos != null) this.foos.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) { if (barKey == null) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); @@ -66,6 +76,7 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTyp return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map bars) { if (bars == null) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -81,6 +92,7 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTyp return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() { if (this.bars$key != null) { this.bars$key.clear(); @@ -89,6 +101,7 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTyp return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix build() { java.util.Set<@MyAnnotation @NonNull String> foos; switch (this.foos == null ? 0 : this.foos.size()) { @@ -120,11 +133,13 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(foos=" + this.foos + ", bars$key=" + this.bars$key + ", bars$value=" + this.bars$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() { return new BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java index 32b7c08433..c798773b14 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java @@ -11,6 +11,7 @@ class BuilderSingularGuavaListsSets { private ImmutableSortedSet passes; private ImmutableTable users; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { this.cards = cards; this.frogs = frogs; @@ -19,27 +20,36 @@ class BuilderSingularGuavaListsSets { this.users = users; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularGuavaListsSetsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder cards; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder frogs; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSet.Builder rawSet; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSortedSet.Builder passes; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableTable.Builder users; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.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") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { if (cards == null) { throw new java.lang.NullPointerException("cards cannot be null"); @@ -49,17 +59,20 @@ public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder car return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearCards() { this.cards = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.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") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { if (frogs == null) { throw new java.lang.NullPointerException("frogs cannot be null"); @@ -69,17 +82,20 @@ public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder fro return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearFrogs() { this.frogs = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.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") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { if (rawSet == null) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -89,17 +105,20 @@ public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder raw return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearRawSet() { this.rawSet = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.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") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { if (passes == null) { throw new java.lang.NullPointerException("passes cannot be null"); @@ -109,17 +128,20 @@ public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder pas return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearPasses() { this.passes = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.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") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder users(final com.google.common.collect.Table users) { if (users == null) { throw new java.lang.NullPointerException("users cannot be null"); @@ -129,11 +151,13 @@ public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder use return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearUsers() { this.users = null; return this; } @java.lang.SuppressWarnings("all") + @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(); @@ -144,11 +168,13 @@ public BuilderSingularGuavaListsSets build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @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") + @lombok.Generated public static BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder builder() { return new BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java index 9e3c6c156d..8748f12f7d 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java @@ -7,29 +7,37 @@ class BuilderSingularGuavaMaps { @SuppressWarnings("all") private ImmutableBiMap rawMap; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { this.battleaxes = battleaxes; this.vertices = vertices; this.rawMap = rawMap; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularGuavaMapsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableMap.Builder battleaxes; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSortedMap.Builder vertices; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableBiMap.Builder rawMap; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularGuavaMapsBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.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") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { if (battleaxes == null) { throw new java.lang.NullPointerException("battleaxes cannot be null"); @@ -39,17 +47,20 @@ public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxes return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearBattleaxes() { this.battleaxes = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.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") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { if (vertices == null) { throw new java.lang.NullPointerException("vertices cannot be null"); @@ -59,17 +70,20 @@ public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertices(f return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearVertices() { this.vertices = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.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") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { if (rawMap == null) { throw new java.lang.NullPointerException("rawMap cannot be null"); @@ -79,11 +93,13 @@ public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(fin return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearRawMap() { this.rawMap = null; return this; } @java.lang.SuppressWarnings("all") + @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(); @@ -92,11 +108,13 @@ public BuilderSingularGuavaMaps build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder builder() { return new BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java index f722dfcd16..059e139803 100644 --- a/test/transform/resource/after-delombok/BuilderSingularLists.java +++ b/test/transform/resource/after-delombok/BuilderSingularLists.java @@ -6,29 +6,37 @@ class BuilderSingularLists { @SuppressWarnings("all") private List rawList; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularLists(final List children, final Collection scarves, final List rawList) { this.children = children; this.scarves = scarves; this.rawList = rawList; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularListsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList children; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList scarves; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList rawList; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.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") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder children(final java.util.Collection children) { if (children == null) { throw new java.lang.NullPointerException("children cannot be null"); @@ -38,17 +46,20 @@ public BuilderSingularLists.BuilderSingularListsBuilder children(final java.u return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.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") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { if (scarves == null) { throw new java.lang.NullPointerException("scarves cannot be null"); @@ -58,17 +69,20 @@ public BuilderSingularLists.BuilderSingularListsBuilder scarves(final java.ut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.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") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { if (rawList == null) { throw new java.lang.NullPointerException("rawList cannot be null"); @@ -78,11 +92,13 @@ public BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.ut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists build() { java.util.List children; switch (this.children == null ? 0 : this.children.size()) { @@ -121,11 +137,13 @@ public BuilderSingularLists build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularLists.BuilderSingularListsBuilder builder() { return new BuilderSingularLists.BuilderSingularListsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java index de86383f94..9eb4fc0e80 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java @@ -5,29 +5,37 @@ class BuilderSingularNoAuto { private List widgets; private List items; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNoAuto(final List things, final List widgets, final List items) { this.things = things; this.widgets = widgets; this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularNoAutoBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList things; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList widgets; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNoAutoBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.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") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final java.util.Collection things) { if (things == null) { throw new java.lang.NullPointerException("things cannot be null"); @@ -37,17 +45,20 @@ public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final java.util return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.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") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widgets(final java.util.Collection widgets) { if (widgets == null) { throw new java.lang.NullPointerException("widgets cannot be null"); @@ -57,17 +68,20 @@ public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widgets(final java.uti return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.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") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -77,11 +91,13 @@ public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final java.util. return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto build() { java.util.List things; switch (this.things == null ? 0 : this.things.size()) { @@ -120,11 +136,13 @@ public BuilderSingularNoAuto build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularNoAuto.BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java index 8858f14509..5759adbf34 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java @@ -5,29 +5,37 @@ class BuilderSingularNoAutoWithSetterPrefix { private List widgets; private List items; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNoAutoWithSetterPrefix(final List things, final List widgets, final List items) { this.things = things; this.widgets = widgets; this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularNoAutoWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList things; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList widgets; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNoAutoWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) { if (this.things == null) this.things = new java.util.ArrayList(); this.things.add(things); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection things) { if (things == null) { throw new java.lang.NullPointerException("things cannot be null"); @@ -37,17 +45,20 @@ public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPref return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) { if (this.widgets == null) this.widgets = new java.util.ArrayList(); this.widgets.add(widget); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection widgets) { if (widgets == null) { throw new java.lang.NullPointerException("widgets cannot be null"); @@ -57,17 +68,20 @@ public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPref return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(items); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -77,11 +91,13 @@ public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPref return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix build() { java.util.List things; switch (this.things == null ? 0 : this.things.size()) { @@ -120,11 +136,13 @@ public BuilderSingularNoAutoWithSetterPrefix build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder builder() { return new BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNullBehavior1.java b/test/transform/resource/after-delombok/BuilderSingularNullBehavior1.java index 45ff97fa6f..a6405324cc 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNullBehavior1.java +++ b/test/transform/resource/after-delombok/BuilderSingularNullBehavior1.java @@ -5,26 +5,33 @@ class BuilderSingularNullBehavior1 { private List names; private List locations; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNullBehavior1(final List names, final List locations) { this.names = names; this.locations = locations; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularNullBehavior1Builder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList names; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList locations; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNullBehavior1Builder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder name(final String name) { if (this.names == null) this.names = new java.util.ArrayList(); this.names.add(name); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder names(final java.util.@org.checkerframework.checker.nullness.qual.NonNull Collection names) { assert names != null : "names cannot be null"; if (this.names == null) this.names = new java.util.ArrayList(); @@ -32,17 +39,20 @@ public static class BuilderSingularNullBehavior1Builder { return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearNames() { if (this.names != null) this.names.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder location(final String location) { if (this.locations == null) this.locations = new java.util.ArrayList(); this.locations.add(location); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder locations(final java.util.@org.checkerframework.checker.nullness.qual.Nullable Collection locations) { if (locations != null) { if (this.locations == null) this.locations = new java.util.ArrayList(); @@ -51,12 +61,14 @@ public static class BuilderSingularNullBehavior1Builder { return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearLocations() { if (this.locations != null) this.locations.clear(); return this; } @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1 build() { java.util.List names; switch (this.names == null ? 0 : this.names.size()) { @@ -84,11 +96,13 @@ public BuilderSingularNullBehavior1 build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return "BuilderSingularNullBehavior1.BuilderSingularNullBehavior1Builder(names=" + this.names + ", locations=" + this.locations + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder builder() { return new BuilderSingularNullBehavior1.BuilderSingularNullBehavior1Builder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNullBehavior2.java b/test/transform/resource/after-delombok/BuilderSingularNullBehavior2.java index 5f605de455..763dcb4078 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNullBehavior2.java +++ b/test/transform/resource/after-delombok/BuilderSingularNullBehavior2.java @@ -3,18 +3,23 @@ class BuilderSingularNullBehavior2 { private List locations; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNullBehavior2(final List locations) { this.locations = locations; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularNullBehavior2Builder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList locations; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNullBehavior2Builder() { } @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder location(final String location) { if (this.locations == null) this.locations = new java.util.ArrayList(); this.locations.add(location); @@ -22,6 +27,7 @@ public BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder location } @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder locations(@org.springframework.lang.NonNull final java.util.Collection locations) { java.util.Objects.requireNonNull(locations, "locations cannot be null"); if (this.locations == null) this.locations = new java.util.ArrayList(); @@ -30,12 +36,14 @@ public BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder location } @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder clearLocations() { if (this.locations != null) this.locations.clear(); return this; } @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior2 build() { java.util.List locations; switch (this.locations == null ? 0 : this.locations.size()) { @@ -53,13 +61,15 @@ public BuilderSingularNullBehavior2 build() { @org.springframework.lang.NonNull @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder(locations=" + this.locations + ")"; } } @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder builder() { return new BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderSingularOnRecord.java b/test/transform/resource/after-delombok/BuilderSingularOnRecord.java index 0aaa12cdb0..ae785b79a2 100644 --- a/test/transform/resource/after-delombok/BuilderSingularOnRecord.java +++ b/test/transform/resource/after-delombok/BuilderSingularOnRecord.java @@ -3,23 +3,30 @@ import java.util.List; public record BuilderSingularOnRecord(List children, Collection scarves, @SuppressWarnings("all") List rawList) { @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularOnRecordBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList children; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList scarves; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList rawList; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularOnRecordBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder child(final T child) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.add(child); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder children(final java.util.Collection children) { if (children == null) { throw new java.lang.NullPointerException("children cannot be null"); @@ -29,17 +36,20 @@ public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder children(final return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarves(final java.util.Collection scarves) { if (scarves == null) { throw new java.lang.NullPointerException("scarves cannot be null"); @@ -49,17 +59,20 @@ public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarves(final j return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder 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") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final java.util.Collection rawList) { if (rawList == null) { throw new java.lang.NullPointerException("rawList cannot be null"); @@ -69,11 +82,13 @@ public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final j return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord build() { java.util.List children; switch (this.children == null ? 0 : this.children.size()) { @@ -112,11 +127,13 @@ public BuilderSingularOnRecord build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularOnRecord.BuilderSingularOnRecordBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularOnRecord.BuilderSingularOnRecordBuilder builder() { return new BuilderSingularOnRecord.BuilderSingularOnRecordBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java index a718d7cd6c..418b71e948 100644 --- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java @@ -6,29 +6,37 @@ class BuilderSingularRedirectToGuava { private NavigableMap things; private Collection> doohickeys; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { this.dangerMice = dangerMice; this.things = things; this.doohickeys = doohickeys; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularRedirectToGuavaBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSet.Builder dangerMice; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSortedMap.Builder things; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder> doohickeys; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularRedirectToGuavaBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.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") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable dangerMice) { if (dangerMice == null) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -38,17 +46,20 @@ public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dang return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.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") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder things(final java.util.Map things) { if (things == null) { throw new java.lang.NullPointerException("things cannot be null"); @@ -58,17 +69,20 @@ public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder thin return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.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") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable> doohickeys) { if (doohickeys == null) { throw new java.lang.NullPointerException("doohickeys cannot be null"); @@ -78,11 +92,13 @@ public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dooh return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } @java.lang.SuppressWarnings("all") + @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(); @@ -91,11 +107,13 @@ public BuilderSingularRedirectToGuava build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java index 25f106e9c0..86e10848c5 100644 --- a/test/transform/resource/after-delombok/BuilderSingularSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularSets.java @@ -7,6 +7,7 @@ class BuilderSingularSets { private Set rawSet; private Set stringSet; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { this.dangerMice = dangerMice; this.octopodes = octopodes; @@ -14,25 +15,33 @@ class BuilderSingularSets { this.stringSet = stringSet; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularSetsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList dangerMice; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList octopodes; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList rawSet; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList stringSet; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularSetsBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder dangerMouse(final T dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder dangerMice(final java.util.Collection dangerMice) { if (dangerMice == null) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -42,17 +51,20 @@ public BuilderSingularSets.BuilderSingularSetsBuilder dangerMice(final java.u return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder clearDangerMice() { if (this.dangerMice != null) this.dangerMice.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder octopus(final Number octopus) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder octopodes(final java.util.Collection octopodes) { if (octopodes == null) { throw new java.lang.NullPointerException("octopodes cannot be null"); @@ -62,17 +74,20 @@ public BuilderSingularSets.BuilderSingularSetsBuilder octopodes(final java.ut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder clearOctopodes() { if (this.octopodes != null) this.octopodes.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.util.Collection rawSet) { if (rawSet == null) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -82,17 +97,20 @@ public BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.util. return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder clearRawSet() { if (this.rawSet != null) this.rawSet.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final String stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final java.util.Collection stringSet) { if (stringSet == null) { throw new java.lang.NullPointerException("stringSet cannot be null"); @@ -102,11 +120,13 @@ public BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final java.ut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder clearStringSet() { if (this.stringSet != null) this.stringSet.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets build() { java.util.Set dangerMice; switch (this.dangerMice == null ? 0 : this.dangerMice.size()) { @@ -154,11 +174,13 @@ public BuilderSingularSets build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularSets.BuilderSingularSetsBuilder builder() { return new BuilderSingularSets.BuilderSingularSetsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java index a3d3c621cf..e5e40fd103 100644 --- a/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java @@ -7,6 +7,7 @@ class BuilderSingularSetsWithSetterPrefix { private Set rawSet; private Set stringSet; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularSetsWithSetterPrefix(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { this.dangerMice = dangerMice; this.octopodes = octopodes; @@ -14,25 +15,33 @@ class BuilderSingularSetsWithSetterPrefix { this.stringSet = stringSet; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularSetsWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList dangerMice; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList octopodes; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList rawSet; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList stringSet; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularSetsWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMouse(final T dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMice(final java.util.Collection dangerMice) { if (dangerMice == null) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -42,17 +51,20 @@ public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBu return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearDangerMice() { if (this.dangerMice != null) this.dangerMice.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopus(final Number octopus) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopodes(final java.util.Collection octopodes) { if (octopodes == null) { throw new java.lang.NullPointerException("octopodes cannot be null"); @@ -62,17 +74,20 @@ public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBu return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearOctopodes() { if (this.octopodes != null) this.octopodes.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.util.Collection rawSet) { if (rawSet == null) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -82,17 +97,20 @@ public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBu return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearRawSet() { if (this.rawSet != null) this.rawSet.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final String stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final java.util.Collection stringSet) { if (stringSet == null) { throw new java.lang.NullPointerException("stringSet cannot be null"); @@ -102,11 +120,13 @@ public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBu return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearStringSet() { if (this.stringSet != null) this.stringSet.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix build() { java.util.Set dangerMice; switch (this.dangerMice == null ? 0 : this.dangerMice.size()) { @@ -154,11 +174,13 @@ public BuilderSingularSetsWithSetterPrefix build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder builder() { return new BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java index fcd57a318a..052f53dc6f 100644 --- a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java +++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java @@ -4,23 +4,29 @@ public static void test() { new BuilderSingularToBuilderWithNull(null).toBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularToBuilderWithNull(final java.util.List elems) { this.elems = elems; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularToBuilderWithNullBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularToBuilderWithNullBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection elems) { if (elems == null) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -30,11 +36,13 @@ public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNull build() { java.util.List elems; switch (this.elems == null ? 0 : this.elems.size()) { @@ -51,15 +59,18 @@ public BuilderSingularToBuilderWithNull build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder() { return new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder toBuilder() { final BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(); if (this.elems != null) builder.elems(this.elems); diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java index 59bc09c19a..9121f01ab8 100644 --- a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java @@ -4,23 +4,29 @@ public static void test() { new BuilderSingularToBuilderWithNullWithSetterPrefix(null).toBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix(final java.util.List elems) { this.elems = elems; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if (elems == null) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -30,11 +36,13 @@ public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilder return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNullWithSetterPrefix build() { java.util.List elems; switch (this.elems == null ? 0 : this.elems.size()) { @@ -51,15 +59,18 @@ public BuilderSingularToBuilderWithNullWithSetterPrefix build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() { return new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() { final BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); if (this.elems != null) builder.withElems(this.elems); diff --git a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java index 59cca1d3ea..faf1d5e231 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java +++ b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java @@ -4,26 +4,33 @@ class BuilderSingularWildcardListsWithToBuilder { private List objects; private Collection numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWildcardListsWithToBuilder(final List objects, final Collection numbers) { this.objects = objects; this.numbers = numbers; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularWildcardListsWithToBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList objects; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWildcardListsWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) { if (this.objects == null) this.objects = new java.util.ArrayList(); this.objects.add(object); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection objects) { if (objects == null) { throw new java.lang.NullPointerException("objects cannot be null"); @@ -33,17 +40,20 @@ public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWit return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() { if (this.objects != null) this.objects.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) { if (this.numbers == null) this.numbers = new java.util.ArrayList(); this.numbers.add(number); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection numbers) { if (numbers == null) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -53,11 +63,13 @@ public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWit return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() { if (this.numbers != null) this.numbers.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder build() { java.util.List objects; switch (this.objects == null ? 0 : this.objects.size()) { @@ -85,15 +97,18 @@ public BuilderSingularWildcardListsWithToBuilder build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(objects=" + this.objects + ", numbers=" + this.numbers + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder() { return new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() { final BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(); if (this.objects != null) builder.objects(this.objects); diff --git a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java index bb6c5bfb87..c23769dbbb 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java +++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java @@ -1,23 +1,29 @@ class BuilderSingularWithPrefixes { private java.util.List _elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWithPrefixes(final java.util.List elems) { this._elems = elems; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularWithPrefixesBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWithPrefixesBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elems(final java.util.Collection elems) { if (elems == null) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -27,11 +33,13 @@ public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elems(fina return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixes build() { java.util.List elems; switch (this.elems == null ? 0 : this.elems.size()) { @@ -48,11 +56,13 @@ public BuilderSingularWithPrefixes build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder builder() { return new BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java index 94633cfeef..ead2616872 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java @@ -1,23 +1,29 @@ class BuilderSingularWithPrefixesWithSetterPrefix { private java.util.List _elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix(final java.util.List elems) { this._elems = elems; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularWithPrefixesWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if (elems == null) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -27,11 +33,13 @@ public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWi return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixesWithSetterPrefix build() { java.util.List elems; switch (this.elems == null ? 0 : this.elems.size()) { @@ -48,11 +56,13 @@ public BuilderSingularWithPrefixesWithSetterPrefix build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() { return new BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnos.java b/test/transform/resource/after-delombok/BuilderTypeAnnos.java index f5ef42f7a1..d081449499 100644 --- a/test/transform/resource/after-delombok/BuilderTypeAnnos.java +++ b/test/transform/resource/after-delombok/BuilderTypeAnnos.java @@ -12,37 +12,44 @@ class BuilderTypeAnnos { @TB private List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderTypeAnnos(@TA final List foo) { this.foo = foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderTypeAnnosBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderTypeAnnosBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderTypeAnnos.BuilderTypeAnnosBuilder foo(@TA final List foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderTypeAnnos build() { return new BuilderTypeAnnos(this.foo); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderTypeAnnos.BuilderTypeAnnosBuilder builder() { return new BuilderTypeAnnos.BuilderTypeAnnosBuilder(); } } - diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java index 1fb7798ab8..8ee9071dfb 100644 --- a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java @@ -12,37 +12,44 @@ class BuilderTypeAnnosWithSetterPrefix { @TB private List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderTypeAnnosWithSetterPrefix(@TA final List foo) { this.foo = foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderTypeAnnosWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderTypeAnnosWithSetterPrefixBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder withFoo(@TA final List foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderTypeAnnosWithSetterPrefix build() { return new BuilderTypeAnnosWithSetterPrefix(this.foo); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(foo=" + this.foo + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder builder() { return new BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(); } } - diff --git a/test/transform/resource/after-delombok/BuilderValueData.java b/test/transform/resource/after-delombok/BuilderValueData.java index 0af32fe514..1f7d83465a 100644 --- a/test/transform/resource/after-delombok/BuilderValueData.java +++ b/test/transform/resource/after-delombok/BuilderValueData.java @@ -2,33 +2,41 @@ final class BuilderAndValue { private final int zero = 0; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndValue() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderAndValueBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndValueBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderAndValue build() { return new BuilderAndValue(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndValue.BuilderAndValueBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderAndValue.BuilderAndValueBuilder builder() { return new BuilderAndValue.BuilderAndValueBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getZero() { return this.zero; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndValue)) return false; @@ -38,6 +46,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -46,41 +55,49 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndValue(zero=" + this.getZero() + ")"; } } - class BuilderAndData { private final int zero = 0; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndData() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderAndDataBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndDataBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderAndData build() { return new BuilderAndData(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndData.BuilderAndDataBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderAndData.BuilderAndDataBuilder builder() { return new BuilderAndData.BuilderAndDataBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getZero() { return this.zero; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndData)) return false; @@ -90,11 +107,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof BuilderAndData; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -103,6 +122,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndData(zero=" + this.getZero() + ")"; } diff --git a/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java index de83d5db73..8597086b0e 100644 --- a/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java @@ -2,33 +2,41 @@ final class BuilderAndValueWithSetterPrefix { private final int zero = 0; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndValueWithSetterPrefix() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderAndValueWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndValueWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderAndValueWithSetterPrefix build() { return new BuilderAndValueWithSetterPrefix(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder builder() { return new BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getZero() { return this.zero; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndValueWithSetterPrefix)) return false; @@ -38,6 +46,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -46,41 +55,49 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndValueWithSetterPrefix(zero=" + this.getZero() + ")"; } } - class BuilderAndDataWithSetterPrefix { private final int zero = 0; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndDataWithSetterPrefix() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderAndDataWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndDataWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderAndDataWithSetterPrefix build() { return new BuilderAndDataWithSetterPrefix(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder builder() { return new BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getZero() { return this.zero; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndDataWithSetterPrefix)) return false; @@ -90,11 +107,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof BuilderAndDataWithSetterPrefix; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -103,6 +122,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndDataWithSetterPrefix(zero=" + this.getZero() + ")"; } diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java index a8a9bc1153..2e197179c5 100644 --- a/test/transform/resource/after-delombok/BuilderWithAccessors.java +++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java @@ -4,6 +4,7 @@ class BuilderWithAccessors { private int _foo; private int __bar; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { this.plower = plower; this.pUpper = upper; @@ -11,22 +12,29 @@ class BuilderWithAccessors { this.__bar = _bar; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithAccessorsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int plower; @java.lang.SuppressWarnings("all") + @lombok.Generated private int upper; @java.lang.SuppressWarnings("all") + @lombok.Generated private int foo; @java.lang.SuppressWarnings("all") + @lombok.Generated private int _bar; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithAccessorsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) { this.plower = plower; return this; @@ -35,6 +43,7 @@ public BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) { this.upper = upper; return this; @@ -43,6 +52,7 @@ public BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) { this.foo = foo; return this; @@ -51,21 +61,25 @@ public BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithAccessors.BuilderWithAccessorsBuilder _bar(final int _bar) { this._bar = _bar; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithAccessors build() { return new BuilderWithAccessors(this.plower, this.upper, this.foo, this._bar); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithAccessors.BuilderWithAccessorsBuilder builder() { return new BuilderWithAccessors.BuilderWithAccessorsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithBadNames.java b/test/transform/resource/after-delombok/BuilderWithBadNames.java index c96fbc58bf..ebb4fdfdba 100644 --- a/test/transform/resource/after-delombok/BuilderWithBadNames.java +++ b/test/transform/resource/after-delombok/BuilderWithBadNames.java @@ -2,23 +2,29 @@ public class BuilderWithBadNames { String build; String toString; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithBadNames(final String build, final String toString) { this.build = build; this.toString = toString; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithBadNamesBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String build; @java.lang.SuppressWarnings("all") + @lombok.Generated private String toString; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithBadNamesBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) { this.build = build; return this; @@ -27,21 +33,25 @@ public BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithBadNames.BuilderWithBadNamesBuilder toString(final String toString) { this.toString = toString; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithBadNames build() { return new BuilderWithBadNames(this.build, this.toString); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithBadNames.BuilderWithBadNamesBuilder(build=" + this.build + ", toString=" + this.toString + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithBadNames.BuilderWithBadNamesBuilder builder() { return new BuilderWithBadNames.BuilderWithBadNamesBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecated.java b/test/transform/resource/after-delombok/BuilderWithDeprecated.java index f072964922..26a02b44e9 100644 --- a/test/transform/resource/after-delombok/BuilderWithDeprecated.java +++ b/test/transform/resource/after-delombok/BuilderWithDeprecated.java @@ -11,6 +11,7 @@ public class BuilderWithDeprecated { @Deprecated ImmutableList numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List strings, final ImmutableList numbers) { this.dep1 = dep1; this.dep2 = dep2; @@ -18,16 +19,22 @@ public class BuilderWithDeprecated { this.numbers = numbers; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithDeprecatedBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String dep1; @java.lang.SuppressWarnings("all") + @lombok.Generated private int dep2; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList strings; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithDeprecatedBuilder() { } /** @@ -36,6 +43,7 @@ public static class BuilderWithDeprecatedBuilder { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep1(final String dep1) { this.dep1 = dep1; return this; @@ -45,12 +53,14 @@ public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep1(final String dep1 */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep2(final int dep2) { this.dep2 = dep2; return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder string(final String string) { if (this.strings == null) this.strings = new java.util.ArrayList(); this.strings.add(string); @@ -58,6 +68,7 @@ public BuilderWithDeprecated.BuilderWithDeprecatedBuilder string(final String st } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder strings(final java.util.Collection strings) { if (strings == null) { throw new java.lang.NullPointerException("strings cannot be null"); @@ -68,12 +79,14 @@ public BuilderWithDeprecated.BuilderWithDeprecatedBuilder strings(final java.uti } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearStrings() { if (this.strings != null) this.strings.clear(); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder number(final Integer number) { if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder(); this.numbers.add(number); @@ -81,6 +94,7 @@ public BuilderWithDeprecated.BuilderWithDeprecatedBuilder number(final Integer n } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable numbers) { if (numbers == null) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -91,11 +105,13 @@ public BuilderWithDeprecated.BuilderWithDeprecatedBuilder numbers(final java.lan } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearNumbers() { this.numbers = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated build() { java.util.List strings; switch (this.strings == null ? 0 : this.strings.size()) { @@ -113,11 +129,13 @@ public BuilderWithDeprecated build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithDeprecated.BuilderWithDeprecatedBuilder(dep1=" + this.dep1 + ", dep2=" + this.dep2 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithDeprecated.BuilderWithDeprecatedBuilder builder() { return new BuilderWithDeprecated.BuilderWithDeprecatedBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java b/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java index d5c06465a9..f6d152337d 100644 --- a/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java +++ b/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java @@ -7,20 +7,26 @@ public class BuilderWithDeprecatedAnnOnly { @Deprecated ImmutableList numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithDeprecatedAnnOnly(final int dep1, final java.util.List strings, final ImmutableList numbers) { this.dep1 = dep1; this.strings = strings; this.numbers = numbers; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithDeprecatedAnnOnlyBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int dep1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList strings; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithDeprecatedAnnOnlyBuilder() { } /** @@ -28,12 +34,14 @@ public static class BuilderWithDeprecatedAnnOnlyBuilder { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder dep1(final int dep1) { this.dep1 = dep1; return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder string(final String string) { if (this.strings == null) this.strings = new java.util.ArrayList(); this.strings.add(string); @@ -41,6 +49,7 @@ public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder string(f } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder strings(final java.util.Collection strings) { if (strings == null) { throw new java.lang.NullPointerException("strings cannot be null"); @@ -51,12 +60,14 @@ public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder strings( } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearStrings() { if (this.strings != null) this.strings.clear(); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder number(final Integer number) { if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder(); this.numbers.add(number); @@ -64,6 +75,7 @@ public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder number(f } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder numbers(final java.lang.Iterable numbers) { if (numbers == null) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -74,11 +86,13 @@ public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder numbers( } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearNumbers() { this.numbers = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly build() { java.util.List strings; switch (this.strings == null ? 0 : this.strings.size()) { @@ -96,11 +110,13 @@ public BuilderWithDeprecatedAnnOnly build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder(dep1=" + this.dep1 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder builder() { return new BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java index 9c7ac1adb8..63dca1b419 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java @@ -4,19 +4,23 @@ public static BuilderWithExistingBuilderClass stat } public static class BuilderWithExistingBuilderClassBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean arg2; @java.lang.SuppressWarnings("all") + @lombok.Generated private String arg3; private Z arg1; public void arg2(boolean arg) { } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithExistingBuilderClassBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg1(final Z arg1) { this.arg1 = arg1; return this; @@ -25,21 +29,25 @@ public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClass build() { return BuilderWithExistingBuilderClass.staticMethod(this.arg1, this.arg2, this.arg3); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder builder() { return new BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java index c7da67f8fe..bc7ec3f5df 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -4,19 +4,23 @@ public static BuilderWithExistingBuilderClassWithSetterPrefix } public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean arg2; @java.lang.SuppressWarnings("all") + @lombok.Generated private String arg3; private Z arg1; public void withArg2(boolean arg) { } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefixBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg1(final Z arg1) { this.arg1 = arg1; return this; @@ -25,21 +29,25 @@ public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilde * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClassWithSetterPrefix build() { return BuilderWithExistingBuilderClassWithSetterPrefix.staticMethod(this.arg1, this.arg2, this.arg3); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder builder() { return new BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java index 4a21f2c305..ca056f4d7e 100644 --- a/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java @@ -3,29 +3,37 @@ class BuilderWithJavaBeansSpecCapitalization { java.util.List aField; String bField; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithJavaBeansSpecCapitalization(final java.util.List a, final java.util.List aField, final String bField) { this.a = a; this.aField = aField; this.bField = bField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithJavaBeansSpecCapitalizationBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList a; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList aField; @java.lang.SuppressWarnings("all") + @lombok.Generated private String bField; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithJavaBeansSpecCapitalizationBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setZ(final String z) { if (this.a == null) this.a = new java.util.ArrayList(); this.a.add(z); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setA(final java.util.Collection a) { if (a == null) { throw new java.lang.NullPointerException("a cannot be null"); @@ -35,17 +43,20 @@ public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitaliza return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearA() { if (this.a != null) this.a.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setyField(final String yField) { if (this.aField == null) this.aField = new java.util.ArrayList(); this.aField.add(yField); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setaField(final java.util.Collection aField) { if (aField == null) { throw new java.lang.NullPointerException("aField cannot be null"); @@ -55,6 +66,7 @@ public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitaliza return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearaField() { if (this.aField != null) this.aField.clear(); return this; @@ -63,11 +75,13 @@ public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitaliza * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setbField(final String bField) { this.bField = bField; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization build() { java.util.List a; switch (this.a == null ? 0 : this.a.size()) { @@ -95,12 +109,14 @@ public BuilderWithJavaBeansSpecCapitalization build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder(a=" + this.a + ", aField=" + this.aField + ", bField=" + this.bField + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder builder() { return new BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java index 61df442778..cf10f98eb4 100644 --- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java +++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java @@ -1,35 +1,43 @@ class BuilderWithNoBuilderMethod { private String a = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNoBuilderMethod(final String a) { this.a = a; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithNoBuilderMethodBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String a; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNoBuilderMethodBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder a(final String a) { this.a = a; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNoBuilderMethod build() { return new BuilderWithNoBuilderMethod(this.a); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder(a=" + this.a + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder toBuilder() { return new BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder().a(this.a); } diff --git a/test/transform/resource/after-delombok/BuilderWithNonNull.java b/test/transform/resource/after-delombok/BuilderWithNonNull.java index 00728ea732..68f82145cf 100644 --- a/test/transform/resource/after-delombok/BuilderWithNonNull.java +++ b/test/transform/resource/after-delombok/BuilderWithNonNull.java @@ -3,6 +3,7 @@ class BuilderWithNonNull { @lombok.NonNull private final String id; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNonNull(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -10,16 +11,20 @@ class BuilderWithNonNull { this.id = id; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithNonNullBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String id; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNonNullBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNonNull.BuilderWithNonNullBuilder id(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -28,17 +33,20 @@ public BuilderWithNonNull.BuilderWithNonNullBuilder id(@lombok.NonNull final Str return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNonNull build() { return new BuilderWithNonNull(this.id); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithNonNull.BuilderWithNonNullBuilder(id=" + this.id + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithNonNull.BuilderWithNonNullBuilder builder() { return new BuilderWithNonNull.BuilderWithNonNullBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java index f6dfed672e..2ed41f0e91 100644 --- a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java @@ -3,6 +3,7 @@ class BuilderWithNonNullWithSetterPrefix { @lombok.NonNull private final String id; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNonNullWithSetterPrefix(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -10,16 +11,20 @@ class BuilderWithNonNullWithSetterPrefix { this.id = id; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithNonNullWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String id; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNonNullWithSetterPrefixBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder withId(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -28,16 +33,19 @@ public BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuil return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNonNullWithSetterPrefix build() { return new BuilderWithNonNullWithSetterPrefix(this.id); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(id=" + this.id + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder builder() { return new BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java index a96fe1cc50..2e86e34883 100644 --- a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java +++ b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java @@ -6,23 +6,29 @@ public static final class Test, Quz extends Inter, Quz extends Inter> { @java.lang.SuppressWarnings("all") + @lombok.Generated private Foo foo; @java.lang.SuppressWarnings("all") + @lombok.Generated private Bar bar; @java.lang.SuppressWarnings("all") + @lombok.Generated TestBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithRecursiveGenerics.Test.TestBuilder foo(final Foo foo) { this.foo = foo; return this; @@ -31,34 +37,41 @@ public BuilderWithRecursiveGenerics.Test.TestBuilder foo(final Fo * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithRecursiveGenerics.Test.TestBuilder bar(final Bar bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithRecursiveGenerics.Test build() { return new BuilderWithRecursiveGenerics.Test(this.foo, this.bar); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithRecursiveGenerics.Test.TestBuilder(foo=" + this.foo + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static , Quz extends Inter> BuilderWithRecursiveGenerics.Test.TestBuilder builder() { return new BuilderWithRecursiveGenerics.Test.TestBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public Foo getFoo() { return this.foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Bar getBar() { return this.bar; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderWithRecursiveGenerics.Test)) return false; @@ -73,6 +86,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -84,6 +98,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithRecursiveGenerics.Test(foo=" + this.getFoo() + ", bar=" + this.getBar() + ")"; } diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java index 290e473b53..f496730eff 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java +++ b/test/transform/resource/after-delombok/BuilderWithToBuilder.java @@ -8,6 +8,7 @@ public static K rrr(BuilderWithToBuilder x) { return x.foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithToBuilder(final String one, final String two, final T foo, final List bars) { this.mOne = one; this.mTwo = two; @@ -15,22 +16,29 @@ public static K rrr(BuilderWithToBuilder x) { this.bars = bars; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithToBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String one; @java.lang.SuppressWarnings("all") + @lombok.Generated private String two; @java.lang.SuppressWarnings("all") + @lombok.Generated private T foo; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList bars; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithToBuilderBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder one(final String one) { this.one = one; return this; @@ -39,6 +47,7 @@ public BuilderWithToBuilder.BuilderWithToBuilderBuilder one(final String one) * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder two(final String two) { this.two = two; return this; @@ -47,17 +56,20 @@ public BuilderWithToBuilder.BuilderWithToBuilderBuilder two(final String two) * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder foo(final T foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder bar(final T bar) { if (this.bars == null) this.bars = new java.util.ArrayList(); this.bars.add(bar); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder bars(final java.util.Collection bars) { if (bars == null) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -67,11 +79,13 @@ public BuilderWithToBuilder.BuilderWithToBuilderBuilder bars(final java.util. return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder clearBars() { if (this.bars != null) this.bars.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder build() { java.util.List bars; switch (this.bars == null ? 0 : this.bars.size()) { @@ -88,15 +102,18 @@ public BuilderWithToBuilder build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithToBuilder.BuilderWithToBuilderBuilder builder() { return new BuilderWithToBuilder.BuilderWithToBuilderBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder toBuilder() { final T foo = BuilderWithToBuilder.rrr(this); final BuilderWithToBuilder.BuilderWithToBuilderBuilder builder = new BuilderWithToBuilder.BuilderWithToBuilderBuilder().one(this.mOne).two(this.mTwo).foo(foo); @@ -112,20 +129,26 @@ class ConstructorWithToBuilder { public ConstructorWithToBuilder(String mOne, T baz, com.google.common.collect.ImmutableList bars) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class ConstructorWithToBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String mOne; @java.lang.SuppressWarnings("all") + @lombok.Generated private T baz; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList bars; @java.lang.SuppressWarnings("all") + @lombok.Generated ConstructorWithToBuilderBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder mOne(final String mOne) { this.mOne = mOne; return this; @@ -134,6 +157,7 @@ public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder mOne(final St * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder baz(final T baz) { this.baz = baz; return this; @@ -142,76 +166,81 @@ public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder baz(final T b * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder bars(final com.google.common.collect.ImmutableList bars) { this.bars = bars; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorWithToBuilder build() { return new ConstructorWithToBuilder(this.mOne, this.baz, this.bars); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne + ", baz=" + this.baz + ", bars=" + this.bars + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static ConstructorWithToBuilder.ConstructorWithToBuilderBuilder builder() { return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder toBuilder() { return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder().mOne(this.mOne).baz(this.foo).bars(this.bars); } } class StaticMethodWithToBuilder { private T foo; - public StaticMethodWithToBuilder(T foo) { this.foo = foo; } - public static StaticMethodWithToBuilder of(T foo) { return new StaticMethodWithToBuilder(foo); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static class StaticMethodWithToBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private T foo; - @java.lang.SuppressWarnings("all") + @lombok.Generated StaticMethodWithToBuilderBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder foo(final T foo) { this.foo = foo; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public StaticMethodWithToBuilder build() { return StaticMethodWithToBuilder.of(this.foo); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder(foo=" + this.foo + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder builder() { return new StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder toBuilder() { return new StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder().foo(this.foo); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderWithTolerate.java b/test/transform/resource/after-delombok/BuilderWithTolerate.java index 79494c4966..ee6259d136 100644 --- a/test/transform/resource/after-delombok/BuilderWithTolerate.java +++ b/test/transform/resource/after-delombok/BuilderWithTolerate.java @@ -6,37 +6,44 @@ public static void main(String[] args) { } public static class BuilderWithTolerateBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int value; @Tolerate public BuilderWithTolerateBuilder value(String s) { return this.value(Integer.parseInt(s)); } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithTolerateBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithTolerate.BuilderWithTolerateBuilder value(final int value) { this.value = value; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithTolerate build() { return new BuilderWithTolerate(this.value); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithTolerate(final int value) { this.value = value; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithTolerate.BuilderWithTolerateBuilder builder() { return new BuilderWithTolerate.BuilderWithTolerateBuilder(); } diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java index bdd7921a65..62c8b0c779 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java @@ -6,16 +6,19 @@ class CheckerFrameworkBasic { private int z; @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") + @lombok.Generated public int getY() { return this.y; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public int getZ() { return this.z; } @@ -23,6 +26,7 @@ public int getZ() { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public @org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBasic setZ(final int z) { this.z = z; return this; @@ -30,6 +34,7 @@ public int getZ() { @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof CheckerFrameworkBasic)) return false; @@ -42,12 +47,14 @@ public boolean equals(final java.lang.Object o) { } @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof CheckerFrameworkBasic; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -59,10 +66,12 @@ public int hashCode() { @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "CheckerFrameworkBasic(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBasic(final int x, final int y, final int z) { this.x = x; this.y = y; @@ -73,6 +82,7 @@ public CheckerFrameworkBasic(final int x, final int y, final int z) { */ @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBasic withX(final int x) { return this.x == x ? this : new CheckerFrameworkBasic(x, this.y, this.z); } diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java index 64f07c37eb..5c31e34675 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java @@ -7,10 +7,12 @@ class CheckerFrameworkBuilder { int z; List names; @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 5; } @java.lang.SuppressWarnings("all") + @lombok.Generated CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { this.x = x; this.y = y; @@ -18,24 +20,32 @@ class CheckerFrameworkBuilder { this.names = names; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class CheckerFrameworkBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int y; @java.lang.SuppressWarnings("all") + @lombok.Generated private int z; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList names; @java.lang.SuppressWarnings("all") + @lombok.Generated CheckerFrameworkBuilderBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder x(final int x) { this.x$value = x; x$set = true; @@ -45,6 +55,7 @@ public static class CheckerFrameworkBuilderBuilder { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder y(final int y) { this.y = y; return this; @@ -53,17 +64,20 @@ public static class CheckerFrameworkBuilderBuilder { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder z(final int z) { this.z = z; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder name(final String name) { if (this.names == null) this.names = new java.util.ArrayList(); this.names.add(name); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder names(final java.util.Collection names) { if (names == null) { throw new java.lang.NullPointerException("names cannot be null"); @@ -73,12 +87,14 @@ public static class CheckerFrameworkBuilderBuilder { return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder clearNames() { if (this.names != null) this.names.clear(); return this; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder build(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) { java.util.List names; switch (this.names == null ? 0 : this.names.size()) { @@ -98,13 +114,14 @@ public CheckerFrameworkBuilder build(CheckerFrameworkBuilder.@org.checkerframewo @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(x$value=" + this.x$value + ", y=" + this.y + ", z=" + this.z + ", names=" + this.names + ")"; } } - @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public static CheckerFrameworkBuilder.@org.checkerframework.common.aliasing.qual.Unique CheckerFrameworkBuilderBuilder builder() { return new CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(); } diff --git a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java index cf00f5fcd1..000b281689 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java @@ -8,25 +8,33 @@ public static class Parent { int z; List names; @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 5; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int y; @java.lang.SuppressWarnings("all") + @lombok.Generated private int z; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList names; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public @org.checkerframework.common.returnsreceiver.qual.This B x(final int x) { this.x$value = x; x$set = true; @@ -36,6 +44,7 @@ public static abstract class ParentBuilder(); this.names.add(name); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public @org.checkerframework.common.returnsreceiver.qual.This B names(final java.util.Collection names) { if (names == null) { throw new java.lang.NullPointerException("names cannot be null"); @@ -64,43 +76,52 @@ public static abstract class ParentBuilder this); @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "CheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value + ", y=" + this.y + ", z=" + this.z + ", names=" + this.names + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") + @lombok.Generated protected CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.common.returnsreceiver.qual.This ParentBuilderImpl self() { return this; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkSuperBuilder.Parent build(CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) { return new CheckerFrameworkSuperBuilder.Parent(this); } } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final CheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { if (b.x$set) this.x = b.x$value; else this.x = CheckerFrameworkSuperBuilder.Parent.$default$x(); @@ -121,6 +142,7 @@ protected Parent(final CheckerFrameworkSuperBuilder.Parent.ParentBuilder b } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public static CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.common.aliasing.qual.Unique ParentBuilder builder() { return new CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } @@ -129,21 +151,27 @@ public static class ZChild extends Parent { int a; int b; @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$a() { return 1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ZChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean a$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int a$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int b; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public @org.checkerframework.common.returnsreceiver.qual.This B a(final int a) { this.a$value = a; a$set = true; @@ -153,6 +181,7 @@ public static abstract class ZChildBuilder this); @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder(super=" + super.toString() + ", a$value=" + this.a$value + ", b=" + this.b + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ZChildBuilderImpl extends CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ZChildBuilderImpl() { } @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") + @lombok.Generated protected CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.common.returnsreceiver.qual.This ZChildBuilderImpl self() { return this; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkSuperBuilder.ZChild build(CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilderImpl this) { return new CheckerFrameworkSuperBuilder.ZChild(this); } } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated protected ZChild(final CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { super(b); if (b.a$set) this.a = b.a$value; @@ -200,8 +237,9 @@ protected ZChild(final CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public static CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.common.aliasing.qual.Unique ZChildBuilder builder() { return new CheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java index 769aaf7cf0..5ab2797bae 100644 --- a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java +++ b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java @@ -1,6 +1,7 @@ class GetFoo { private int foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/CommentsInterspersed.java b/test/transform/resource/after-delombok/CommentsInterspersed.java index 833f2ce0a2..d00af73d8b 100644 --- a/test/transform/resource/after-delombok/CommentsInterspersed.java +++ b/test/transform/resource/after-delombok/CommentsInterspersed.java @@ -12,6 +12,7 @@ public class CommentsInterspersed { javascript; }-*/ @java.lang.SuppressWarnings("all") + @lombok.Generated public String getTest() { return this.test; } diff --git a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java index ced4f3f2da..c14e2927c5 100644 --- a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java +++ b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java @@ -1,6 +1,7 @@ class ConflictingStaticConstructorNames { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ConflictingStaticConstructorNames)) return false; @@ -9,21 +10,25 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof ConflictingStaticConstructorNames; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConflictingStaticConstructorNames()"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConflictingStaticConstructorNames() { } } diff --git a/test/transform/resource/after-delombok/ConstructorInner.java b/test/transform/resource/after-delombok/ConstructorInner.java index fb0852dcba..9fd08d3e89 100644 --- a/test/transform/resource/after-delombok/ConstructorInner.java +++ b/test/transform/resource/after-delombok/ConstructorInner.java @@ -1,11 +1,13 @@ class ConstructorInner { static class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private Inner() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static ConstructorInner.Inner of() { return new ConstructorInner.Inner(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/Constructors.java b/test/transform/resource/after-delombok/Constructors.java index b2e51c4082..49227259ec 100644 --- a/test/transform/resource/after-delombok/Constructors.java +++ b/test/transform/resource/after-delombok/Constructors.java @@ -2,6 +2,7 @@ class RequiredArgsConstructor1 { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public RequiredArgsConstructor1(final int x) { this.x = x; } @@ -10,6 +11,7 @@ class RequiredArgsConstructorAccess { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated protected RequiredArgsConstructorAccess(final int x) { this.x = x; } @@ -18,10 +20,12 @@ class RequiredArgsConstructorStaticName { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private RequiredArgsConstructorStaticName(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static RequiredArgsConstructorStaticName staticname(final int x) { return new RequiredArgsConstructorStaticName(x); } @@ -31,6 +35,7 @@ class RequiredArgsConstructorWithAnnotations { String name; @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public RequiredArgsConstructorWithAnnotations(final int x) { this.x = x; } @@ -39,6 +44,7 @@ class AllArgsConstructor1 { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public AllArgsConstructor1(final int x, final String name) { this.x = x; this.name = name; @@ -48,6 +54,7 @@ class NoArgsConstructor1 { int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public NoArgsConstructor1() { } } @@ -55,10 +62,12 @@ class RequiredArgsConstructorStaticNameGenerics { final T x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private RequiredArgsConstructorStaticNameGenerics(final T x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static RequiredArgsConstructorStaticNameGenerics of(final T x) { return new RequiredArgsConstructorStaticNameGenerics(x); } @@ -67,10 +76,12 @@ class RequiredArgsConstructorStaticNameGenerics2 { final Class x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private RequiredArgsConstructorStaticNameGenerics2(final Class x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static RequiredArgsConstructorStaticNameGenerics2 of(final Class x) { return new RequiredArgsConstructorStaticNameGenerics2(x); } @@ -78,6 +89,7 @@ public static RequiredArgsConstructorStaticNameGenerics2 o class AllArgsConstructorPackageAccess { final String x; @java.lang.SuppressWarnings("all") + @lombok.Generated AllArgsConstructorPackageAccess(final String x) { this.x = x; } @@ -91,6 +103,7 @@ class NoArgsConstructor2 { final String s; byte z; @java.lang.SuppressWarnings("all") + @lombok.Generated public NoArgsConstructor2() { this.x = 0; this.y = 0.0; diff --git a/test/transform/resource/after-delombok/ConstructorsConfiguration.java b/test/transform/resource/after-delombok/ConstructorsConfiguration.java index 47b0cc16ca..8c90fd8b23 100644 --- a/test/transform/resource/after-delombok/ConstructorsConfiguration.java +++ b/test/transform/resource/after-delombok/ConstructorsConfiguration.java @@ -1,6 +1,7 @@ class ConstructorsConfiguration { int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsConfiguration(final int x) { this.x = x; } diff --git a/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java b/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java index 7483718fcf..748d9d8cf1 100644 --- a/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java +++ b/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java @@ -1,15 +1,13 @@ //version 8: import lombok.NonNull; - public class ConstructorsInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; @NonNull private String string2; - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner(final String string, @NonNull final String string2) { if (string2 == null) { throw new java.lang.NullPointerException("string2 is marked non-null but is null"); @@ -17,16 +15,16 @@ public Inner(final String string, @NonNull final String string2) { this.string = string; this.string2 = string2; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner(@NonNull final String string2) { if (string2 == null) { throw new java.lang.NullPointerException("string2 is marked non-null but is null"); } this.string2 = string2; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner() { } } diff --git a/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java b/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java index 2d59681cfc..16d0713d1a 100644 --- a/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java +++ b/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java @@ -12,6 +12,7 @@ class ConstructorsTypeAnnos { @TB List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsTypeAnnos(@TA final List foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java index 7097d5a281..10bafc6913 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java +++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java @@ -4,8 +4,8 @@ class ConstructorsWithAccessors { int pUpper; int _huh; int __huh2; - @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { this.plower = plower; this.pUpper = upper; @@ -13,7 +13,6 @@ public ConstructorsWithAccessors(final int plower, final int upper, final int hu this.__huh2 = _huh2; } } - class ConstructorsWithAccessorsNonNull { @lombok.NonNull Integer plower; @@ -23,8 +22,8 @@ class ConstructorsWithAccessorsNonNull { Integer _huh; @lombok.NonNull final Integer __huh2; - @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithAccessorsNonNull(@lombok.NonNull final Integer plower, @lombok.NonNull final Integer upper, @lombok.NonNull final Integer huh, @lombok.NonNull final Integer _huh2) { if (plower == null) { throw new java.lang.NullPointerException("plower is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java index bcc9a57e3a..a4fb4af7a3 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java +++ b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java @@ -2,24 +2,31 @@ final class ConstructorsWithBuilderDefaults { private final int x; private final int y; @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 5; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class ConstructorsWithBuilderDefaultsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int y; @java.lang.SuppressWarnings("all") + @lombok.Generated ConstructorsWithBuilderDefaultsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final int x) { this.x$value = x; x$set = true; @@ -29,11 +36,13 @@ public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x( * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder y(final int y) { this.y = y; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults build() { int x$value = this.x$value; if (!this.x$set) x$value = ConstructorsWithBuilderDefaults.$default$x(); @@ -41,24 +50,29 @@ public ConstructorsWithBuilderDefaults build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(x$value=" + this.x$value + ", y=" + this.y + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getY() { return this.y; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ConstructorsWithBuilderDefaults)) return false; @@ -69,6 +83,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -78,15 +93,18 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorsWithBuilderDefaults(x=" + this.getX() + ", y=" + this.getY() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults() { this.y = 0; this.x = ConstructorsWithBuilderDefaults.$default$x(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults(final int x, final int y) { this.x = x; this.y = y; diff --git a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java index f62167c608..c23f0d7bda 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java +++ b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java @@ -5,38 +5,49 @@ final class ConstructorsWithBuilderDefaults { private final T x; private final T q; @java.lang.SuppressWarnings("all") + @lombok.Generated private static java.util.List $default$z() { return new java.util.ArrayList(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static T $default$x() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated ConstructorsWithBuilderDefaults(final java.util.List z, final T x, final T q) { this.z = z; this.x = x; this.q = q; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class ConstructorsWithBuilderDefaultsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean z$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.List z$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private T x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private T q; @java.lang.SuppressWarnings("all") + @lombok.Generated ConstructorsWithBuilderDefaultsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder z(final java.util.List z) { this.z$value = z; z$set = true; @@ -46,6 +57,7 @@ public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final T x) { this.x$value = x; x$set = true; @@ -55,12 +67,13 @@ public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder q(final T q) { this.q = q; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults build() { java.util.List z$value = this.z$value; if (!this.z$set) z$value = ConstructorsWithBuilderDefaults.$default$z(); @@ -70,34 +83,41 @@ public ConstructorsWithBuilderDefaults build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(z$value=" + this.z$value + ", x$value=" + this.x$value + ", q=" + this.q + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private ConstructorsWithBuilderDefaults() { this.q = null; this.z = ConstructorsWithBuilderDefaults.$default$z(); this.x = ConstructorsWithBuilderDefaults.$default$x(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public java.util.List getZ() { return this.z; } @java.lang.SuppressWarnings("all") + @lombok.Generated public T getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public T getQ() { return this.q; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ConstructorsWithBuilderDefaults)) return false; @@ -115,6 +135,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -128,6 +149,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorsWithBuilderDefaults(z=" + this.getZ() + ", x=" + this.getX() + ", q=" + this.getQ() + ")"; } diff --git a/test/transform/resource/after-delombok/ConstructorsWithSuperBuilderDefaults.java b/test/transform/resource/after-delombok/ConstructorsWithSuperBuilderDefaults.java index c5188bb35c..d2df277438 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithSuperBuilderDefaults.java +++ b/test/transform/resource/after-delombok/ConstructorsWithSuperBuilderDefaults.java @@ -1,94 +1,96 @@ class ConstructorsWithSuperBuilderDefaults { int x; int y; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 5; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ConstructorsWithSuperBuilderDefaultsBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int y; - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B x(final int x) { this.x$value = x; x$set = true; return self(); } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B y(final int y) { this.y = y; return self(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder(x$value=" + this.x$value + ", y=" + this.y + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ConstructorsWithSuperBuilderDefaultsBuilderImpl extends ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ConstructorsWithSuperBuilderDefaultsBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithSuperBuilderDefaults build() { return new ConstructorsWithSuperBuilderDefaults(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected ConstructorsWithSuperBuilderDefaults(final ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder b) { if (b.x$set) this.x = b.x$value; else this.x = ConstructorsWithSuperBuilderDefaults.$default$x(); this.y = b.y; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder builder() { return new ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilderImpl(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithSuperBuilderDefaults() { this.x = ConstructorsWithSuperBuilderDefaults.$default$x(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithSuperBuilderDefaults(final int x, final int y) { this.x = x; this.y = y; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/DataConfiguration.java b/test/transform/resource/after-delombok/DataConfiguration.java index 6771a6a777..593a60338c 100644 --- a/test/transform/resource/after-delombok/DataConfiguration.java +++ b/test/transform/resource/after-delombok/DataConfiguration.java @@ -1,19 +1,23 @@ class DataConfiguration { final int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public DataConfiguration(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated private DataConfiguration() { this.x = 0; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataConfiguration)) return false; @@ -23,11 +27,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataConfiguration; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -36,6 +42,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataConfiguration(x=" + this.x + ")"; } diff --git a/test/transform/resource/after-delombok/DataExtended.java b/test/transform/resource/after-delombok/DataExtended.java index bcbf2293b8..6925c308e8 100644 --- a/test/transform/resource/after-delombok/DataExtended.java +++ b/test/transform/resource/after-delombok/DataExtended.java @@ -1,18 +1,22 @@ class DataExtended { int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public DataExtended() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataExtended)) return false; @@ -22,11 +26,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataExtended; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -35,6 +41,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataExtended(x=" + this.x + ")"; } diff --git a/test/transform/resource/after-delombok/DataIgnore.java b/test/transform/resource/after-delombok/DataIgnore.java index 309d8150b2..297145be35 100644 --- a/test/transform/resource/after-delombok/DataIgnore.java +++ b/test/transform/resource/after-delombok/DataIgnore.java @@ -2,15 +2,18 @@ class DataIgnore { final int x; String $name; @java.lang.SuppressWarnings("all") + @lombok.Generated public DataIgnore(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataIgnore)) return false; @@ -20,11 +23,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataIgnore; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -33,6 +38,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataIgnore(x=" + this.getX() + ")"; } diff --git a/test/transform/resource/after-delombok/DataInAnonymousClass.java b/test/transform/resource/after-delombok/DataInAnonymousClass.java index 788d7be529..a777ee7bce 100644 --- a/test/transform/resource/after-delombok/DataInAnonymousClass.java +++ b/test/transform/resource/after-delombok/DataInAnonymousClass.java @@ -1,25 +1,24 @@ public class DataInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner() { } - @java.lang.SuppressWarnings("all") + @lombok.Generated public String getString() { return this.string; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public void setString(final String string) { this.string = string; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Inner)) return false; @@ -30,14 +29,14 @@ public boolean equals(final java.lang.Object o) { if (this$string == null ? other$string != null : !this$string.equals(other$string)) return false; return true; } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Inner; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -45,9 +44,9 @@ public int hashCode() { result = result * PRIME + ($string == null ? 43 : $string.hashCode()); return result; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Inner(string=" + this.getString() + ")"; } diff --git a/test/transform/resource/after-delombok/DataOnEnum.java b/test/transform/resource/after-delombok/DataOnEnum.java index 6b5779e8ae..8fb9cfd5a3 100644 --- a/test/transform/resource/after-delombok/DataOnEnum.java +++ b/test/transform/resource/after-delombok/DataOnEnum.java @@ -2,15 +2,18 @@ public enum DataOnEnum { A("hello"); private final String someField; @java.lang.SuppressWarnings("all") + @lombok.Generated public String getSomeField() { return this.someField; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataOnEnum." + this.name() + "(someField=" + this.getSomeField() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated private DataOnEnum(final String someField) { this.someField = someField; } diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java index 0d863f4fee..099140b8aa 100644 --- a/test/transform/resource/after-delombok/DataOnLocalClass.java +++ b/test/transform/resource/after-delombok/DataOnLocalClass.java @@ -5,23 +5,28 @@ class Local { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Local(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local)) return false; @@ -34,11 +39,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -49,6 +56,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Local(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -63,6 +71,7 @@ class InnerLocal { @lombok.NonNull String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public InnerLocal(@lombok.NonNull final String name) { if (name == null) { throw new java.lang.NullPointerException("name is marked non-null but is null"); @@ -71,10 +80,12 @@ public InnerLocal(@lombok.NonNull final String name) { } @lombok.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setName(@lombok.NonNull final String name) { if (name == null) { throw new java.lang.NullPointerException("name is marked non-null but is null"); @@ -83,6 +94,7 @@ public void setName(@lombok.NonNull final String name) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local.InnerLocal)) return false; @@ -94,11 +106,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local.InnerLocal; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -108,20 +122,24 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Local.InnerLocal(name=" + this.getName() + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public Local(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local)) return false; @@ -131,11 +149,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -144,6 +164,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Local(x=" + this.getX() + ")"; } diff --git a/test/transform/resource/after-delombok/DataPlain.java b/test/transform/resource/after-delombok/DataPlain.java index 15b834d9c3..8c130c1dc1 100644 --- a/test/transform/resource/after-delombok/DataPlain.java +++ b/test/transform/resource/after-delombok/DataPlain.java @@ -2,23 +2,28 @@ class Data1 { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Data1(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data1)) return false; @@ -31,11 +36,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data1; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -46,6 +53,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data1(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -54,23 +62,28 @@ class Data2 { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Data2(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data2)) return false; @@ -83,11 +96,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data2; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -98,6 +113,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data2(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -106,23 +122,28 @@ final class Data3 { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Data3(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data3)) return false; @@ -135,6 +156,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -145,6 +167,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data3(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -155,20 +178,24 @@ final class Data4 extends java.util.Timer { super(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data4(x=" + this.getX() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data4)) return false; @@ -179,11 +206,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data4; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = super.hashCode(); @@ -193,10 +222,12 @@ public int hashCode() { } class Data5 { @java.lang.SuppressWarnings("all") + @lombok.Generated public Data5() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data5)) return false; @@ -205,27 +236,32 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data5; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data5()"; } } final class Data6 { @java.lang.SuppressWarnings("all") + @lombok.Generated public Data6() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data6)) return false; @@ -233,12 +269,14 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data6()"; } diff --git a/test/transform/resource/after-delombok/DataWithGetter.java b/test/transform/resource/after-delombok/DataWithGetter.java index b4107bb342..8ad13867e3 100644 --- a/test/transform/resource/after-delombok/DataWithGetter.java +++ b/test/transform/resource/after-delombok/DataWithGetter.java @@ -3,19 +3,23 @@ class DataWithGetter { private int y; private final String z; @java.lang.SuppressWarnings("all") + @lombok.Generated public DataWithGetter(final String z) { this.z = z; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setY(final int y) { this.y = y; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGetter)) return false; @@ -29,11 +33,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGetter; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -45,18 +51,22 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataWithGetter(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getY() { return this.y; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getZ() { return this.z; } diff --git a/test/transform/resource/after-delombok/DataWithGetterNone.java b/test/transform/resource/after-delombok/DataWithGetterNone.java index 4467e40749..48192b21f1 100644 --- a/test/transform/resource/after-delombok/DataWithGetterNone.java +++ b/test/transform/resource/after-delombok/DataWithGetterNone.java @@ -3,19 +3,23 @@ class DataWithGetterNone { private int y; private final String z; @java.lang.SuppressWarnings("all") + @lombok.Generated public DataWithGetterNone(final String z) { this.z = z; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setY(final int y) { this.y = y; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGetterNone)) return false; @@ -29,11 +33,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGetterNone; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -45,6 +51,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataWithGetterNone(x=" + this.x + ", y=" + this.y + ", z=" + this.z + ")"; } diff --git a/test/transform/resource/after-delombok/DataWithOverrideEqualsAndHashCode.java b/test/transform/resource/after-delombok/DataWithOverrideEqualsAndHashCode.java index 7e84dda4be..3fca02d30a 100644 --- a/test/transform/resource/after-delombok/DataWithOverrideEqualsAndHashCode.java +++ b/test/transform/resource/after-delombok/DataWithOverrideEqualsAndHashCode.java @@ -1,23 +1,20 @@ class DataWithOverrideEqualsAndHashCode { - class Data1 { } - class Data2 extends Data1 { public int hashCode() { return 42; } - public boolean equals(Object other) { return false; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public Data2() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataWithOverrideEqualsAndHashCode.Data2()"; } diff --git a/test/transform/resource/after-delombok/DelegateGenerics.java b/test/transform/resource/after-delombok/DelegateGenerics.java index 894776eaa9..107d44f641 100644 --- a/test/transform/resource/after-delombok/DelegateGenerics.java +++ b/test/transform/resource/after-delombok/DelegateGenerics.java @@ -1,32 +1,27 @@ public class DelegateGenerics { I1 target; - @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.Integer t(final java.lang.Integer t) { return this.target.t(t); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String i(final java.lang.String a) { return this.target.i(a); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public T a(final T a) { return this.target.a(a); } } - interface I1 extends I2 { } - interface I2 extends I3 { } - interface I3 { T t(T t); - I i(I a); - A a(A a); -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/DelegateOnGetter.java b/test/transform/resource/after-delombok/DelegateOnGetter.java index 76794085e3..37f82d16e8 100644 --- a/test/transform/resource/after-delombok/DelegateOnGetter.java +++ b/test/transform/resource/after-delombok/DelegateOnGetter.java @@ -5,6 +5,7 @@ private interface Bar { int getInt(); } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public Bar getBar() { java.lang.Object $value = this.bar.get(); if ($value == null) { @@ -26,10 +27,12 @@ public int getInt() { return (Bar) ($value == this.bar ? null : $value); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setList(final java.util.ArrayList list) { this.getBar().setList(list); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getInt() { return this.getBar().getInt(); } diff --git a/test/transform/resource/after-delombok/DelegateOnGetterNone.java b/test/transform/resource/after-delombok/DelegateOnGetterNone.java index 1f6eb5be2b..b1dde5dbe6 100644 --- a/test/transform/resource/after-delombok/DelegateOnGetterNone.java +++ b/test/transform/resource/after-delombok/DelegateOnGetterNone.java @@ -5,10 +5,12 @@ private interface Bar { int getInt(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setList(final java.util.ArrayList list) { this.bar.setList(list); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getInt() { return this.bar.getInt(); } diff --git a/test/transform/resource/after-delombok/DelegateOnMethods.java b/test/transform/resource/after-delombok/DelegateOnMethods.java index eb94c6d25b..9753a3f81e 100644 --- a/test/transform/resource/after-delombok/DelegateOnMethods.java +++ b/test/transform/resource/after-delombok/DelegateOnMethods.java @@ -1,13 +1,10 @@ abstract class DelegateOnMethods { public abstract Bar getBar(); - public static interface Bar { void bar(java.util.ArrayList list); } - @java.lang.SuppressWarnings("all") - - + @lombok.Generated public void bar(final java.util.ArrayList list) { this.getBar().bar(list); } diff --git a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java index 921669c728..e9501392cd 100644 --- a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java +++ b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java @@ -1,38 +1,29 @@ class DelegatePlain { private final BarImpl bar = new BarImpl(); private final FooImpl foo = new FooImpl(); - private static class FooImpl implements Foo { public void foo() { } - public void bar(java.util.ArrayList list) { } } - private static class BarImpl implements Bar { public void bar(java.util.ArrayList list) { } } - private static interface Foo extends Bar { void foo(); } - private static interface Bar { void bar(java.util.ArrayList list); } - @java.lang.SuppressWarnings("all") - - + @lombok.Generated public void bar(final java.util.ArrayList list) { this.bar.bar(list); } - @java.lang.SuppressWarnings("all") - - + @lombok.Generated public void foo() { this.foo.foo(); } diff --git a/test/transform/resource/after-delombok/DelegateWithDeprecated.java b/test/transform/resource/after-delombok/DelegateWithDeprecated.java index f487dc874c..3aa65699ad 100644 --- a/test/transform/resource/after-delombok/DelegateWithDeprecated.java +++ b/test/transform/resource/after-delombok/DelegateWithDeprecated.java @@ -11,15 +11,18 @@ private interface Bar { } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public void deprecatedAnnotation() { this.bar.deprecatedAnnotation(); } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public void deprecatedComment() { this.bar.deprecatedComment(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void notDeprecated() { this.bar.notDeprecated(); } diff --git a/test/transform/resource/after-delombok/DelegateWithVarargs.java b/test/transform/resource/after-delombok/DelegateWithVarargs.java index dadbb4ee3d..923a59b6c6 100644 --- a/test/transform/resource/after-delombok/DelegateWithVarargs.java +++ b/test/transform/resource/after-delombok/DelegateWithVarargs.java @@ -7,18 +7,22 @@ private interface Bar { void arrayVarargs(int[]... arrayVarargs); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void justOneParameter(final int... varargs) { this.bar.justOneParameter(varargs); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void multipleParameters(final java.lang.String first, final int... varargs) { this.bar.multipleParameters(first, varargs); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void array(final int[] array) { this.bar.array(array); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void arrayVarargs(final int[]... arrayVarargs) { this.bar.arrayVarargs(arrayVarargs); } diff --git a/test/transform/resource/after-delombok/DelegateWithVarargs2.java b/test/transform/resource/after-delombok/DelegateWithVarargs2.java index a8ff6e3be5..0ceefc6a1e 100644 --- a/test/transform/resource/after-delombok/DelegateWithVarargs2.java +++ b/test/transform/resource/after-delombok/DelegateWithVarargs2.java @@ -5,8 +5,8 @@ public void varargs(Object[]... keys) { } } @java.lang.SuppressWarnings("all") + @lombok.Generated public void varargs(final java.lang.Object[]... keys) { this.bar.varargs(keys); } } - diff --git a/test/transform/resource/after-delombok/EncodingUsAscii.java b/test/transform/resource/after-delombok/EncodingUsAscii.java index ec35205670..8f42e65c5d 100644 --- a/test/transform/resource/after-delombok/EncodingUsAscii.java +++ b/test/transform/resource/after-delombok/EncodingUsAscii.java @@ -3,6 +3,7 @@ class EncodingUsAscii { String foo\u0e51\u0e51 = "\016\t\b "; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EncodingUsAscii(foo\u0e51\u0e51=" + this.foo\u0e51\u0e51 + ")"; } diff --git a/test/transform/resource/after-delombok/EncodingUtf8.java b/test/transform/resource/after-delombok/EncodingUtf8.java index 1c7751b561..3723b27af5 100644 --- a/test/transform/resource/after-delombok/EncodingUtf8.java +++ b/test/transform/resource/after-delombok/EncodingUtf8.java @@ -2,6 +2,7 @@ class EncodingUtf8 { String foo๑๑ = "\016\t\b "; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EncodingUtf8(foo๑๑=" + this.foo๑๑ + ")"; } diff --git a/test/transform/resource/after-delombok/EqualsAndHashCode.java b/test/transform/resource/after-delombok/EqualsAndHashCode.java index 4eb02ebd6b..a8cbdde20e 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCode.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCode.java @@ -6,6 +6,7 @@ class EqualsAndHashCode { String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode)) return false; @@ -23,11 +24,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -49,6 +52,7 @@ final class EqualsAndHashCode2 { boolean b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode2)) return false; @@ -62,6 +66,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -78,6 +83,7 @@ public int hashCode() { final class EqualsAndHashCode3 extends EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode3)) return false; @@ -86,11 +92,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode3; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -99,6 +107,7 @@ public int hashCode() { class EqualsAndHashCode4 extends EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode4)) return false; @@ -108,11 +117,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode4; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = super.hashCode(); return result; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java b/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java index d99fc71c06..ef9bae67d8 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java @@ -1,6 +1,5 @@ //version 8: import java.lang.annotation.*; - class EqualsAndHashCodeAnnotated { @Annotated int primitive; @@ -16,6 +15,7 @@ class EqualsAndHashCodeAnnotated { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeAnnotated)) return false; @@ -32,11 +32,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeAnnotated; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -49,4 +51,4 @@ public int hashCode() { result = result * PRIME + java.util.Arrays.deepHashCode(this.moreObjectValues); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeAutoExclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeAutoExclude.java index 711b588db9..2af7b60466 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeAutoExclude.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeAutoExclude.java @@ -4,6 +4,7 @@ class EqualsAndHashCodeAutoExclude { transient String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeAutoExclude)) return false; @@ -13,11 +14,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeAutoExclude; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -31,6 +34,7 @@ class EqualsAndHashCodeAutoExclude2 { transient String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeAutoExclude2)) return false; @@ -46,11 +50,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeAutoExclude2; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -61,4 +67,4 @@ public int hashCode() { result = result * PRIME + ($b == null ? 43 : $b.hashCode()); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeCache.java b/test/transform/resource/after-delombok/EqualsAndHashCodeCache.java index 4f3574b641..52f422324f 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeCache.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeCache.java @@ -1,5 +1,6 @@ class EqualsAndHashCode { @java.lang.SuppressWarnings("all") + @lombok.Generated private transient int $hashCodeCache; int x; boolean[] y; @@ -8,6 +9,7 @@ class EqualsAndHashCode { String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode)) return false; @@ -25,11 +27,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { if (this.$hashCodeCache != 0) return this.$hashCodeCache; final int PRIME = 59; @@ -48,6 +52,7 @@ public int hashCode() { } final class EqualsAndHashCode2 { @java.lang.SuppressWarnings("all") + @lombok.Generated private transient int $hashCodeCache; int x; long y; @@ -56,6 +61,7 @@ final class EqualsAndHashCode2 { boolean b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode2)) return false; @@ -69,6 +75,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { if (this.$hashCodeCache != 0) return this.$hashCodeCache; final int PRIME = 59; @@ -87,9 +94,11 @@ public int hashCode() { } final class EqualsAndHashCode3 extends EqualsAndHashCode { @java.lang.SuppressWarnings("all") + @lombok.Generated private transient int $hashCodeCache; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode3)) return false; @@ -98,11 +107,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode3; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { if (this.$hashCodeCache != 0) return this.$hashCodeCache; int result = 1; @@ -113,9 +124,11 @@ public int hashCode() { } class EqualsAndHashCode4 extends EqualsAndHashCode { @java.lang.SuppressWarnings("all") + @lombok.Generated private transient int $hashCodeCache; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode4)) return false; @@ -125,11 +138,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode4; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { if (this.$hashCodeCache != 0) return this.$hashCodeCache; int result = super.hashCode(); @@ -140,9 +155,11 @@ public int hashCode() { } final class EqualsAndHashCode5 extends EqualsAndHashCode { @java.lang.SuppressWarnings("all") + @lombok.Generated private transient int $hashCodeCache; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode5)) return false; @@ -152,11 +169,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode5; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { if (this.$hashCodeCache != 0) return this.$hashCodeCache; int result = super.hashCode(); diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java index 80a26cee9c..6bfe682a53 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java @@ -1,6 +1,7 @@ class EqualsAndHashCodeConfigKeys1Parent { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys1Parent)) return false; @@ -9,11 +10,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys1Parent; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -23,6 +26,7 @@ class EqualsAndHashCodeConfigKeys1 extends EqualsAndHashCodeConfigKeys1Parent { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys1)) return false; @@ -32,11 +36,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys1; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java index 2ff5e38840..9bf4c873f7 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java @@ -1,6 +1,7 @@ class EqualsAndHashCodeConfigKeys2Object extends Object { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys2Object)) return false; @@ -9,11 +10,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys2Object; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -22,6 +25,7 @@ public int hashCode() { class EqualsAndHashCodeConfigKeys2Parent { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys2Parent)) return false; @@ -30,11 +34,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys2Parent; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -44,6 +50,7 @@ class EqualsAndHashCodeConfigKeys2 extends EqualsAndHashCodeConfigKeys2Parent { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys2)) return false; @@ -54,11 +61,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys2; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = super.hashCode(); diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeEmpty.java b/test/transform/resource/after-delombok/EqualsAndHashCodeEmpty.java index ce3bfcb5f1..a64796eb9d 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeEmpty.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeEmpty.java @@ -1,6 +1,7 @@ class EqualsAndHashCodeEmpty { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeEmpty)) return false; @@ -9,11 +10,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeEmpty; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -22,6 +25,7 @@ public int hashCode() { class EqualsAndHashCodeEmptyWithSuper extends EqualsAndHashCodeEmpty { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeEmptyWithSuper)) return false; @@ -31,11 +35,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeEmptyWithSuper; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = super.hashCode(); return result; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java index 2d64e2fdf3..e5ade16dde 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java @@ -2,6 +2,7 @@ class EqualsAndHashCodeExplicitInclude { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeExplicitInclude)) return false; @@ -10,13 +11,15 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeExplicitInclude; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java b/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java index 6f0b573850..123ffdadff 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java @@ -1,11 +1,10 @@ public class EqualsAndHashCodeInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Inner)) return false; @@ -16,14 +15,14 @@ public boolean equals(final java.lang.Object o) { if (this$string == null ? other$string != null : !this$string.equals(other$string)) return false; return true; } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Inner; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java b/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java index 8ed883eb8f..4485359407 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java @@ -5,6 +5,7 @@ class Bar { public static class Foo extends Bar implements EqualsAndHashCodeNestedShadow.Foo { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeNestedShadow.Bar.Foo)) return false; @@ -13,11 +14,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeNestedShadow.Bar.Foo; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -28,6 +31,7 @@ class Baz { public static class Foo extends Bar implements EqualsAndHashCodeNestedShadow.Foo { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeNestedShadow.Baz.Foo)) return false; @@ -36,11 +40,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeNestedShadow.Baz.Foo; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java b/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java index 59c7b80699..6f80f99919 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java @@ -13,6 +13,7 @@ long i() { int j; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeNewStyle)) return false; @@ -26,11 +27,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeNewStyle; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java index 895da4dbe0..32ffad3c48 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java @@ -3,6 +3,7 @@ final class EqualsAndHashCodeOf { int y; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeOf)) return false; @@ -12,6 +13,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -24,6 +26,7 @@ final class EqualsAndHashCodeExclude { int y; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeExclude)) return false; @@ -33,6 +36,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java b/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java index fcf371b624..7fb05b2502 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java @@ -4,6 +4,7 @@ public class EqualsAndHashCodeRank { int c; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeRank)) return false; @@ -15,11 +16,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeRank; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -28,4 +31,4 @@ public int hashCode() { result = result * PRIME + this.b; return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java index dcad026391..79572f9e18 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java @@ -17,6 +17,7 @@ private boolean canEqual(Object other) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithExistingMethods3)) return false; @@ -28,6 +29,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = super.hashCode(); diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java index 9eb3cdb367..307e873390 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java @@ -4,6 +4,7 @@ class Inner { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithGenericsOnInners.Inner)) return false; @@ -13,11 +14,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithGenericsOnInners.Inner; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -26,4 +29,3 @@ public int hashCode() { } } } - diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java index ed25b3175f..65290fb122 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java @@ -3,6 +3,7 @@ class Inner { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner)) return false; @@ -12,11 +13,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java index 37711004e9..6cae1f4da8 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java @@ -3,6 +3,7 @@ class EqualsAndHashCodeWithNonNullByDefault { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(@javax.annotation.Nullable final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithNonNullByDefault)) return false; @@ -11,11 +12,13 @@ public boolean equals(@javax.annotation.Nullable final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(@javax.annotation.Nullable final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithNonNullByDefault; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java index 91c62b0f8b..1b8ded76cd 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java @@ -1,6 +1,5 @@ @interface Nullable { } - class EqualsAndHashCodeWithOnParam { int x; boolean[] y; @@ -9,6 +8,7 @@ class EqualsAndHashCodeWithOnParam { String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(@Nullable final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithOnParam)) return false; @@ -26,11 +26,13 @@ public boolean equals(@Nullable final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(@Nullable final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithOnParam; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java index b3a1fb0dd0..b20ca22cfb 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java @@ -6,11 +6,12 @@ public int hashCode() { return 42; } @java.lang.SuppressWarnings("all") + @lombok.Generated public EqualsAndHashCodeWithSomeExistingMethods() { - } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EqualsAndHashCodeWithSomeExistingMethods(x=" + this.x + ")"; } @@ -21,10 +22,12 @@ protected boolean canEqual(Object other) { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public EqualsAndHashCodeWithSomeExistingMethods2() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithSomeExistingMethods2)) return false; @@ -35,6 +38,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -43,6 +47,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EqualsAndHashCodeWithSomeExistingMethods2(x=" + this.x + ")"; } @@ -56,10 +61,12 @@ public boolean equals(Object other) { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public EqualsAndHashCodeWithAllExistingMethods() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EqualsAndHashCodeWithAllExistingMethods(x=" + this.x + ")"; } @@ -67,11 +74,12 @@ public java.lang.String toString() { class EqualsAndHashCodeWithNoExistingMethods { int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public EqualsAndHashCodeWithNoExistingMethods() { - } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithNoExistingMethods)) return false; @@ -81,11 +89,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithNoExistingMethods; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -94,6 +104,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EqualsAndHashCodeWithNoExistingMethods(x=" + this.x + ")"; } diff --git a/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java b/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java index 959bb1e077..0735cbf340 100644 --- a/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java +++ b/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java @@ -1,6 +1,7 @@ class FieldDefaultsViaConfigAndRequiredArgsConstructor { final int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { this.x = x; } diff --git a/test/transform/resource/after-delombok/FieldNameConstantsBasic.java b/test/transform/resource/after-delombok/FieldNameConstantsBasic.java index 0504327ab6..8f8920c542 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsBasic.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsBasic.java @@ -5,6 +5,7 @@ public class FieldNameConstantsBasic { int andMe; String butPrintMePlease; @java.lang.SuppressWarnings("all") + @lombok.Generated static final class Fields { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; public static final java.lang.String butPrintMePlease = "butPrintMePlease"; diff --git a/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java b/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java index 4c2a53e33e..286049e90d 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java @@ -1,7 +1,8 @@ public class FieldNameConstantsConfigKeys { String iAmADvdPlayer; @java.lang.SuppressWarnings("all") + @lombok.Generated public static final class Foobar { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/FieldNameConstantsEnum.java b/test/transform/resource/after-delombok/FieldNameConstantsEnum.java index c3fbf0c2c4..816ae13541 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsEnum.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsEnum.java @@ -4,6 +4,7 @@ public class FieldNameConstantsEnum { static double alsoDontSkipMe; int butSkipMe; @java.lang.SuppressWarnings("all") + @lombok.Generated public enum TypeTest { iAmADvdPlayer, $dontSkipMe, alsoDontSkipMe; } diff --git a/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java b/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java index ffaab75e42..21cd2a936f 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java @@ -2,6 +2,7 @@ public record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, int andMe, String butPrintMePlease) { static double skipMeToo; @java.lang.SuppressWarnings("all") + @lombok.Generated static final class Fields { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; public static final java.lang.String butPrintMePlease = "butPrintMePlease"; diff --git a/test/transform/resource/after-delombok/FieldNameConstantsUppercased.java b/test/transform/resource/after-delombok/FieldNameConstantsUppercased.java index dd7de86ade..6357178940 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsUppercased.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsUppercased.java @@ -5,6 +5,7 @@ public class FieldNameConstantsUppercased { int andMe; String butPrintMePlease; @java.lang.SuppressWarnings("all") + @lombok.Generated static final class Fields { public static final java.lang.String I_AM_A_DVD_PLAYER = "iAmADvdPlayer"; public static final java.lang.String BUT_PRINT_ME_PLEASE = "butPrintMePlease"; diff --git a/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java b/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java index e78ee55c22..f7829907d8 100644 --- a/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java +++ b/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java @@ -3,6 +3,7 @@ class GenerateSuppressFBWarnings { int y; @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") + @lombok.Generated public int getY() { return this.y; } diff --git a/test/transform/resource/after-delombok/GeneratedJavaxJakarta.java b/test/transform/resource/after-delombok/GeneratedJavaxJakarta.java index 42f7c2b6de..1be644937c 100644 --- a/test/transform/resource/after-delombok/GeneratedJavaxJakarta.java +++ b/test/transform/resource/after-delombok/GeneratedJavaxJakarta.java @@ -1,9 +1,9 @@ class GeneratedJavaxJakarta { int x; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @jakarta.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/GeneratedOff.java b/test/transform/resource/after-delombok/GeneratedOff.java index 0e4ecf7d0c..a8e561a4ad 100644 --- a/test/transform/resource/after-delombok/GeneratedOff.java +++ b/test/transform/resource/after-delombok/GeneratedOff.java @@ -1,6 +1,7 @@ class GeneratedOff { int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/GeneratedOffJavaxOn.java b/test/transform/resource/after-delombok/GeneratedOffJavaxOn.java index 05c2be090e..928b80f402 100644 --- a/test/transform/resource/after-delombok/GeneratedOffJavaxOn.java +++ b/test/transform/resource/after-delombok/GeneratedOffJavaxOn.java @@ -2,6 +2,7 @@ class GeneratedOffJavaxOn { int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/GeneratedOn.java b/test/transform/resource/after-delombok/GeneratedOn.java index f4976c7aab..3da8a77fd7 100644 --- a/test/transform/resource/after-delombok/GeneratedOn.java +++ b/test/transform/resource/after-delombok/GeneratedOn.java @@ -1,8 +1,8 @@ class GeneratedOn { int x; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/GetterAccessLevel.java b/test/transform/resource/after-delombok/GetterAccessLevel.java index 2574340aaf..9693126713 100644 --- a/test/transform/resource/after-delombok/GetterAccessLevel.java +++ b/test/transform/resource/after-delombok/GetterAccessLevel.java @@ -11,38 +11,47 @@ class GetterAccessLevel { String publicString; String value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean isPrivate() { return this.isPrivate; } @java.lang.SuppressWarnings("all") + @lombok.Generated boolean isPackage() { return this.isPackage; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean isProtected() { return this.isProtected; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @java.lang.SuppressWarnings("all") + @lombok.Generated private String getPrivateString() { return this.privateString; } @java.lang.SuppressWarnings("all") + @lombok.Generated String getPackageString() { return this.packageString; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected String getProtectedString() { return this.protectedString; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getPublicString() { return this.publicString; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getValue() { return this.value; } diff --git a/test/transform/resource/after-delombok/GetterAlreadyExists.java b/test/transform/resource/after-delombok/GetterAlreadyExists.java index d7f32ff198..289fe3492c 100644 --- a/test/transform/resource/after-delombok/GetterAlreadyExists.java +++ b/test/transform/resource/after-delombok/GetterAlreadyExists.java @@ -4,6 +4,7 @@ boolean hasFoo() { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isFoo() { return this.foo; } @@ -26,6 +27,7 @@ String hasFoo() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -36,6 +38,7 @@ String isFoo() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -52,6 +55,7 @@ boolean hasFoo() { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -62,6 +66,7 @@ boolean isFoo() { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -78,6 +83,7 @@ static boolean hasFoo() { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isFoo() { return this.foo; } @@ -100,6 +106,7 @@ static boolean hasFoo() { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -110,6 +117,7 @@ static boolean isFoo() { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -126,6 +134,7 @@ static String hasFoo() { return ""; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -136,6 +145,7 @@ static String isFoo() { return ""; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterBoolean.java b/test/transform/resource/after-delombok/GetterBoolean.java index 6ac9151257..fb6143c237 100644 --- a/test/transform/resource/after-delombok/GetterBoolean.java +++ b/test/transform/resource/after-delombok/GetterBoolean.java @@ -3,14 +3,17 @@ class Getter { boolean isBar; boolean hasBaz; @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isFoo() { return this.foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isBar() { return this.isBar; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isHasBaz() { return this.hasBaz; } @@ -21,6 +24,7 @@ boolean hasFoo() { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterDeprecated.java b/test/transform/resource/after-delombok/GetterDeprecated.java index af123509c1..78e83ff399 100644 --- a/test/transform/resource/after-delombok/GetterDeprecated.java +++ b/test/transform/resource/after-delombok/GetterDeprecated.java @@ -7,6 +7,7 @@ class GetterDeprecated { int javadoc; @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getAnnotation() { return this.annotation; } @@ -15,6 +16,7 @@ public int getAnnotation() { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getJavadoc() { return this.javadoc; } diff --git a/test/transform/resource/after-delombok/GetterEnum.java b/test/transform/resource/after-delombok/GetterEnum.java index 272a2ee69c..149d38948b 100644 --- a/test/transform/resource/after-delombok/GetterEnum.java +++ b/test/transform/resource/after-delombok/GetterEnum.java @@ -3,15 +3,18 @@ enum GetterEnum { private final int id; private final String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private GetterEnum(final int id, final String name) { this.id = id; this.name = name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getId() { return this.id; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } diff --git a/test/transform/resource/after-delombok/GetterInAnonymousClass.java b/test/transform/resource/after-delombok/GetterInAnonymousClass.java index 3c99054532..6a84f672f7 100644 --- a/test/transform/resource/after-delombok/GetterInAnonymousClass.java +++ b/test/transform/resource/after-delombok/GetterInAnonymousClass.java @@ -1,10 +1,9 @@ public class GetterInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public String getString() { return this.string; } diff --git a/test/transform/resource/after-delombok/GetterLazy.java b/test/transform/resource/after-delombok/GetterLazy.java index 8e1300be1b..01bd42e247 100644 --- a/test/transform/resource/after-delombok/GetterLazy.java +++ b/test/transform/resource/after-delombok/GetterLazy.java @@ -3,6 +3,7 @@ static class ValueType { } private final java.util.concurrent.atomic.AtomicReference fieldName = new java.util.concurrent.atomic.AtomicReference(); @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public ValueType getFieldName() { java.lang.Object $value = this.fieldName.get(); if ($value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyArguments.java b/test/transform/resource/after-delombok/GetterLazyArguments.java index 00b17f5c80..7b5980cd50 100644 --- a/test/transform/resource/after-delombok/GetterLazyArguments.java +++ b/test/transform/resource/after-delombok/GetterLazyArguments.java @@ -3,23 +3,20 @@ class GetterLazyArguments { static String fun() { return null; } - static String stringInt(String arg1, Integer arg2) { return null; } - static String stringRunnable(String arg1, Runnable arg2) { return null; } - private final java.util.concurrent.atomic.AtomicReference field1 = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference field2 = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference field3 = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference field4 = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference field5 = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference field6 = new java.util.concurrent.atomic.AtomicReference(); - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField1() { java.lang.Object $value = this.field1.get(); if ($value == null) { @@ -34,8 +31,8 @@ public String getField1() { } return (String) ($value == this.field1 ? null : $value); } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField2() { java.lang.Object $value = this.field2.get(); if ($value == null) { @@ -50,8 +47,8 @@ public String getField2() { } return (String) ($value == this.field2 ? null : $value); } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField3() { java.lang.Object $value = this.field3.get(); if ($value == null) { @@ -66,8 +63,8 @@ public String getField3() { } return (String) ($value == this.field3 ? null : $value); } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField4() { java.lang.Object $value = this.field4.get(); if ($value == null) { @@ -83,8 +80,8 @@ public String getField4() { } return (String) ($value == this.field4 ? null : $value); } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField5() { java.lang.Object $value = this.field5.get(); if ($value == null) { @@ -100,8 +97,8 @@ public String getField5() { } return (String) ($value == this.field5 ? null : $value); } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField6() { java.lang.Object $value = this.field6.get(); if ($value == null) { @@ -116,4 +113,4 @@ public String getField6() { } return (String) ($value == this.field6 ? null : $value); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/GetterLazyBoolean.java b/test/transform/resource/after-delombok/GetterLazyBoolean.java index 495e6b9254..ea45627ab4 100644 --- a/test/transform/resource/after-delombok/GetterLazyBoolean.java +++ b/test/transform/resource/after-delombok/GetterLazyBoolean.java @@ -6,6 +6,7 @@ private static boolean calculateBoolean() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterLazyBoolean)) return false; @@ -15,11 +16,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterLazyBoolean; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -28,10 +31,12 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "GetterLazyBoolean(booleanValue=" + this.isBooleanValue() + ")"; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public boolean isBooleanValue() { java.lang.Object $value = this.booleanValue.get(); if ($value == null) { @@ -47,6 +52,7 @@ public boolean isBooleanValue() { return (java.lang.Boolean) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public boolean isOtherBooleanValue() { java.lang.Object $value = this.otherBooleanValue.get(); if ($value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyEahcToString.java b/test/transform/resource/after-delombok/GetterLazyEahcToString.java index 3742093ba4..4da740641e 100644 --- a/test/transform/resource/after-delombok/GetterLazyEahcToString.java +++ b/test/transform/resource/after-delombok/GetterLazyEahcToString.java @@ -1,10 +1,9 @@ class GetterLazyEahcToString { - private final java.util.concurrent.atomic.AtomicReference value = new java.util.concurrent.atomic.AtomicReference(); private final String value2 = ""; - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterLazyEahcToString)) return false; @@ -18,16 +17,14 @@ public boolean equals(final java.lang.Object o) { if (this$value2 == null ? other$value2 != null : !this$value2.equals(other$value2)) return false; return true; } - @java.lang.SuppressWarnings("all") - - + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterLazyEahcToString; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -37,14 +34,14 @@ public int hashCode() { result = result * PRIME + ($value2 == null ? 43 : $value2.hashCode()); return result; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "GetterLazyEahcToString(value=" + this.getValue() + ", value2=" + this.value2 + ")"; } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getValue() { java.lang.Object $value = this.value.get(); if ($value == null) { @@ -59,8 +56,8 @@ public String getValue() { } return (String) ($value == this.value ? null : $value); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public String getValue2() { return this.value2; } diff --git a/test/transform/resource/after-delombok/GetterLazyErrorPosition.java b/test/transform/resource/after-delombok/GetterLazyErrorPosition.java index c901387690..9a8c79ac7e 100644 --- a/test/transform/resource/after-delombok/GetterLazyErrorPosition.java +++ b/test/transform/resource/after-delombok/GetterLazyErrorPosition.java @@ -1,7 +1,7 @@ class GetterLazyErrorPosition { private final java.util.concurrent.atomic.AtomicReference field = new java.util.concurrent.atomic.AtomicReference(); - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField() { java.lang.Object $value = this.field.get(); if ($value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyGenerics.java b/test/transform/resource/after-delombok/GetterLazyGenerics.java index a8b8ff6c34..bcfc47af98 100644 --- a/test/transform/resource/after-delombok/GetterLazyGenerics.java +++ b/test/transform/resource/after-delombok/GetterLazyGenerics.java @@ -5,6 +5,7 @@ public static E getAny() { return null; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public E getField() { java.lang.Object $value = this.field.get(); if ($value == null) { @@ -20,6 +21,7 @@ public E getField() { return (E) ($value == this.field ? null : $value); } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public long getField2() { java.lang.Object $value = this.field2.get(); if ($value == null) { @@ -34,4 +36,4 @@ public long getField2() { } return (java.lang.Long) $value; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java b/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java index 199437a11d..e1c99bb33e 100644 --- a/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java +++ b/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java @@ -1,10 +1,9 @@ public class GetterLazyInAnonymousClass { Object annonymous = new Object() { - class Inner { private final java.util.concurrent.atomic.AtomicReference string = new java.util.concurrent.atomic.AtomicReference(); - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getString() { java.lang.Object $value = this.string.get(); if ($value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyInvalid.java b/test/transform/resource/after-delombok/GetterLazyInvalid.java index 81d87c3c15..6151812f45 100644 --- a/test/transform/resource/after-delombok/GetterLazyInvalid.java +++ b/test/transform/resource/after-delombok/GetterLazyInvalid.java @@ -13,6 +13,7 @@ class GetterLazyInvalidNone { class GetterLazyInvalidClass { private final String fieldName = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFieldName() { return this.fieldName; } diff --git a/test/transform/resource/after-delombok/GetterLazyNative.java b/test/transform/resource/after-delombok/GetterLazyNative.java index a71a0354bc..3c6a6ea53b 100644 --- a/test/transform/resource/after-delombok/GetterLazyNative.java +++ b/test/transform/resource/after-delombok/GetterLazyNative.java @@ -9,6 +9,7 @@ class GetterLazyNative { private final java.util.concurrent.atomic.AtomicReference charField = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference intArrayField = new java.util.concurrent.atomic.AtomicReference(); @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public boolean isBooleanField() { java.lang.Object $value = this.booleanField.get(); if ($value == null) { @@ -24,6 +25,7 @@ public boolean isBooleanField() { return (java.lang.Boolean) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public byte getByteField() { java.lang.Object $value = this.byteField.get(); if ($value == null) { @@ -39,6 +41,7 @@ public byte getByteField() { return (java.lang.Byte) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public short getShortField() { java.lang.Object $value = this.shortField.get(); if ($value == null) { @@ -54,6 +57,7 @@ public short getShortField() { return (java.lang.Short) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public int getIntField() { java.lang.Object $value = this.intField.get(); if ($value == null) { @@ -69,6 +73,7 @@ public int getIntField() { return (java.lang.Integer) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public long getLongField() { java.lang.Object $value = this.longField.get(); if ($value == null) { @@ -84,6 +89,7 @@ public long getLongField() { return (java.lang.Long) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public float getFloatField() { java.lang.Object $value = this.floatField.get(); if ($value == null) { @@ -99,6 +105,7 @@ public float getFloatField() { return (java.lang.Float) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public double getDoubleField() { java.lang.Object $value = this.doubleField.get(); if ($value == null) { @@ -114,6 +121,7 @@ public double getDoubleField() { return (java.lang.Double) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public char getCharField() { java.lang.Object $value = this.charField.get(); if ($value == null) { @@ -129,6 +137,7 @@ public char getCharField() { return (java.lang.Character) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public int[] getIntArrayField() { java.lang.Object $value = this.intArrayField.get(); if ($value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyTransient.java b/test/transform/resource/after-delombok/GetterLazyTransient.java index 3d1a2be302..cc36246da5 100644 --- a/test/transform/resource/after-delombok/GetterLazyTransient.java +++ b/test/transform/resource/after-delombok/GetterLazyTransient.java @@ -3,6 +3,7 @@ class GetterLazyTransient { private final transient int transientField = 2; private final transient int nonLazyTransientField = 3; @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public int getNonTransientField() { java.lang.Object $value = this.nonTransientField.get(); if ($value == null) { @@ -18,6 +19,7 @@ public int getNonTransientField() { return (java.lang.Integer) $value; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getNonLazyTransientField() { return this.nonLazyTransientField; } diff --git a/test/transform/resource/after-delombok/GetterNone.java b/test/transform/resource/after-delombok/GetterNone.java index 5666f6fe23..6097e5d18b 100644 --- a/test/transform/resource/after-delombok/GetterNone.java +++ b/test/transform/resource/after-delombok/GetterNone.java @@ -2,6 +2,7 @@ class GetterNone { int i; int foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/GetterOnClass.java b/test/transform/resource/after-delombok/GetterOnClass.java index ae845e5462..c316411f5b 100644 --- a/test/transform/resource/after-delombok/GetterOnClass.java +++ b/test/transform/resource/after-delombok/GetterOnClass.java @@ -3,6 +3,7 @@ class GetterOnClass1 { boolean isNone; boolean isPublic; @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @@ -12,10 +13,12 @@ class GetterOnClass2 { boolean isProtected; boolean isPackage; @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean isProtected() { return this.isProtected; } @java.lang.SuppressWarnings("all") + @lombok.Generated boolean isPackage() { return this.isPackage; } @@ -24,6 +27,7 @@ class GetterOnClass3 { boolean isNone; boolean isPackage; @java.lang.SuppressWarnings("all") + @lombok.Generated boolean isPackage() { return this.isPackage; } @@ -32,6 +36,7 @@ class GetterOnClass4 { boolean isNone; boolean isPrivate; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean isPrivate() { return this.isPrivate; } @@ -40,6 +45,7 @@ class GetterOnClass5 { boolean isNone; boolean isPublic; @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @@ -49,11 +55,13 @@ class GetterOnClass6 { @lombok.NonNull String nonNull; @java.lang.SuppressWarnings("all") + @lombok.Generated public String getCouldBeNull() { return this.couldBeNull; } @lombok.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public String getNonNull() { return this.nonNull; } diff --git a/test/transform/resource/after-delombok/GetterOnMethod.java b/test/transform/resource/after-delombok/GetterOnMethod.java index 4a5b36225c..c3ec0b5d59 100644 --- a/test/transform/resource/after-delombok/GetterOnMethod.java +++ b/test/transform/resource/after-delombok/GetterOnMethod.java @@ -6,18 +6,21 @@ class GetterOnMethod { } @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") + @lombok.Generated public int getJ() { return this.j; } @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") + @lombok.Generated public int getK() { return this.k; } diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java index 639022d0c4..3857740bf7 100644 --- a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java +++ b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java @@ -10,38 +10,46 @@ class GetterOnMethodErrors2 { public @interface Test { } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getBad1() { return this.bad1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getBad2() { return this.bad2; } @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getBad3() { return this.bad3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getBad4() { return this.bad4; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGood1() { return this.good1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGood2() { return this.good2; } @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGood3() { return this.good3; } @Deprecated @Test @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGood4() { return this.good4; } diff --git a/test/transform/resource/after-delombok/GetterOnMethodOnType.java b/test/transform/resource/after-delombok/GetterOnMethodOnType.java index 625909c106..f622df40c6 100644 --- a/test/transform/resource/after-delombok/GetterOnMethodOnType.java +++ b/test/transform/resource/after-delombok/GetterOnMethodOnType.java @@ -3,11 +3,13 @@ class GetterOnMethodOnType { private String name; @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getTest() { return this.test; } @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } diff --git a/test/transform/resource/after-delombok/GetterOnStatic.java b/test/transform/resource/after-delombok/GetterOnStatic.java index 99e63e052d..2b9ce921d6 100644 --- a/test/transform/resource/after-delombok/GetterOnStatic.java +++ b/test/transform/resource/after-delombok/GetterOnStatic.java @@ -2,10 +2,12 @@ class Getter { static boolean foo; static int bar; @java.lang.SuppressWarnings("all") + @lombok.Generated public static boolean isFoo() { return Getter.foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static int getBar() { return Getter.bar; } diff --git a/test/transform/resource/after-delombok/GetterPlain.java b/test/transform/resource/after-delombok/GetterPlain.java index ceae2aac14..eea46d45a7 100644 --- a/test/transform/resource/after-delombok/GetterPlain.java +++ b/test/transform/resource/after-delombok/GetterPlain.java @@ -2,10 +2,12 @@ class GetterPlain { int i; int foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterSetterJavadoc.java b/test/transform/resource/after-delombok/GetterSetterJavadoc.java index 78d120a449..76afbd2d66 100644 --- a/test/transform/resource/after-delombok/GetterSetterJavadoc.java +++ b/test/transform/resource/after-delombok/GetterSetterJavadoc.java @@ -4,6 +4,7 @@ class GetterSetterJavadoc1 { */ private int fieldName; @java.lang.SuppressWarnings("all") + @lombok.Generated public GetterSetterJavadoc1() { } /** @@ -12,6 +13,7 @@ public GetterSetterJavadoc1() { * @return Sky is blue1 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -21,11 +23,13 @@ public int getFieldName() { * @param fieldName Hello, World1 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterSetterJavadoc1)) return false; @@ -35,11 +39,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterSetterJavadoc1; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -48,6 +54,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "GetterSetterJavadoc1(fieldName=" + this.getFieldName() + ")"; } @@ -63,6 +70,7 @@ class GetterSetterJavadoc2 { * @return Sky is blue2 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -72,6 +80,7 @@ public int getFieldName() { * @param fieldName Hello, World2 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @@ -86,6 +95,7 @@ class GetterSetterJavadoc3 { * @return Sky is blue3 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -94,6 +104,7 @@ public int getFieldName() { * @param fieldName Hello, World3 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @@ -105,20 +116,22 @@ class GetterSetterJavadoc4 { private int fieldName; /** * Some text - * + * * @return Sky is blue4 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int fieldName() { return this.fieldName; } /** * Some text - * + * * @param fieldName Hello, World4 * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public GetterSetterJavadoc4 fieldName(final int fieldName) { this.fieldName = fieldName; return this; @@ -134,6 +147,7 @@ class GetterSetterJavadoc5 { * @return Sky is blue5 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int fieldName() { return this.fieldName; } @@ -143,6 +157,7 @@ public int fieldName() { * @return Sky is blue5 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public GetterSetterJavadoc5 fieldName(final int fieldName) { this.fieldName = fieldName; return this; diff --git a/test/transform/resource/after-delombok/GetterTypeAnnos.java b/test/transform/resource/after-delombok/GetterTypeAnnos.java index 4a22c822ad..02756ab278 100644 --- a/test/transform/resource/after-delombok/GetterTypeAnnos.java +++ b/test/transform/resource/after-delombok/GetterTypeAnnos.java @@ -13,6 +13,7 @@ class GetterTypeAnnos { List foo; @TA @java.lang.SuppressWarnings("all") + @lombok.Generated public List getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterWithDollar.java b/test/transform/resource/after-delombok/GetterWithDollar.java index 5643566548..117539eb70 100644 --- a/test/transform/resource/after-delombok/GetterWithDollar.java +++ b/test/transform/resource/after-delombok/GetterWithDollar.java @@ -1,6 +1,7 @@ class GetterWithDollar1 { int $i; @java.lang.SuppressWarnings("all") + @lombok.Generated public int get$i() { return this.$i; } @@ -9,10 +10,12 @@ class GetterWithDollar2 { int $i; int i; @java.lang.SuppressWarnings("all") + @lombok.Generated public int get$i() { return this.$i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java index 51ccfe630e..99d896289e 100644 --- a/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java @@ -2,11 +2,13 @@ class GetterWithJavaBeansSpecCapitalization { int a; int aField; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getA() { return this.a; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getaField() { return this.aField; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java b/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java index 6cf390edf7..47aa0f9436 100644 --- a/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java +++ b/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java @@ -18,18 +18,23 @@ public void setTheLong(Long theLong) { this.theLong = theLong; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class I2335_BuilderMultipleObtainViaBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String theString; @java.lang.SuppressWarnings("all") + @lombok.Generated private Long theLong; @java.lang.SuppressWarnings("all") + @lombok.Generated I2335_BuilderMultipleObtainViaBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theString(final String theString) { this.theString = theString; return this; @@ -38,25 +43,30 @@ public I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theS * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theLong(final Long theLong) { this.theLong = theLong; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public I2335_BuilderMultipleObtainVia build() { return new I2335_BuilderMultipleObtainVia(this.theString, this.theLong); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder(theString=" + this.theString + ", theLong=" + this.theLong + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder builder() { return new I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder toBuilder() { final String theString = this.getTheString(); final Long theLong = this.getTheLong(); diff --git a/test/transform/resource/after-delombok/InjectField.java b/test/transform/resource/after-delombok/InjectField.java index 98f9762b0c..fa395f8196 100644 --- a/test/transform/resource/after-delombok/InjectField.java +++ b/test/transform/resource/after-delombok/InjectField.java @@ -1,61 +1,52 @@ import java.util.logging.Level; - enum InjectField1 { A, B; - @java.lang.SuppressWarnings("all") - - + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName()); @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.lang.Object $LOCK = new java.lang.Object[0]; - private static final String LOG_MESSAGE = "static initializer"; - private String fieldA; - static { log.log(Level.FINE, LOG_MESSAGE); } - private String fieldB; - void generateLockField() { synchronized (this.$lock) { System.out.println("lock field"); } } - static void generateStaticLockField() { synchronized (InjectField1.$LOCK) { System.out.println("static lock field"); } } } - class InjectField2 { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName()); @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; - private static final String LOG_MESSAGE = "static initializer"; - static { log.log(Level.FINE, LOG_MESSAGE); } - void generateLockField() { synchronized (this.$lock) { System.out.println("lock field"); } } } - class InjectField3 { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName()); static { log.log(Level.FINE, "static initializer"); diff --git a/test/transform/resource/after-delombok/InnerClass.java b/test/transform/resource/after-delombok/InnerClass.java index 2e49b9ad80..1e457a5f81 100644 --- a/test/transform/resource/after-delombok/InnerClass.java +++ b/test/transform/resource/after-delombok/InnerClass.java @@ -3,6 +3,7 @@ class A { class B { String s; @java.lang.SuppressWarnings("all") + @lombok.Generated public B(final String s) { this.s = s; } @@ -16,15 +17,18 @@ A.B test(String s) { }; } @java.lang.SuppressWarnings("all") + @lombok.Generated public D(final A a) { this.a = a; } @java.lang.SuppressWarnings("all") + @lombok.Generated public A getA() { return this.a; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof C.D)) return false; @@ -36,6 +40,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -45,6 +50,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "C.D(a=" + this.getA() + ")"; } diff --git a/test/transform/resource/after-delombok/JacksonBuilderSingular.java b/test/transform/resource/after-delombok/JacksonBuilderSingular.java index b2bbfa5ae6..0426b01427 100644 --- a/test/transform/resource/after-delombok/JacksonBuilderSingular.java +++ b/test/transform/resource/after-delombok/JacksonBuilderSingular.java @@ -16,6 +16,7 @@ public class JacksonBuilderSingular { @JsonProperty("guava_v_a_l_u_e_s") private ImmutableList guavaValues; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonBuilderSingular(final Map any, final List values, final ImmutableMap guavaAny, final ImmutableList guavaValues) { this.any = any; this.values = values; @@ -23,23 +24,31 @@ public class JacksonBuilderSingular { this.guavaValues = guavaValues; } @java.lang.SuppressWarnings("all") + @lombok.Generated @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "", buildMethodName = "build") public static class JacksonBuilderSingularBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList any$key; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList any$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList values; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableMap.Builder guavaAny; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder guavaValues; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonBuilderSingularBuilder() { } @JsonAnySetter @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final String anyKey, final Object anyValue) { if (this.any$key == null) { this.any$key = new java.util.ArrayList(); @@ -50,6 +59,7 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final String any return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final java.util.Map any) { if (any == null) { throw new java.lang.NullPointerException("any cannot be null"); @@ -65,6 +75,7 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final java.util. return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder clearAny() { if (this.any$key != null) { this.any$key.clear(); @@ -73,6 +84,7 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder clearAny() { return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder value(final String value) { if (this.values == null) this.values = new java.util.ArrayList(); this.values.add(value); @@ -80,6 +92,7 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder value(final String v } @JsonProperty("v_a_l_u_e_s") @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder values(final java.util.Collection values) { if (values == null) { throw new java.lang.NullPointerException("values cannot be null"); @@ -89,18 +102,21 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder values(final java.ut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder clearValues() { if (this.values != null) this.values.clear(); return this; } @JsonAnySetter @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final String key, final Object value) { if (this.guavaAny == null) this.guavaAny = com.google.common.collect.ImmutableMap.builder(); this.guavaAny.put(key, value); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final java.util.Map guavaAny) { if (guavaAny == null) { throw new java.lang.NullPointerException("guavaAny cannot be null"); @@ -110,11 +126,13 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final java. return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaAny() { this.guavaAny = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValue(final String guavaValue) { if (this.guavaValues == null) this.guavaValues = com.google.common.collect.ImmutableList.builder(); this.guavaValues.add(guavaValue); @@ -122,6 +140,7 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValue(final Str } @JsonProperty("guava_v_a_l_u_e_s") @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValues(final java.lang.Iterable guavaValues) { if (guavaValues == null) { throw new java.lang.NullPointerException("guavaValues cannot be null"); @@ -131,11 +150,13 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValues(final ja return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaValues() { this.guavaValues = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular build() { java.util.Map any; switch (this.any$key == null ? 0 : this.any$key.size()) { @@ -167,12 +188,14 @@ public JacksonBuilderSingular build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonBuilderSingular.JacksonBuilderSingularBuilder(any$key=" + this.any$key + ", any$value=" + this.any$value + ", values=" + this.values + ", guavaAny=" + this.guavaAny + ", guavaValues=" + this.guavaValues + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonBuilderSingular.JacksonBuilderSingularBuilder builder() { return new JacksonBuilderSingular.JacksonBuilderSingularBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/JacksonJsonProperty.java b/test/transform/resource/after-delombok/JacksonJsonProperty.java index 7bb17dfdf5..844062b124 100644 --- a/test/transform/resource/after-delombok/JacksonJsonProperty.java +++ b/test/transform/resource/after-delombok/JacksonJsonProperty.java @@ -7,14 +7,18 @@ public class JacksonJsonProperty { @JsonSetter(nulls = Nulls.SKIP) public String kebabCaseProp; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonJsonProperty(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class JacksonJsonPropertyBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String kebabCaseProp; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonJsonPropertyBuilder() { } /** @@ -23,28 +27,33 @@ public static class JacksonJsonPropertyBuilder { @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonJsonProperty.JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonJsonProperty build() { return new JacksonJsonProperty(this.kebabCaseProp); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonJsonProperty.JacksonJsonPropertyBuilder(kebabCaseProp=" + this.kebabCaseProp + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonJsonProperty.JacksonJsonPropertyBuilder builder() { return new JacksonJsonProperty.JacksonJsonPropertyBuilder(); } @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") + @lombok.Generated public void setKebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java b/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java index ed0ca9e765..067e105f63 100644 --- a/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java +++ b/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java @@ -6,23 +6,30 @@ class JacksonizedBuilderComplex { private static void testVoidWithGenerics(T number, int arg2, String arg3, JacksonizedBuilderComplex selfRef) { } @java.lang.SuppressWarnings("all") + @lombok.Generated @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "with", buildMethodName = "execute") public static class TestVoidName { @java.lang.SuppressWarnings("all") + @lombok.Generated private T number; @java.lang.SuppressWarnings("all") + @lombok.Generated private int arg2; @java.lang.SuppressWarnings("all") + @lombok.Generated private String arg3; @java.lang.SuppressWarnings("all") + @lombok.Generated private JacksonizedBuilderComplex selfRef; @java.lang.SuppressWarnings("all") + @lombok.Generated TestVoidName() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderComplex.TestVoidName withNumber(final T number) { this.number = number; return this; @@ -31,6 +38,7 @@ public JacksonizedBuilderComplex.TestVoidName withNumber(final T number) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderComplex.TestVoidName withArg2(final int arg2) { this.arg2 = arg2; return this; @@ -39,6 +47,7 @@ public JacksonizedBuilderComplex.TestVoidName withArg2(final int arg2) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderComplex.TestVoidName withArg3(final String arg3) { this.arg3 = arg3; return this; @@ -47,22 +56,26 @@ public JacksonizedBuilderComplex.TestVoidName withArg3(final String arg3) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderComplex.TestVoidName withSelfRef(final JacksonizedBuilderComplex selfRef) { this.selfRef = selfRef; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void execute() { JacksonizedBuilderComplex.testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonizedBuilderComplex.TestVoidName(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonizedBuilderComplex.TestVoidName builder() { return new JacksonizedBuilderComplex.TestVoidName(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java b/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java index cb8390d24d..8ab09506b9 100644 --- a/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java +++ b/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java @@ -9,25 +9,31 @@ class JacksonizedBuilderSimple { private List also; private int $butNotMe; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonizedBuilderSimple(final int yes, final List also) { this.yes = yes; this.also = also; } @java.lang.SuppressWarnings("all") + @lombok.Generated @JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "", buildMethodName = "build") protected static class JacksonizedBuilderSimpleBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") + @lombok.Generated private List also; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonizedBuilderSimpleBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; @@ -36,21 +42,25 @@ public JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder yes(final int * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderSimple build() { return new JacksonizedBuilderSimple(this.yes, this.also); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder builder() { return new JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder(); } diff --git a/test/transform/resource/after-delombok/JacksonizedOnRecord.java b/test/transform/resource/after-delombok/JacksonizedOnRecord.java index af7d961c0e..0798d01cd4 100644 --- a/test/transform/resource/after-delombok/JacksonizedOnRecord.java +++ b/test/transform/resource/after-delombok/JacksonizedOnRecord.java @@ -4,43 +4,44 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; - @JsonIgnoreProperties @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedOnRecord.JacksonizedOnRecordBuilder.class) public record JacksonizedOnRecord(@JsonProperty("test") @Nullable String string, @JsonAnySetter List values) { - @java.lang.SuppressWarnings("all") + @lombok.Generated @JsonIgnoreProperties @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "", buildMethodName = "build") public static class JacksonizedOnRecordBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String string; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList values; - @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonizedOnRecordBuilder() { } - /** * @return {@code this}. */ @JsonProperty("test") @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedOnRecord.JacksonizedOnRecordBuilder string(@Nullable final String string) { this.string = string; return this; } - @JsonAnySetter @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedOnRecord.JacksonizedOnRecordBuilder value(final String value) { if (this.values == null) this.values = new java.util.ArrayList(); this.values.add(value); return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedOnRecord.JacksonizedOnRecordBuilder values(final java.util.Collection values) { if (values == null) { throw new java.lang.NullPointerException("values cannot be null"); @@ -49,14 +50,14 @@ public JacksonizedOnRecord.JacksonizedOnRecordBuilder values(final java.util.Col this.values.addAll(values); return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedOnRecord.JacksonizedOnRecordBuilder clearValues() { if (this.values != null) this.values.clear(); return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedOnRecord build() { java.util.List values; switch (this.values == null ? 0 : this.values.size()) { @@ -71,15 +72,15 @@ public JacksonizedOnRecord build() { } return new JacksonizedOnRecord(this.string, values); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonizedOnRecord.JacksonizedOnRecordBuilder(string=" + this.string + ", values=" + this.values + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonizedOnRecord.JacksonizedOnRecordBuilder builder() { return new JacksonizedOnRecord.JacksonizedOnRecordBuilder(); } diff --git a/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java b/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java index a07d9dfcfc..3d147e2a85 100644 --- a/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java +++ b/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java @@ -5,50 +5,62 @@ public class JacksonizedSuperBuilderSimple { public static class Parent { int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final int field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonizedSuperBuilderSimple.Parent.ParentBuilder(field1=" + this.field1 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "", buildMethodName = "build") static final class ParentBuilderImpl extends JacksonizedSuperBuilderSimple.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedSuperBuilderSimple.Parent build() { return new JacksonizedSuperBuilderSimple.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final JacksonizedSuperBuilderSimple.Parent.ParentBuilder b) { this.field1 = b.field1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonizedSuperBuilderSimple.Parent.ParentBuilder builder() { return new JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java b/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java index 307537aea0..d851a184b7 100644 --- a/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java +++ b/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java @@ -3,49 +3,61 @@ public class JacksonizedSuperBuilderWithJsonDeserialize { int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class JacksonizedSuperBuilderWithJsonDeserializeBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final int field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder(field1=" + this.field1 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl extends JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedSuperBuilderWithJsonDeserialize build() { return new JacksonizedSuperBuilderWithJsonDeserialize(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected JacksonizedSuperBuilderWithJsonDeserialize(final JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder b) { this.field1 = b.field1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder builder() { return new JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/JavadocMultiline.java b/test/transform/resource/after-delombok/JavadocMultiline.java index cc8b1148c8..e53a197bfa 100644 --- a/test/transform/resource/after-delombok/JavadocMultiline.java +++ b/test/transform/resource/after-delombok/JavadocMultiline.java @@ -7,7 +7,6 @@ class JavadocMultiline { * This is a list of booleans. */ private java.util.List booleans2; - /** * This is a list of booleans. * @@ -15,18 +14,18 @@ class JavadocMultiline { * enough to wrap to multiple lines. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public java.util.List getBooleans() { return this.booleans; } - /** * This is a list of booleans. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public java.util.List getBooleans2() { return this.booleans2; } - /** * This is a list of booleans. * @@ -34,10 +33,10 @@ public java.util.List getBooleans2() { * long enough to wrap to multiple lines. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setBooleans(final java.util.List booleans) { this.booleans = booleans; } - /** * This is a list of booleans. * @@ -45,7 +44,8 @@ public void setBooleans(final java.util.List booleans) { * long enough to wrap to multiple lines. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setBooleans2(final java.util.List booleans2) { this.booleans2 = booleans2; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LockedInInitializer.java b/test/transform/resource/after-delombok/LockedInInitializer.java index a4b687fca6..f1577a0749 100644 --- a/test/transform/resource/after-delombok/LockedInInitializer.java +++ b/test/transform/resource/after-delombok/LockedInInitializer.java @@ -1,6 +1,7 @@ public class LockedInInitializer { public static final Runnable LOCKED = new Runnable() { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); @Override public void run() { @@ -14,6 +15,7 @@ public void run() { }; public static final Runnable LOCKED_READ = new Runnable() { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); @Override public void run() { @@ -27,6 +29,7 @@ public void run() { }; public static final Runnable LOCKED_WRITE = new Runnable() { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); @Override public void run() { diff --git a/test/transform/resource/after-delombok/LockedPlain.java b/test/transform/resource/after-delombok/LockedPlain.java index bdc4e2a493..c6ac1c0faf 100644 --- a/test/transform/resource/after-delombok/LockedPlain.java +++ b/test/transform/resource/after-delombok/LockedPlain.java @@ -1,5 +1,6 @@ class LockedPlain { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); void test() { this.$lock.lock(); @@ -20,6 +21,7 @@ void test2() { } class LockedPlainStatic { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.concurrent.locks.Lock $LOCK = new java.util.concurrent.locks.ReentrantLock(); static void test() { LockedPlainStatic.$LOCK.lock(); @@ -40,6 +42,7 @@ static void test2() { } class LockedPlainRead { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.concurrent.locks.ReadWriteLock $LOCK = new java.util.concurrent.locks.ReentrantReadWriteLock(); static void test() { LockedPlainRead.$LOCK.readLock().lock(); @@ -60,6 +63,7 @@ static void test2() { } class LockedPlainWrite { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); void test() { this.$lock.writeLock().lock(); diff --git a/test/transform/resource/after-delombok/LockedStaticMix.java b/test/transform/resource/after-delombok/LockedStaticMix.java index e546124876..c1ab5e77b9 100644 --- a/test/transform/resource/after-delombok/LockedStaticMix.java +++ b/test/transform/resource/after-delombok/LockedStaticMix.java @@ -1,5 +1,6 @@ class LockedGeneratedStaticMismatch { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.concurrent.locks.Lock $LOCK = new java.util.concurrent.locks.ReentrantLock(); static void test() { LockedGeneratedStaticMismatch.$LOCK.lock(); diff --git a/test/transform/resource/after-delombok/LockedTypeMismatch.java b/test/transform/resource/after-delombok/LockedTypeMismatch.java index eb0a4b19e1..e41f9e35ab 100644 --- a/test/transform/resource/after-delombok/LockedTypeMismatch.java +++ b/test/transform/resource/after-delombok/LockedTypeMismatch.java @@ -1,5 +1,6 @@ class LockedGeneratedTypeMismatch { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); void test() { this.$lock.lock(); diff --git a/test/transform/resource/after-delombok/LoggerCommons.java b/test/transform/resource/after-delombok/LoggerCommons.java index 4b943da7fa..9336c0b01e 100644 --- a/test/transform/resource/after-delombok/LoggerCommons.java +++ b/test/transform/resource/after-delombok/LoggerCommons.java @@ -1,17 +1,21 @@ class LoggerCommons { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class); } class LoggerCommonsWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class); } class LoggerCommonsWithDifferentName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("DifferentName"); } class LoggerCommonsWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithStaticField.TOPIC); static final String TOPIC = "StaticField"; -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerConfig.java b/test/transform/resource/after-delombok/LoggerConfig.java index d0944126b9..29bd330dc1 100644 --- a/test/transform/resource/after-delombok/LoggerConfig.java +++ b/test/transform/resource/after-delombok/LoggerConfig.java @@ -1,4 +1,5 @@ class LoggerWithConfig { @java.lang.SuppressWarnings("all") + @lombok.Generated private final org.slf4j.Logger myLogger = org.slf4j.LoggerFactory.getLogger(LoggerWithConfig.class); } diff --git a/test/transform/resource/after-delombok/LoggerCustom.java b/test/transform/resource/after-delombok/LoggerCustom.java index 4a33e8a9ac..184b1440ce 100644 --- a/test/transform/resource/after-delombok/LoggerCustom.java +++ b/test/transform/resource/after-delombok/LoggerCustom.java @@ -1,13 +1,12 @@ class LoggerCustomLog { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final MyLogger log = MyLoggerFactory.create(LoggerCustomLog.class); } - class MyLoggerFactory { static MyLogger create(Class clazz) { return null; } } - class MyLogger { -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerCustomWithPackage.java b/test/transform/resource/after-delombok/LoggerCustomWithPackage.java index 45e741c2b1..065369cc69 100644 --- a/test/transform/resource/after-delombok/LoggerCustomWithPackage.java +++ b/test/transform/resource/after-delombok/LoggerCustomWithPackage.java @@ -1,14 +1,13 @@ package before; class LoggerCustomLog { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final before.MyLogger log = before.MyLoggerFactory.create(LoggerCustomLog.class); } - class MyLoggerFactory { static MyLogger create(Class clazz) { return null; } } - class MyLogger { -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerCustomWithTopicAndName.java b/test/transform/resource/after-delombok/LoggerCustomWithTopicAndName.java index 4db02cc1d9..f6d7fae194 100644 --- a/test/transform/resource/after-delombok/LoggerCustomWithTopicAndName.java +++ b/test/transform/resource/after-delombok/LoggerCustomWithTopicAndName.java @@ -1,16 +1,16 @@ class LoggerCustomLog { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final MyLoggerFactory log = MyLoggerFactory.create(LoggerCustomLog.class.getName(), "t", null, LoggerCustomLog.class, "t"); } - class LoggerCustomLogWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final MyLoggerFactory log = MyLoggerFactory.create(LoggerCustomLogWithStaticField.class.getName(), LoggerCustomLogWithStaticField.TOPIC, null, LoggerCustomLogWithStaticField.class, LoggerCustomLogWithStaticField.TOPIC); static final String TOPIC = "StaticField"; } - class MyLoggerFactory { static MyLoggerFactory create(String name, String t1, Object o, Class clazz, String t2) { return null; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerFlogger.java b/test/transform/resource/after-delombok/LoggerFlogger.java index 0fe8083ad9..0636fd7276 100644 --- a/test/transform/resource/after-delombok/LoggerFlogger.java +++ b/test/transform/resource/after-delombok/LoggerFlogger.java @@ -1,26 +1,31 @@ class LoggerFlogger { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } class LoggerFloggerWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } class LoggerFloggerOuter { static class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } } enum LoggerFloggerWithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } class LoggerFloggerWithInnerEnum { enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } } diff --git a/test/transform/resource/after-delombok/LoggerFloggerRecord.java b/test/transform/resource/after-delombok/LoggerFloggerRecord.java index 98ad3c7c86..d2c9570849 100644 --- a/test/transform/resource/after-delombok/LoggerFloggerRecord.java +++ b/test/transform/resource/after-delombok/LoggerFloggerRecord.java @@ -2,6 +2,7 @@ class LoggerFloggerRecord { public record Inner(String x) { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerJBossLog.java b/test/transform/resource/after-delombok/LoggerJBossLog.java index 1f2a240ff0..2a242adcf7 100644 --- a/test/transform/resource/after-delombok/LoggerJBossLog.java +++ b/test/transform/resource/after-delombok/LoggerJBossLog.java @@ -1,37 +1,42 @@ class LoggerJBossLog { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLog.class); } class LoggerJBossLogWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithImport.class); } class LoggerJBossLogOuter { static class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); } } enum LoggerJBossLogWithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithEnum.class); } class LoggerJBossLogWithInnerEnum { enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); } } - class LoggerJBossLogWithDifferentLoggerName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger("DifferentLogger"); } - class LoggerJBossLogWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithStaticField.TOPIC); static final String TOPIC = "StaticField"; -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerJul.java b/test/transform/resource/after-delombok/LoggerJul.java index 471e614c67..98b919c8c7 100644 --- a/test/transform/resource/after-delombok/LoggerJul.java +++ b/test/transform/resource/after-delombok/LoggerJul.java @@ -1,30 +1,35 @@ class LoggerJul { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName()); } class LoggerJulWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName()); } class LoggerJulWithDifferentName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("DifferentName"); } class LoggerJulWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithStaticField.TOPIC); static final String TOPIC = "StaticField"; } enum LoggerJulWithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithEnum.class.getName()); } class LoggerJulWithInnerEnum { - enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(Inner.class.getName()); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerLog4j.java b/test/transform/resource/after-delombok/LoggerLog4j.java index c07e14fa2d..4e3083c4bd 100644 --- a/test/transform/resource/after-delombok/LoggerLog4j.java +++ b/test/transform/resource/after-delombok/LoggerLog4j.java @@ -1,30 +1,35 @@ class LoggerLog4j { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class); } class LoggerLog4jWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class); } class LoggerLog4jWithDifferentName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("DifferentName"); } class LoggerLog4jWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithStaticField.TOPIC); static final String TOPIC = "StaticField"; } enum LoggerLog4jWithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithEnum.class); } class LoggerLog4jWithInnerEnum { - enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(Inner.class); } } diff --git a/test/transform/resource/after-delombok/LoggerLog4j2.java b/test/transform/resource/after-delombok/LoggerLog4j2.java index 5db281be94..f2c79cf1fa 100644 --- a/test/transform/resource/after-delombok/LoggerLog4j2.java +++ b/test/transform/resource/after-delombok/LoggerLog4j2.java @@ -1,31 +1,36 @@ //version 8: class LoggerLog4j2 { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class); } class LoggerLog4j2WithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class); } class LoggerLog4j2WithDifferentName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger("DifferentName"); } class LoggerLog4j2WithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithStaticField.TOPIC); static final String TOPIC = "StaticField"; } enum LoggerLog4j2WithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithEnum.class); } class LoggerLog4j2WithInnerEnum { - enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(Inner.class); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerSlf4j.java b/test/transform/resource/after-delombok/LoggerSlf4j.java index 099a65ad1d..7b5b5945e8 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4j.java +++ b/test/transform/resource/after-delombok/LoggerSlf4j.java @@ -1,43 +1,48 @@ class LoggerSlf4j { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); } class LoggerSlf4jWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class); } enum LoggerSlf4jWithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithEnum.class); } class LoggerSlf4jWithInnerEnum { enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } class LoggerSlf4jOuter { static class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } - class LoggerSlf4jWithDifferentLoggerName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("DifferentLogger"); } - class LoggerSlf4jWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithStaticField.TOPIC); static final String TOPIC = "StaticField"; } - class LoggerSlf4jWithTwoStaticFields { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithTwoStaticFields.TOPIC + LoggerSlf4jWithTwoStaticFields.TOPIC); static final String TOPIC = "StaticField"; } diff --git a/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java b/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java index 831ac357e7..079896f34b 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java @@ -1,5 +1,6 @@ // version 16: the SuppressWarnings is not emitted in java14/15 to work around a javac bug. public record LoggerSlf4jOnRecord(String a, String b) { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class); } diff --git a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java index 6730e8058a..1d738279c0 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java @@ -5,16 +5,19 @@ interface LoggerSlf4jTypesInterface { enum LoggerSlf4jTypesEnum { ; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class); } enum LoggerSlf4jTypesEnumWithElement { FOO; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class); } interface LoggerSlf4jTypesInterfaceOuter { class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java index b82ed6ec35..bc29a7bed1 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java @@ -1,11 +1,13 @@ package before; class LoggerSlf4jWithPackage { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class); } class LoggerSlf4jWithPackageOuter { static class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } diff --git a/test/transform/resource/after-delombok/LoggerXSlf4j.java b/test/transform/resource/after-delombok/LoggerXSlf4j.java index ba0ec3f824..102dc06281 100644 --- a/test/transform/resource/after-delombok/LoggerXSlf4j.java +++ b/test/transform/resource/after-delombok/LoggerXSlf4j.java @@ -1,17 +1,21 @@ class LoggerXSlf4j { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4j.class); } class LoggerXSlf4jWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithImport.class); } class LoggerXSlf4jWithDifferentName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger("DifferentName"); } class LoggerXSlf4jWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithStaticField.TOPIC); static final String TOPIC = "StaticField"; -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/MultiFieldGetter.java b/test/transform/resource/after-delombok/MultiFieldGetter.java index 3586a7e60a..8e5971a626 100644 --- a/test/transform/resource/after-delombok/MultiFieldGetter.java +++ b/test/transform/resource/after-delombok/MultiFieldGetter.java @@ -2,10 +2,12 @@ class MultiFieldGetter { int x; int y; @java.lang.SuppressWarnings("all") + @lombok.Generated protected int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected int getY() { return this.y; } @@ -14,10 +16,12 @@ class MultiFieldGetter2 { int x; int y; @java.lang.SuppressWarnings("all") + @lombok.Generated int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated int getY() { return this.y; } diff --git a/test/transform/resource/after-delombok/NoArgsConstructorForce.java b/test/transform/resource/after-delombok/NoArgsConstructorForce.java index d4bfcda29d..5df396815f 100644 --- a/test/transform/resource/after-delombok/NoArgsConstructorForce.java +++ b/test/transform/resource/after-delombok/NoArgsConstructorForce.java @@ -1,11 +1,10 @@ - public class NoArgsConstructorForce { private final int[] i; private final Object[] o; private final java.util.List[] fullQualifiedList; private final String alreadyInitialized = "yes"; - @java.lang.SuppressWarnings("all") + @lombok.Generated public NoArgsConstructorForce() { this.i = null; this.o = null; diff --git a/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java b/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java index b354a85d51..cce2b0b3b1 100644 --- a/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java +++ b/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java @@ -2,15 +2,18 @@ public class NoPrivateNoArgsConstructor { public static class NoPrivateNoArgsConstructorData { private final int i; @java.lang.SuppressWarnings("all") + @lombok.Generated public NoPrivateNoArgsConstructorData(final int i) { this.i = i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData)) return false; @@ -20,11 +23,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -33,6 +38,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData(i=" + this.getI() + ")"; } @@ -40,15 +46,18 @@ public java.lang.String toString() { public static final class NoPrivateNoArgsConstructorValue { private final int i; @java.lang.SuppressWarnings("all") + @lombok.Generated public NoPrivateNoArgsConstructorValue(final int i) { this.i = i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue)) return false; @@ -58,6 +67,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -66,8 +76,9 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue(i=" + this.getI() + ")"; } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java b/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java index dec9126171..46f5cb6a7c 100644 --- a/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java +++ b/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java @@ -2,6 +2,7 @@ import lombok.NonNull; public record NonNullExistingConstructorOnRecord(@NonNull String a, @NonNull String b) { @java.lang.SuppressWarnings("all") + @lombok.Generated public NonNullExistingConstructorOnRecord { if (a == null) { throw new java.lang.NullPointerException("a is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/NonNullOnRecordSimple.java b/test/transform/resource/after-delombok/NonNullOnRecordSimple.java index 2a772c9322..5346b51384 100644 --- a/test/transform/resource/after-delombok/NonNullOnRecordSimple.java +++ b/test/transform/resource/after-delombok/NonNullOnRecordSimple.java @@ -2,6 +2,7 @@ import lombok.NonNull; public record NonNullOnRecordSimple(@NonNull String a, @NonNull String b) { @java.lang.SuppressWarnings("all") + @lombok.Generated public NonNullOnRecordSimple { if (a == null) { throw new java.lang.NullPointerException("a is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/NonNullOnRecordTypeUse.java b/test/transform/resource/after-delombok/NonNullOnRecordTypeUse.java index e5b78f1c9c..cac07cd1b0 100644 --- a/test/transform/resource/after-delombok/NonNullOnRecordTypeUse.java +++ b/test/transform/resource/after-delombok/NonNullOnRecordTypeUse.java @@ -2,6 +2,7 @@ import lombok.NonNull; public record NonNullOnRecordTypeUse(@NonNull int[] a, int @NonNull [] b, int[] @NonNull [] c) { @java.lang.SuppressWarnings("all") + @lombok.Generated public NonNullOnRecordTypeUse { if (a == null) { throw new java.lang.NullPointerException("a is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/NonNullPlain.java b/test/transform/resource/after-delombok/NonNullPlain.java index 9fc2904272..68fbf0723b 100644 --- a/test/transform/resource/after-delombok/NonNullPlain.java +++ b/test/transform/resource/after-delombok/NonNullPlain.java @@ -12,6 +12,7 @@ class NonNullPlain { public @interface NotNull { } @java.lang.SuppressWarnings("all") + @lombok.Generated public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) { if (s == null) { throw new java.lang.NullPointerException("s is marked non-null but is null"); @@ -21,23 +22,28 @@ public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) } @lombok.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } @lombok.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public String getS() { return this.s; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Object getO() { return this.o; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setI(@lombok.NonNull final int i) { this.i = i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setS(@lombok.NonNull final String s) { if (s == null) { throw new java.lang.NullPointerException("s is marked non-null but is null"); @@ -45,6 +51,7 @@ public void setS(@lombok.NonNull final String s) { this.s = s; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setO(final Object o) { this.o = o; } diff --git a/test/transform/resource/after-delombok/NonNullWithAlternateException.java b/test/transform/resource/after-delombok/NonNullWithAlternateException.java index e76feca204..bff03ee3a2 100644 --- a/test/transform/resource/after-delombok/NonNullWithAlternateException.java +++ b/test/transform/resource/after-delombok/NonNullWithAlternateException.java @@ -9,6 +9,7 @@ public void testMethod(@lombok.NonNull String arg) { System.out.println(arg); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setTest(@lombok.NonNull final String test) { if (test == null) { throw new java.lang.IllegalArgumentException("test is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/NonNullWithAssertion.java b/test/transform/resource/after-delombok/NonNullWithAssertion.java index 318d85b93c..99d8770348 100644 --- a/test/transform/resource/after-delombok/NonNullWithAssertion.java +++ b/test/transform/resource/after-delombok/NonNullWithAssertion.java @@ -8,10 +8,11 @@ public void testMethod(@lombok.NonNull String arg) { } public void testMethodWithIf(@lombok.NonNull String arg) { if (arg == null) throw new NullPointerException("Oops"); - } + } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setTest(@lombok.NonNull final String test) { assert test != null : "test is marked non-null but is null"; this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/NonNullWithGuava.java b/test/transform/resource/after-delombok/NonNullWithGuava.java index efa5878e70..9283203253 100644 --- a/test/transform/resource/after-delombok/NonNullWithGuava.java +++ b/test/transform/resource/after-delombok/NonNullWithGuava.java @@ -29,8 +29,9 @@ public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { test = checkNotNull(test); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setTest(@lombok.NonNull final String test) { com.google.common.base.Preconditions.checkNotNull(test, "test is marked non-null but is null"); this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/NonNullWithJdk.java b/test/transform/resource/after-delombok/NonNullWithJdk.java index 725d90c7d6..58d2ea0e44 100644 --- a/test/transform/resource/after-delombok/NonNullWithJdk.java +++ b/test/transform/resource/after-delombok/NonNullWithJdk.java @@ -29,8 +29,9 @@ public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { test = requireNonNull(test); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setTest(@lombok.NonNull final String test) { java.util.Objects.requireNonNull(test, "test is marked non-null but is null"); this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/NullAnnotatedCheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/NullAnnotatedCheckerFrameworkSuperBuilder.java index ae2bcdfd2d..77821e5348 100644 --- a/test/transform/resource/after-delombok/NullAnnotatedCheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-delombok/NullAnnotatedCheckerFrameworkSuperBuilder.java @@ -1,75 +1,77 @@ //version 8: //CONF: lombok.addNullAnnotations = checkerframework import java.util.List; - class NullAnnotatedCheckerFrameworkSuperBuilder { - public static class Parent { int x; int y; int z; List names; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 5; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int y; @java.lang.SuppressWarnings("all") + @lombok.Generated private int z; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList names; - /** * @return {@code this}. */ @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B x(final int x) { this.x$value = x; x$set = true; return self(); } - /** * @return {@code this}. */ @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B y(final int y) { this.y = y; return self(); } - /** * @return {@code this}. */ @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B z(final int z) { this.z = z; return self(); } - @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B name(final String name) { if (this.names == null) this.names = new java.util.ArrayList(); this.names.add(name); return self(); } - @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B names(final java.util.@org.checkerframework.checker.nullness.qual.NonNull Collection names) { if (names == null) { throw new java.lang.NullPointerException("names cannot be null"); @@ -78,48 +80,48 @@ public B names(final java.util.@org.checkerframework.checker.nullness.qual.NonNu this.names.addAll(names); return self(); } - @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearNames() { if (this.names != null) this.names.clear(); return self(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return "NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value + ", y=" + this.y + ", z=" + this.z + ", names=" + this.names + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull Parent build() { return new NullAnnotatedCheckerFrameworkSuperBuilder.Parent(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { if (b.x$set) this.x = b.x$value; else this.x = NullAnnotatedCheckerFrameworkSuperBuilder.Parent.$default$x(); @@ -138,98 +140,98 @@ protected Parent(final NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBu } this.names = names; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static NullAnnotatedCheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.nullness.qual.NonNull ParentBuilder builder() { return new NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } } - - public static class ZChild extends Parent { int a; int b; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$a() { return 1; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ZChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean a$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int a$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int b; - /** * @return {@code this}. */ @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B a(final int a) { this.a$value = a; a$set = true; return self(); } - /** * @return {@code this}. */ @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B b(final int b) { this.b = b; return self(); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return "NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder(super=" + super.toString() + ", a$value=" + this.a$value + ", b=" + this.b + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ZChildBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ZChildBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull ZChild build() { return new NullAnnotatedCheckerFrameworkSuperBuilder.ZChild(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected ZChild(final NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { super(b); if (b.a$set) this.a = b.a$value; else this.a = NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.$default$a(); this.b = b.b; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.nullness.qual.NonNull ZChildBuilder builder() { return new NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/NullLibrary1.java b/test/transform/resource/after-delombok/NullLibrary1.java index e299be3d54..ca55c8e2d3 100644 --- a/test/transform/resource/after-delombok/NullLibrary1.java +++ b/test/transform/resource/after-delombok/NullLibrary1.java @@ -3,6 +3,7 @@ public class NullLibrary1 { String foo; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.@org.eclipse.jdt.annotation.Nullable Object o) { if (o == this) return true; if (!(o instanceof NullLibrary1)) return false; @@ -14,11 +15,13 @@ public boolean equals(final java.lang.@org.eclipse.jdt.annotation.Nullable Objec return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.@org.eclipse.jdt.annotation.Nullable Object other) { return other instanceof NullLibrary1; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -28,10 +31,12 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.@org.eclipse.jdt.annotation.NonNull String toString() { return "NullLibrary1(foo=" + this.foo + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary1(final String foo) { this.foo = foo; } @@ -40,6 +45,7 @@ public NullLibrary1(final String foo) { */ @org.eclipse.jdt.annotation.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary1 withFoo(final String foo) { return this.foo == foo ? this : new NullLibrary1(foo); } diff --git a/test/transform/resource/after-delombok/NullLibrary2.java b/test/transform/resource/after-delombok/NullLibrary2.java index fec143c2db..190b653ebc 100644 --- a/test/transform/resource/after-delombok/NullLibrary2.java +++ b/test/transform/resource/after-delombok/NullLibrary2.java @@ -3,6 +3,7 @@ public class NullLibrary2 { String foo; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(@org.springframework.lang.Nullable final java.lang.Object o) { if (o == this) return true; if (!(o instanceof NullLibrary2)) return false; @@ -14,11 +15,13 @@ public boolean equals(@org.springframework.lang.Nullable final java.lang.Object return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(@org.springframework.lang.Nullable final java.lang.Object other) { return other instanceof NullLibrary2; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -29,10 +32,12 @@ public int hashCode() { @org.springframework.lang.NonNull @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "NullLibrary2(foo=" + this.foo + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary2(final String foo) { this.foo = foo; } @@ -41,6 +46,7 @@ public NullLibrary2(final String foo) { */ @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary2 withFoo(final String foo) { return this.foo == foo ? this : new NullLibrary2(foo); } diff --git a/test/transform/resource/after-delombok/NullLibrary3.java b/test/transform/resource/after-delombok/NullLibrary3.java index ee7c529633..51c3c501a7 100644 --- a/test/transform/resource/after-delombok/NullLibrary3.java +++ b/test/transform/resource/after-delombok/NullLibrary3.java @@ -1,9 +1,9 @@ public class NullLibrary3 { @jakarta.annotation.Nonnull String foo; - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(@jakarta.annotation.Nullable final java.lang.Object o) { if (o == this) return true; if (!(o instanceof NullLibrary3)) return false; @@ -14,14 +14,14 @@ public boolean equals(@jakarta.annotation.Nullable final java.lang.Object o) { if (this$foo == null ? other$foo != null : !this$foo.equals(other$foo)) return false; return true; } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(@jakarta.annotation.Nullable final java.lang.Object other) { return other instanceof NullLibrary3; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -29,31 +29,31 @@ public int hashCode() { result = result * PRIME + ($foo == null ? 43 : $foo.hashCode()); return result; } - @jakarta.annotation.Nonnull @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "NullLibrary3(foo=" + this.foo + ")"; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary3(@jakarta.annotation.Nonnull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); } this.foo = foo; } - /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @jakarta.annotation.Nonnull @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary3 withFoo(@jakarta.annotation.Nonnull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); } return this.foo == foo ? this : new NullLibrary3(foo); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/OnXJava8Style.java b/test/transform/resource/after-delombok/OnXJava8Style.java index 18fc668603..3e99c63819 100644 --- a/test/transform/resource/after-delombok/OnXJava8Style.java +++ b/test/transform/resource/after-delombok/OnXJava8Style.java @@ -6,7 +6,6 @@ public class OnXJava8Style { @interface Bar { String stuff() default ""; } - @interface Array { String[] value() default {}; } @@ -21,48 +20,54 @@ public class OnXJava8Style { String i; @Foo @java.lang.SuppressWarnings("all") + @lombok.Generated public String getA() { return this.a; } @Foo @java.lang.SuppressWarnings("all") + @lombok.Generated public void setB(final String b) { this.b = b; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setC(@Foo("a") final String c) { this.c = c; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setD(@Bar(stuff = "b") final String d) { this.d = d; } @Foo("c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") + @lombok.Generated public String getE() { return this.e; } @Array @java.lang.SuppressWarnings("all") + @lombok.Generated public String getF() { return this.f; } - @Array @java.lang.SuppressWarnings("all") + @lombok.Generated public String getG() { return this.g; } - @Array({}) @java.lang.SuppressWarnings("all") + @lombok.Generated public String getH() { return this.h; } - @Array({"a", "b"}) @java.lang.SuppressWarnings("all") + @lombok.Generated public String getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java b/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java index cf3b0a15d5..db24b5779c 100644 --- a/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java +++ b/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java @@ -4,15 +4,18 @@ private static class Base { public static class PrivateNoArgsConstructorNotOnExtends extends Base { private final int a; @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorNotOnExtends(final int a) { this.a = a; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getA() { return this.a; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends)) return false; @@ -23,11 +26,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = super.hashCode(); @@ -36,6 +41,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends(a=" + this.getA() + ")"; } @@ -43,19 +49,23 @@ public java.lang.String toString() { public static class PrivateNoArgsConstructorOnExtendsObject extends Object { private final int b; @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorOnExtendsObject(final int b) { this.b = b; } @java.lang.SuppressWarnings("all") + @lombok.Generated private PrivateNoArgsConstructorOnExtendsObject() { this.b = 0; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getB() { return this.b; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject)) return false; @@ -65,11 +75,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -78,6 +90,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject(b=" + this.getB() + ")"; } @@ -85,15 +98,18 @@ public java.lang.String toString() { public static class PrivateNoArgsConstructorExplicitBefore { private final int c; @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorExplicitBefore() { this.c = 0; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getC() { return this.c; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore)) return false; @@ -103,11 +119,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -116,10 +134,12 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore(c=" + this.getC() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorExplicitBefore(final int c) { this.c = c; } @@ -127,11 +147,13 @@ public PrivateNoArgsConstructorExplicitBefore(final int c) { public static class PrivateNoArgsConstructorExplicitAfter { private final int d; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getD() { return this.d; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter)) return false; @@ -141,11 +163,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -154,14 +178,17 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter(d=" + this.getD() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorExplicitAfter() { this.d = 0; } @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorExplicitAfter(final int d) { this.d = d; } @@ -169,11 +196,13 @@ public PrivateNoArgsConstructorExplicitAfter(final int d) { public static class PrivateNoArgsConstructorExplicitNone { private final int e; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getE() { return this.e; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone)) return false; @@ -183,11 +212,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -196,20 +227,24 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone(e=" + this.getE() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorExplicitNone(final int e) { this.e = e; } } public static class PrivateNoArgsConstructorNoFields { @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorNoFields() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields)) return false; @@ -218,17 +253,20 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields()"; } diff --git a/test/transform/resource/after-delombok/SetterAccessLevel.java b/test/transform/resource/after-delombok/SetterAccessLevel.java index 51a58e8e99..b35b07971d 100644 --- a/test/transform/resource/after-delombok/SetterAccessLevel.java +++ b/test/transform/resource/after-delombok/SetterAccessLevel.java @@ -6,22 +6,27 @@ class SetterAccessLevel { boolean isPublic; boolean value; @java.lang.SuppressWarnings("all") + @lombok.Generated private void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @java.lang.SuppressWarnings("all") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected void setProtected(final boolean isProtected) { this.isProtected = isProtected; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setValue(final boolean value) { this.value = value; } diff --git a/test/transform/resource/after-delombok/SetterAlreadyExists.java b/test/transform/resource/after-delombok/SetterAlreadyExists.java index a62f20da7f..e8584ecb8a 100644 --- a/test/transform/resource/after-delombok/SetterAlreadyExists.java +++ b/test/transform/resource/after-delombok/SetterAlreadyExists.java @@ -23,6 +23,7 @@ class Setter5 { void setFoo() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFoo(final String foo) { this.foo = foo; } @@ -32,6 +33,7 @@ class Setter6 { void setFoo(String foo, int x) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFoo(final String foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java b/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java index 7831e42c06..c2241f0bf5 100644 --- a/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java +++ b/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java @@ -16,6 +16,7 @@ class SetterAndWithMethodJavadoc { * @param the new value */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setI(final int i) { this.i = i; } @@ -25,6 +26,7 @@ public void setI(final int i) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public SetterAndWithMethodJavadoc withI(final int i) { return this.i == i ? this : new SetterAndWithMethodJavadoc(i, this.j); } @@ -33,6 +35,7 @@ public SetterAndWithMethodJavadoc withI(final int i) { * @param the new other value */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setJ(final int j) { this.j = j; } @@ -42,6 +45,7 @@ public void setJ(final int j) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public SetterAndWithMethodJavadoc withJ(final int j) { return this.j == j ? this : new SetterAndWithMethodJavadoc(this.i, j); } diff --git a/test/transform/resource/after-delombok/SetterDeprecated.java b/test/transform/resource/after-delombok/SetterDeprecated.java index cc52413b46..c35ff24e1b 100644 --- a/test/transform/resource/after-delombok/SetterDeprecated.java +++ b/test/transform/resource/after-delombok/SetterDeprecated.java @@ -7,6 +7,7 @@ class SetterDeprecated { int javadoc; @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public void setAnnotation(final int annotation) { this.annotation = annotation; } @@ -15,6 +16,7 @@ public void setAnnotation(final int annotation) { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public void setJavadoc(final int javadoc) { this.javadoc = javadoc; } diff --git a/test/transform/resource/after-delombok/SetterInAnonymousClass.java b/test/transform/resource/after-delombok/SetterInAnonymousClass.java index ced2be523a..d1ab955be7 100644 --- a/test/transform/resource/after-delombok/SetterInAnonymousClass.java +++ b/test/transform/resource/after-delombok/SetterInAnonymousClass.java @@ -1,10 +1,9 @@ public class SetterInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public void setString(final String string) { this.string = string; } diff --git a/test/transform/resource/after-delombok/SetterOnClass.java b/test/transform/resource/after-delombok/SetterOnClass.java index d95a280f25..317b0b4426 100644 --- a/test/transform/resource/after-delombok/SetterOnClass.java +++ b/test/transform/resource/after-delombok/SetterOnClass.java @@ -3,6 +3,7 @@ class SetterOnClass1 { boolean isNone; boolean isPublic; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @@ -12,10 +13,12 @@ class SetterOnClass2 { boolean isProtected; boolean isPackage; @java.lang.SuppressWarnings("all") + @lombok.Generated protected void setProtected(final boolean isProtected) { this.isProtected = isProtected; } @java.lang.SuppressWarnings("all") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @@ -24,6 +27,7 @@ class SetterOnClass3 { boolean isNone; boolean isPackage; @java.lang.SuppressWarnings("all") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @@ -32,6 +36,7 @@ class SetterOnClass4 { boolean isNone; boolean isPrivate; @java.lang.SuppressWarnings("all") + @lombok.Generated private void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @@ -40,6 +45,7 @@ class SetterOnClass5 { boolean isNone; boolean isPublic; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @@ -49,10 +55,12 @@ class SetterOnClass6 { @lombok.NonNull String nonNull; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setCouldBeNull(final String couldBeNull) { this.couldBeNull = couldBeNull; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setNonNull(@lombok.NonNull final String nonNull) { if (nonNull == null) { throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java index 555bf6986a..e2f66eed7c 100644 --- a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java +++ b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java @@ -6,18 +6,21 @@ class SetterOnMethodOnParam { } @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public void setI(final int i) { this.i = i; } @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") + @lombok.Generated public void setJ(@Test final int j) { this.j = j; } @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") + @lombok.Generated public void setK(@Test final int k) { this.k = k; } diff --git a/test/transform/resource/after-delombok/SetterOnStatic.java b/test/transform/resource/after-delombok/SetterOnStatic.java index 7ef6836261..505b62e268 100644 --- a/test/transform/resource/after-delombok/SetterOnStatic.java +++ b/test/transform/resource/after-delombok/SetterOnStatic.java @@ -2,10 +2,12 @@ class Setter { static boolean foo; static int bar; @java.lang.SuppressWarnings("all") + @lombok.Generated public static void setFoo(final boolean foo) { Setter.foo = foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static void setBar(final int bar) { Setter.bar = bar; } diff --git a/test/transform/resource/after-delombok/SetterPlain.java b/test/transform/resource/after-delombok/SetterPlain.java index 0ec9ca1b2d..5db01074ea 100644 --- a/test/transform/resource/after-delombok/SetterPlain.java +++ b/test/transform/resource/after-delombok/SetterPlain.java @@ -2,10 +2,12 @@ class SetterPlain { int i; int foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setI(final int i) { this.i = i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFoo(final int foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/SetterTypeAnnos.java b/test/transform/resource/after-delombok/SetterTypeAnnos.java index 77ddf9ce88..98a4d4a46f 100644 --- a/test/transform/resource/after-delombok/SetterTypeAnnos.java +++ b/test/transform/resource/after-delombok/SetterTypeAnnos.java @@ -12,6 +12,7 @@ class SetterTypeAnnos { @TB List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFoo(@TA final List foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/SetterWithDollar.java b/test/transform/resource/after-delombok/SetterWithDollar.java index 8d116e99a6..6fad972a1d 100644 --- a/test/transform/resource/after-delombok/SetterWithDollar.java +++ b/test/transform/resource/after-delombok/SetterWithDollar.java @@ -1,9 +1,7 @@ class SetterWithDollar1 { int $i; - @java.lang.SuppressWarnings("all") - - + @lombok.Generated public void set$i(final int $i) { this.$i = $i; } @@ -11,14 +9,13 @@ class SetterWithDollar1 { class SetterWithDollar2 { int $i; int i; - @java.lang.SuppressWarnings("all") - - + @lombok.Generated public void set$i(final int $i) { this.$i = $i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setI(final int i) { this.i = i; } diff --git a/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java index de68ee60ae..0e54353be9 100644 --- a/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java @@ -2,10 +2,12 @@ class SetterWithJavaBeansSpecCapitalization { int a; int aField; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setA(final int a) { this.a = a; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setaField(final int aField) { this.aField = aField; } diff --git a/test/transform/resource/after-delombok/SimpleTypeResolution.java b/test/transform/resource/after-delombok/SimpleTypeResolution.java index c6e08d70b8..0340e1d598 100644 --- a/test/transform/resource/after-delombok/SimpleTypeResolution.java +++ b/test/transform/resource/after-delombok/SimpleTypeResolution.java @@ -5,6 +5,7 @@ class SimpleTypeResolutionFail { class SimpleTypeResolutionSuccess { private int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/SingularCleanupForDelombok.java b/test/transform/resource/after-delombok/SingularCleanupForDelombok.java index ff67af594a..c7878ca23a 100644 --- a/test/transform/resource/after-delombok/SingularCleanupForDelombok.java +++ b/test/transform/resource/after-delombok/SingularCleanupForDelombok.java @@ -11,29 +11,36 @@ public Book(String name, Set authors) { this(name, authors, authors.size()); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BookBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList authors; @java.lang.SuppressWarnings("all") + @lombok.Generated BookBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public Book.BookBuilder name(final String name) { this.name = name; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Book.BookBuilder author(final String author) { if (this.authors == null) this.authors = new java.util.ArrayList(); this.authors.add(author); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Book.BookBuilder authors(final java.util.Collection authors) { if (authors == null) { throw new java.lang.NullPointerException("authors cannot be null"); @@ -43,11 +50,13 @@ public Book.BookBuilder authors(final java.util.Collection aut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Book.BookBuilder clearAuthors() { if (this.authors != null) this.authors.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Book build() { java.util.Set authors; switch (this.authors == null ? 0 : this.authors.size()) { @@ -66,15 +75,18 @@ public Book build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Book.BookBuilder(name=" + this.name + ", authors=" + this.authors + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static Book.BookBuilder builder() { return new Book.BookBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated Book(@NonNull final String name, @NonNull final Set authors, final int numberOfAuthors) { if (name == null) { throw new java.lang.NullPointerException("name is marked non-null but is null"); @@ -88,12 +100,14 @@ public static Book.BookBuilder builder() { } @NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public String name() { return this.name; } @NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public Set authors() { return this.authors; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SkipSuppressWarnings.java b/test/transform/resource/after-delombok/SkipSuppressWarnings.java index 77bfdcc463..2b4c444c57 100644 --- a/test/transform/resource/after-delombok/SkipSuppressWarnings.java +++ b/test/transform/resource/after-delombok/SkipSuppressWarnings.java @@ -1,12 +1,12 @@ class SkipSuppressWarnings { private String field = ""; private final java.util.concurrent.atomic.AtomicReference field2 = new java.util.concurrent.atomic.AtomicReference(); - + @lombok.Generated public String getField() { return this.field; } - @java.lang.SuppressWarnings({"unchecked"}) + @lombok.Generated public String getField2() { java.lang.Object $value = this.field2.get(); if ($value == null) { @@ -21,4 +21,4 @@ public String getField2() { } return (String) ($value == this.field2 ? null : $value); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/StandardExceptions.java b/test/transform/resource/after-delombok/StandardExceptions.java index d60fcaf21d..af2edf6b77 100644 --- a/test/transform/resource/after-delombok/StandardExceptions.java +++ b/test/transform/resource/after-delombok/StandardExceptions.java @@ -1,17 +1,21 @@ class EmptyException extends Exception { @java.lang.SuppressWarnings("all") + @lombok.Generated public EmptyException() { this(null, null); } @java.lang.SuppressWarnings("all") + @lombok.Generated public EmptyException(final java.lang.String message) { this(message, null); } @java.lang.SuppressWarnings("all") + @lombok.Generated public EmptyException(final java.lang.Throwable cause) { this(cause != null ? cause.getMessage() : null, cause); } @java.lang.SuppressWarnings("all") + @lombok.Generated public EmptyException(final java.lang.String message, final java.lang.Throwable cause) { super(message); if (cause != null) super.initCause(cause); @@ -21,16 +25,19 @@ class NoArgsException extends Exception { public NoArgsException() { } @java.lang.SuppressWarnings("all") + @lombok.Generated protected NoArgsException(final java.lang.String message) { this(message, null); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected NoArgsException(final java.lang.Throwable cause) { this(cause != null ? cause.getMessage() : null, cause); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected NoArgsException(final java.lang.String message, final java.lang.Throwable cause) { super(message); if (cause != null) super.initCause(cause); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/StaticConstructor.java b/test/transform/resource/after-delombok/StaticConstructor.java index 4de6dbe53e..088a2da51e 100644 --- a/test/transform/resource/after-delombok/StaticConstructor.java +++ b/test/transform/resource/after-delombok/StaticConstructor.java @@ -2,12 +2,14 @@ public class StaticConstructor { String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private StaticConstructor(final String name) { this.name = name; } @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public static StaticConstructor of(final String name) { return new StaticConstructor(name); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstract.java b/test/transform/resource/after-delombok/SuperBuilderAbstract.java index f92eede262..c1735d4197 100644 --- a/test/transform/resource/after-delombok/SuperBuilderAbstract.java +++ b/test/transform/resource/after-delombok/SuperBuilderAbstract.java @@ -2,48 +2,60 @@ public class SuperBuilderAbstract { public static class Parent { int parentField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int parentField; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B parentField(final int parentField) { this.parentField = parentField; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderAbstract.Parent.ParentBuilder(parentField=" + this.parentField + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderAbstract.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderAbstract.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstract.Parent build() { return new SuperBuilderAbstract.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderAbstract.Parent.ParentBuilder b) { this.parentField = b.parentField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderAbstract.Parent.ParentBuilder builder() { return new SuperBuilderAbstract.Parent.ParentBuilderImpl(); } @@ -51,30 +63,37 @@ protected Parent(final SuperBuilderAbstract.Parent.ParentBuilder b) { public static abstract class Child extends Parent { double childField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double childField; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B childField(final double childField) { this.childField = childField; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderAbstract.Child.ChildBuilder(super=" + super.toString() + ", childField=" + this.childField + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderAbstract.Child.ChildBuilder b) { super(b); this.childField = b.childField; @@ -83,51 +102,63 @@ protected Child(final SuperBuilderAbstract.Child.ChildBuilder b) { public static class GrandChild extends Child { String grandChildField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class GrandChildBuilder> extends Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String grandChildField; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B grandChildField(final String grandChildField) { this.grandChildField = grandChildField; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderAbstract.GrandChild.GrandChildBuilder(super=" + super.toString() + ", grandChildField=" + this.grandChildField + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class GrandChildBuilderImpl extends SuperBuilderAbstract.GrandChild.GrandChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private GrandChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstract.GrandChild build() { return new SuperBuilderAbstract.GrandChild(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected GrandChild(final SuperBuilderAbstract.GrandChild.GrandChildBuilder b) { super(b); this.grandChildField = b.grandChildField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderAbstract.GrandChild.GrandChildBuilder builder() { return new SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java index c9ed6ad722..4d67c94e2f 100644 --- a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java @@ -2,15 +2,19 @@ public class SuperBuilderAbstractToBuilder { public static class Parent { int parentField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int parentField; @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { SuperBuilderAbstractToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Parent instance, final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { b.parentField(instance.parentField); } @@ -18,45 +22,56 @@ public static abstract class ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstractToBuilder.Parent build() { return new SuperBuilderAbstractToBuilder.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { this.parentField = b.parentField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderAbstractToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstractToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } @@ -64,17 +79,21 @@ protected Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder public static abstract class Child extends Parent { double childField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double childField; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderAbstractToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Child instance, final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { b.childField(instance.childField); } @@ -82,23 +101,28 @@ public static abstract class ChildBuilder b) { super(b); this.childField = b.childField; @@ -107,17 +131,21 @@ protected Child(final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) public static class GrandChild extends Child { String grandChildField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class GrandChildBuilder> extends Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String grandChildField; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.GrandChild instance, final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { b.grandChildField(instance.grandChildField); } @@ -125,48 +153,59 @@ public static abstract class GrandChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private GrandChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstractToBuilder.GrandChild build() { return new SuperBuilderAbstractToBuilder.GrandChild(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected GrandChild(final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { super(b); this.grandChildField = b.grandChildField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder builder() { return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder toBuilder() { return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl().$fillValuesFrom(this); } diff --git a/test/transform/resource/after-delombok/SuperBuilderBasic.java b/test/transform/resource/after-delombok/SuperBuilderBasic.java index 31b6692da9..2e3ccc0af1 100644 --- a/test/transform/resource/after-delombok/SuperBuilderBasic.java +++ b/test/transform/resource/after-delombok/SuperBuilderBasic.java @@ -4,26 +4,32 @@ public static class Parent { int field1; List items; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final int field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -33,37 +39,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderBasic.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderBasic.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderBasic.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasic.Parent build() { return new SuperBuilderBasic.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.List items; @@ -80,6 +95,7 @@ protected Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderBasic.Parent.ParentBuilder builder() { return new SuperBuilderBasic.Parent.ParentBuilderImpl(); } @@ -87,51 +103,63 @@ protected Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { public static class Child extends SuperBuilderBasic.Parent { double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends SuperBuilderBasic.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final double field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderBasic.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderBasic.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderBasic.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasic.Child build() { return new SuperBuilderBasic.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderBasic.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderBasic.Child.ChildBuilder builder() { return new SuperBuilderBasic.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java index f57937ec17..835c58f136 100644 --- a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java @@ -13,23 +13,31 @@ private static String staticMethod(Parent instance) { return "staticMethod"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private int obtainViaField; @java.lang.SuppressWarnings("all") + @lombok.Generated private int obtainViaMethod; @java.lang.SuppressWarnings("all") + @lombok.Generated private String obtainViaStaticMethod; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { SuperBuilderBasicToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Parent instance, final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { b.field1(instance.field1); b.obtainViaField(instance.field1); @@ -41,6 +49,7 @@ public static abstract class ParentBuilder(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -85,37 +99,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderBasicToBuilder.Parent.ParentBuilder(field1=" + this.field1 + ", obtainViaField=" + this.obtainViaField + ", obtainViaMethod=" + this.obtainViaMethod + ", obtainViaStaticMethod=" + this.obtainViaStaticMethod + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderBasicToBuilder.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasicToBuilder.Parent build() { return new SuperBuilderBasicToBuilder.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { this.field1 = b.field1; this.obtainViaField = b.obtainViaField; @@ -135,10 +158,12 @@ protected Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderBasicToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasicToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } @@ -146,17 +171,21 @@ protected Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) public static class Child extends Parent { private double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderBasicToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Child instance, final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { b.field3(instance.field3); } @@ -164,48 +193,59 @@ public static abstract class ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderBasicToBuilder.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasicToBuilder.Child build() { return new SuperBuilderBasicToBuilder.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderBasicToBuilder.Child.ChildBuilder builder() { return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasicToBuilder.Child.ChildBuilder toBuilder() { return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this); } diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomName.java b/test/transform/resource/after-delombok/SuperBuilderCustomName.java index cad2716c9b..edcac512cc 100644 --- a/test/transform/resource/after-delombok/SuperBuilderCustomName.java +++ b/test/transform/resource/after-delombok/SuperBuilderCustomName.java @@ -2,49 +2,61 @@ class SuperBuilderCustomName { private final int field; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class SimpleTestBuilder, B extends SuperBuilderCustomName.SimpleTestBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field(final int field) { this.field = field; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderCustomName.SimpleTestBuilder(field=" + this.field + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class SimpleTestBuilderImpl extends SuperBuilderCustomName.SimpleTestBuilder, SuperBuilderCustomName.SimpleTestBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private SimpleTestBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderCustomName.SimpleTestBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderCustomName build() { return new SuperBuilderCustomName(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderCustomName(final SuperBuilderCustomName.SimpleTestBuilder b) { this.field = b.field; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderCustomName.SimpleTestBuilder builder() { return new SuperBuilderCustomName.SimpleTestBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomized.java b/test/transform/resource/after-delombok/SuperBuilderCustomized.java index 5f41cdde9e..d34935dd65 100644 --- a/test/transform/resource/after-delombok/SuperBuilderCustomized.java +++ b/test/transform/resource/after-delombok/SuperBuilderCustomized.java @@ -3,6 +3,7 @@ public class SuperBuilderCustomized { public static class Parent { public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; public B resetToDefault() { field1 = 0; @@ -13,11 +14,14 @@ public B field1(int field1) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderCustomized.Parent.ParentBuilder(field1=" + this.field1 + ")"; } @@ -31,17 +35,21 @@ protected Parent(ParentBuilder b) { return new SuperBuilderCustomized.Parent.ParentBuilderImpl().field1(field1); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderCustomized.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderCustomized.Parent build() { return new SuperBuilderCustomized.Parent(this); } @@ -55,10 +63,12 @@ public Child build() { return new Child(this); } @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderCustomized.Child.ChildBuilderImpl self() { return this; } @@ -68,30 +78,37 @@ protected SuperBuilderCustomized.Child.ChildBuilderImpl self() { return new ChildBuilderImpl().field2(10.0); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field2; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field2(final double field2) { this.field2 = field2; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderCustomized.Child.ChildBuilder(super=" + super.toString() + ", field2=" + this.field2 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderCustomized.Child.ChildBuilder b) { super(b); this.field2 = b.field2; diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomizedWithSetterPrefix.java b/test/transform/resource/after-delombok/SuperBuilderCustomizedWithSetterPrefix.java index cee5ac89c3..b9897f3192 100644 --- a/test/transform/resource/after-delombok/SuperBuilderCustomizedWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/SuperBuilderCustomizedWithSetterPrefix.java @@ -3,43 +3,53 @@ public class SuperBuilderCustomizedWithSetterPrefix { public static class Parent { public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; public B setField1(int field1) { this.field1 = field1 + 1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder(field1=" + this.field1 + ")"; } } int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderCustomizedWithSetterPrefix.Parent build() { return new SuperBuilderCustomizedWithSetterPrefix.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder b) { this.field1 = b.field1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder builder() { return new SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderInitializer.java b/test/transform/resource/after-delombok/SuperBuilderInitializer.java index 19ed0c6892..b43abbf4e1 100644 --- a/test/transform/resource/after-delombok/SuperBuilderInitializer.java +++ b/test/transform/resource/after-delombok/SuperBuilderInitializer.java @@ -1,72 +1,68 @@ class SuperBuilderInitializer { - public static class One { private String world; - { world = "Hello"; } - private static final String world2; - static { world2 = "Hello"; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class OneBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private String world; - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B world(final String world) { this.world = world; return self(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderInitializer.One.OneBuilder(world=" + this.world + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class OneBuilderImpl extends SuperBuilderInitializer.One.OneBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private OneBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderInitializer.One.OneBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderInitializer.One build() { return new SuperBuilderInitializer.One(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected One(final SuperBuilderInitializer.One.OneBuilder b) { this.world = b.world; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderInitializer.One.OneBuilder builder() { return new SuperBuilderInitializer.One.OneBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderJavadoc.java b/test/transform/resource/after-delombok/SuperBuilderJavadoc.java index 0944db2cf7..5655ac2691 100644 --- a/test/transform/resource/after-delombok/SuperBuilderJavadoc.java +++ b/test/transform/resource/after-delombok/SuperBuilderJavadoc.java @@ -1,5 +1,4 @@ import java.util.List; - public abstract class SuperBuilderJavadoc { /** * basic gets only a builder setter. @@ -23,23 +22,23 @@ public abstract class SuperBuilderJavadoc { * @return tag remains on the field. */ private final int predefWithJavadoc; - - public static abstract class SuperBuilderJavadocBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int basic; @java.lang.SuppressWarnings("all") + @lombok.Generated private int getsetwith; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predef; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predefWithJavadoc; - public B predef(final int x) { this.predef = x * 10; return self(); } - /** * This javadoc remains untouched. * @param x 1/100 of the thing @@ -49,7 +48,6 @@ public B predefWithJavadoc(final int x) { this.predefWithJavadoc = x * 100; return self(); } - /** * basic gets only a builder setter. * @see #getsetwith @@ -57,66 +55,67 @@ public B predefWithJavadoc(final int x) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B basic(final int basic) { this.basic = basic; return self(); } - /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @param tag is moved to the setters and wither. * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B getsetwith(final int getsetwith) { this.getsetwith = getsetwith; return self(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderJavadoc.SuperBuilderJavadocBuilder(basic=" + this.basic + ", getsetwith=" + this.getsetwith + ", predef=" + this.predef + ", predefWithJavadoc=" + this.predefWithJavadoc + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderJavadoc(final SuperBuilderJavadoc.SuperBuilderJavadocBuilder b) { this.basic = b.basic; this.getsetwith = b.getsetwith; this.predef = b.predef; this.predefWithJavadoc = b.predefWithJavadoc; } - /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @return tag is moved to the getter. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGetsetwith() { return this.getsetwith; } - /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @param tag is moved to the setters and wither. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setGetsetwith(final int getsetwith) { this.getsetwith = getsetwith; } - /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @param tag is moved to the setters and wither. * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract SuperBuilderJavadoc withGetsetwith(final int getsetwith); } diff --git a/test/transform/resource/after-delombok/SuperBuilderNameClashes.java b/test/transform/resource/after-delombok/SuperBuilderNameClashes.java index 5b0db13596..545f0536a5 100644 --- a/test/transform/resource/after-delombok/SuperBuilderNameClashes.java +++ b/test/transform/resource/after-delombok/SuperBuilderNameClashes.java @@ -1,74 +1,94 @@ public class SuperBuilderNameClashes { public static class GenericsClash { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class GenericsClashBuilder, B2 extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B2 self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C3 build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class GenericsClashBuilderImpl extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder, SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private GenericsClashBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderNameClashes.GenericsClash build() { return new SuperBuilderNameClashes.GenericsClash(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected GenericsClash(final SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder b) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder builder() { return new SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl(); } } public static class B { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class BBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B2 self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNameClashes.B.BBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class BBuilderImpl extends SuperBuilderNameClashes.B.BBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private BBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderNameClashes.B.BBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderNameClashes.B build() { return new SuperBuilderNameClashes.B(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected B(final SuperBuilderNameClashes.B.BBuilder b) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderNameClashes.B.BBuilder builder() { return new SuperBuilderNameClashes.B.BBuilderImpl(); } @@ -78,48 +98,60 @@ public static class C2 { public static class C { C2 c2; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class CBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private C2 c2; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B c2(final C2 c2) { this.c2 = c2; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C3 build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNameClashes.C.CBuilder(c2=" + this.c2 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class CBuilderImpl extends SuperBuilderNameClashes.C.CBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private CBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderNameClashes.C.CBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderNameClashes.C build() { return new SuperBuilderNameClashes.C(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected C(final SuperBuilderNameClashes.C.CBuilder b) { this.c2 = b.c2; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderNameClashes.C.CBuilder builder() { return new SuperBuilderNameClashes.C.CBuilderImpl(); } @@ -132,40 +164,50 @@ interface B3 { } public static class ExtendsClauseCollision extends B implements B2.B4, B3 { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ExtendsClauseCollisionBuilder> extends B.BBuilder { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B4 self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder(super=" + super.toString() + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ExtendsClauseCollisionBuilderImpl extends SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ExtendsClauseCollisionBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderNameClashes.ExtendsClauseCollision build() { return new SuperBuilderNameClashes.ExtendsClauseCollision(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected ExtendsClauseCollision(final SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder b) { super(b); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder builder() { return new SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderNestedGenericTypes.java b/test/transform/resource/after-delombok/SuperBuilderNestedGenericTypes.java index fadc05800f..519acf996b 100644 --- a/test/transform/resource/after-delombok/SuperBuilderNestedGenericTypes.java +++ b/test/transform/resource/after-delombok/SuperBuilderNestedGenericTypes.java @@ -1,37 +1,47 @@ public class SuperBuilderNestedGenericTypes { public static abstract class Generic> { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class GenericBuilder, C extends SuperBuilderNestedGenericTypes.Generic, B extends SuperBuilderNestedGenericTypes.Generic.GenericBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNestedGenericTypes.Generic.GenericBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Generic(final SuperBuilderNestedGenericTypes.Generic.GenericBuilder b) { } } public static abstract class NestedGeneric> extends Generic>> { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class NestedGenericBuilder, C extends SuperBuilderNestedGenericTypes.NestedGeneric, B extends SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder> extends Generic.GenericBuilder>, C, B> { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder(super=" + super.toString() + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected NestedGeneric(final SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder b) { super(b); } diff --git a/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java b/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java index 6e2fdca2ba..4b42235940 100644 --- a/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java @@ -11,14 +11,19 @@ class SuperBuilderSingularAnnotatedTypes { private Set<@MyAnnotation @NonNull String> foos; private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class SuperBuilderSingularAnnotatedTypesBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> foos; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; @java.lang.SuppressWarnings("all") + @lombok.Generated public B foo(@MyAnnotation @NonNull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -28,6 +33,7 @@ public B foo(@MyAnnotation @NonNull final String foo) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B foos(final java.util.Collection foos) { if (foos == null) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -37,11 +43,13 @@ public B foos(final java.util.Collection bars) { if (bars == null) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -73,6 +82,7 @@ public B bars(final java.util.Map { @java.lang.SuppressWarnings("all") + @lombok.Generated private SuperBuilderSingularAnnotatedTypesBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularAnnotatedTypes build() { return new SuperBuilderSingularAnnotatedTypes(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder b) { java.util.Set<@MyAnnotation @NonNull String> foos; switch (b.foos == null ? 0 : b.foos.size()) { @@ -138,7 +156,8 @@ protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotated this.bars = bars; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder builder() { return new SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderSingularCustomized.java b/test/transform/resource/after-delombok/SuperBuilderSingularCustomized.java index 1f07c44854..b9a06ab162 100644 --- a/test/transform/resource/after-delombok/SuperBuilderSingularCustomized.java +++ b/test/transform/resource/after-delombok/SuperBuilderSingularCustomized.java @@ -3,17 +3,20 @@ class SuperBuilderSingularCustomized { private Set foos; public static abstract class SuperBuilderSingularCustomizedBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList foos; public B custom(final String value) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B foo(final String foo) { if (this.foos == null) this.foos = new java.util.ArrayList(); this.foos.add(foo); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B foos(final java.util.Collection foos) { if (foos == null) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -23,37 +26,46 @@ public B foos(final java.util.Collection foos) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearFoos() { if (this.foos != null) this.foos.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder(foos=" + this.foos + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class SuperBuilderSingularCustomizedBuilderImpl extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private SuperBuilderSingularCustomizedBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularCustomized build() { return new SuperBuilderSingularCustomized(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularCustomized(final SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder b) { java.util.Set foos; switch (b.foos == null ? 0 : b.foos.size()) { @@ -71,7 +83,8 @@ protected SuperBuilderSingularCustomized(final SuperBuilderSingularCustomized.Su this.foos = foos; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder builder() { return new SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderSingularToBuilderGuava.java b/test/transform/resource/after-delombok/SuperBuilderSingularToBuilderGuava.java index 685f3f8511..66fbad3bee 100644 --- a/test/transform/resource/after-delombok/SuperBuilderSingularToBuilderGuava.java +++ b/test/transform/resource/after-delombok/SuperBuilderSingularToBuilderGuava.java @@ -7,23 +7,31 @@ public static class Parent { private com.google.common.collect.ImmutableSortedSet passes; private com.google.common.collect.ImmutableTable users; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder cards; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder frogs; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSet.Builder rawSet; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSortedSet.Builder passes; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableTable.Builder users; @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Parent instance, final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { b.cards(instance.cards == null ? com.google.common.collect.ImmutableList.of() : instance.cards); b.frogs(instance.frogs == null ? com.google.common.collect.ImmutableList.of() : instance.frogs); @@ -32,12 +40,14 @@ public static abstract class ParentBuilderof() : instance.users); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B card(final T card) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B cards(final java.lang.Iterable cards) { if (cards == null) { throw new java.lang.NullPointerException("cards cannot be null"); @@ -47,17 +57,20 @@ public B cards(final java.lang.Iterable cards) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearCards() { this.cards = null; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B frog(final Number frog) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B frogs(final java.lang.Iterable frogs) { if (frogs == null) { throw new java.lang.NullPointerException("frogs cannot be null"); @@ -67,17 +80,20 @@ public B frogs(final java.lang.Iterable frogs) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearFrogs() { this.frogs = null; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B rawSet(final java.lang.Iterable rawSet) { if (rawSet == null) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -87,17 +103,20 @@ public B rawSet(final java.lang.Iterable rawSet) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearRawSet() { this.rawSet = null; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B pass(final String pass) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B passes(final java.lang.Iterable passes) { if (passes == null) { throw new java.lang.NullPointerException("passes cannot be null"); @@ -107,17 +126,20 @@ public B passes(final java.lang.Iterable passes) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearPasses() { this.passes = null; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B 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 self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B users(final com.google.common.collect.Table users) { if (users == null) { throw new java.lang.NullPointerException("users cannot be null"); @@ -127,37 +149,46 @@ public B users(final com.google.common.collect.Table extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder, SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularToBuilderGuava.Parent build() { return new SuperBuilderSingularToBuilderGuava.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { com.google.common.collect.ImmutableList cards = b.cards == null ? com.google.common.collect.ImmutableList.of() : b.cards.build(); this.cards = cards; @@ -171,10 +202,12 @@ protected Parent(final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder builder() { return new SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder toBuilder() { return new SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl().$fillValuesFrom(this); } @@ -182,17 +215,21 @@ protected Parent(final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder extends Parent { private double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder, B extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderSingularToBuilderGuava.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Child instance, final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { b.field3(instance.field3); } @@ -200,48 +237,59 @@ public static abstract class ChildBuilder extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder, SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularToBuilderGuava.Child build() { return new SuperBuilderSingularToBuilderGuava.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderSingularToBuilderGuava.Child.ChildBuilder builder() { return new SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularToBuilderGuava.Child.ChildBuilder toBuilder() { return new SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl().$fillValuesFrom(this); } @@ -249,4 +297,4 @@ protected Child(final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder x = Child.builder().card(1).build().toBuilder().build(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderWithAnnotatedTypeParam.java b/test/transform/resource/after-delombok/SuperBuilderWithAnnotatedTypeParam.java index f7ffe2fdec..451ca86133 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithAnnotatedTypeParam.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithAnnotatedTypeParam.java @@ -14,48 +14,60 @@ public class SuperBuilderWithAnnotatedTypeParam { public static class Parent { A field1; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field1; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final A field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder(field1=" + this.field1 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder, SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithAnnotatedTypeParam.Parent build() { return new SuperBuilderWithAnnotatedTypeParam.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder b) { this.field1 = b.field1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder builder() { return new SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl(); } @@ -63,51 +75,63 @@ protected Parent(final SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder { double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder<@MyAnnotation String, C, B> { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final double field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithAnnotatedTypeParam.Child build() { return new SuperBuilderWithAnnotatedTypeParam.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder builder() { return new SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java index 2d9498dbc0..6a8a5399c1 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java @@ -1,79 +1,99 @@ class SuperBuilderWithCustomBuilderClassName { static class SuperClass { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class Builder> { @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithCustomBuilderClassName.SuperClass.Builder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SuperClass.Builder { @java.lang.SuppressWarnings("all") + @lombok.Generated private BuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithCustomBuilderClassName.SuperClass build() { return new SuperBuilderWithCustomBuilderClassName.SuperClass(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperClass(final SuperBuilderWithCustomBuilderClassName.SuperClass.Builder b) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithCustomBuilderClassName.SuperClass.Builder builder() { return new SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl(); } } static class SubClass extends SuperClass { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class Builder> extends SuperClass.Builder { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithCustomBuilderClassName.SubClass.Builder(super=" + super.toString() + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SubClass.Builder { @java.lang.SuppressWarnings("all") + @lombok.Generated private BuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithCustomBuilderClassName.SubClass build() { return new SuperBuilderWithCustomBuilderClassName.SubClass(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SubClass(final SuperBuilderWithCustomBuilderClassName.SubClass.Builder b) { super(b); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithCustomBuilderClassName.SubClass.Builder builder() { return new SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java index a2f3231d18..ec47facbbf 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java @@ -5,26 +5,32 @@ public static class Parent { A field1; List items; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final A field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -34,37 +40,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder, SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithCustomBuilderMethod.Parent build() { return new SuperBuilderWithCustomBuilderMethod.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.List items; @@ -81,6 +96,7 @@ protected Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder< this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder builder() { return new SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl(); } @@ -91,46 +107,57 @@ public static class Child extends Parent { return new ChildBuilderImpl().item("default item"); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder, B extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final double field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder, SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithCustomBuilderMethod.Child build() { return new SuperBuilderWithCustomBuilderMethod.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder b) { super(b); this.field3 = b.field3; diff --git a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java index 3fc47f027d..69169ebd5b 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java @@ -4,27 +4,35 @@ public static class Parent { private long millis; private N numberField; @java.lang.SuppressWarnings("all") + @lombok.Generated private static long $default$millis() { return System.currentTimeMillis(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static N $default$numberField() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithDefaults.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean millis$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private long millis$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean numberField$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private N numberField$value; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B millis(final long millis) { this.millis$value = millis; millis$set = true; @@ -34,38 +42,47 @@ public B millis(final long millis) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B numberField(final N numberField) { this.numberField$value = numberField; numberField$set = true; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithDefaults.Parent.ParentBuilder(millis$value=" + this.millis$value + ", numberField$value=" + this.numberField$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithDefaults.Parent.ParentBuilder, SuperBuilderWithDefaults.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithDefaults.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithDefaults.Parent build() { return new SuperBuilderWithDefaults.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder b) { if (b.millis$set) this.millis = b.millis$value; else this.millis = SuperBuilderWithDefaults.Parent.$default$millis(); @@ -73,6 +90,7 @@ protected Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder b) else this.numberField = SuperBuilderWithDefaults.Parent.$default$numberField(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithDefaults.Parent.ParentBuilder builder() { return new SuperBuilderWithDefaults.Parent.ParentBuilderImpl(); } @@ -80,19 +98,24 @@ protected Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder b) public static class Child extends Parent { private double doubleField; @java.lang.SuppressWarnings("all") + @lombok.Generated private static double $default$doubleField() { return Math.PI; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean doubleField$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private double doubleField$value; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B doubleField(final double doubleField) { this.doubleField$value = doubleField; doubleField$set = true; @@ -100,39 +123,48 @@ public B doubleField(final double doubleField) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithDefaults.Child.ChildBuilder(super=" + super.toString() + ", doubleField$value=" + this.doubleField$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithDefaults.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithDefaults.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithDefaults.Child build() { return new SuperBuilderWithDefaults.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithDefaults.Child.ChildBuilder b) { super(b); if (b.doubleField$set) this.doubleField = b.doubleField$value; else this.doubleField = SuperBuilderWithDefaults.Child.$default$doubleField(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithDefaults.Child.ChildBuilder builder() { return new SuperBuilderWithDefaults.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithDefaultsAndTargetTyping.java b/test/transform/resource/after-delombok/SuperBuilderWithDefaultsAndTargetTyping.java index 9a67573dc3..05f997ecf9 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithDefaultsAndTargetTyping.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithDefaultsAndTargetTyping.java @@ -1,153 +1,150 @@ import java.util.Arrays; - public class SuperBuilderWithDefaultsAndTargetTyping { - public static class Parent { private String foo; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean foo$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private String foo$value; - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B foo(final String foo) { this.foo$value = foo; foo$set = true; return self(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder(foo$value=" + this.foo$value + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithDefaultsAndTargetTyping.Parent build() { return new SuperBuilderWithDefaultsAndTargetTyping.Parent(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder b) { if (b.foo$set) this.foo = b.foo$value; else this.foo = SuperBuilderWithDefaultsAndTargetTyping.Parent.$default$foo(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder builder() { return new SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl(); } } - - public static class Child extends Parent { private String foo; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean foo$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private String foo$value; - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B foo(final String foo) { this.foo$value = foo; foo$set = true; return self(); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder(super=" + super.toString() + ", foo$value=" + this.foo$value + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithDefaultsAndTargetTyping.Child build() { return new SuperBuilderWithDefaultsAndTargetTyping.Child(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder b) { super(b); if (b.foo$set) this.foo = b.foo$value; else this.foo = SuperBuilderWithDefaultsAndTargetTyping.Child.$default$foo(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder builder() { return new SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilderImpl(); } } - static String doSth(java.util.List i, java.util.List c) { return null; } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithExistingConstructor.java b/test/transform/resource/after-delombok/SuperBuilderWithExistingConstructor.java index c6ab10721a..10c9c1f258 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithExistingConstructor.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithExistingConstructor.java @@ -2,38 +2,48 @@ public class SuperBuilderWithExistingConstructor { public SuperBuilderWithExistingConstructor() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class SuperBuilderWithExistingConstructorBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class SuperBuilderWithExistingConstructorBuilderImpl extends SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private SuperBuilderWithExistingConstructorBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithExistingConstructor build() { return new SuperBuilderWithExistingConstructor(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithExistingConstructor(final SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder b) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder builder() { return new SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java index 0c00cdfc71..a85c4e8792 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java @@ -4,26 +4,32 @@ public static class Parent { A field1; List items; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithGenerics.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final A field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -33,37 +39,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithGenerics.Parent.ParentBuilder, SuperBuilderWithGenerics.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics.Parent build() { return new SuperBuilderWithGenerics.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.List items; @@ -80,6 +95,7 @@ protected Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder b) this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics.Parent.ParentBuilderImpl(); } @@ -87,51 +103,63 @@ protected Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder b) public static class Child extends Parent { double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder, B extends SuperBuilderWithGenerics.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final double field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithGenerics.Child.ChildBuilder, SuperBuilderWithGenerics.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics.Child build() { return new SuperBuilderWithGenerics.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithGenerics.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics.Child.ChildBuilder builder() { return new SuperBuilderWithGenerics.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java index 011604e9b9..5cbec49a0f 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java @@ -4,26 +4,32 @@ public static class Parent { A field1; List items; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithGenerics2.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final A field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -33,37 +39,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics2.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithGenerics2.Parent.ParentBuilder, SuperBuilderWithGenerics2.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics2.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics2.Parent build() { return new SuperBuilderWithGenerics2.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.List items; @@ -80,6 +95,7 @@ protected Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder b this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics2.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics2.Parent.ParentBuilderImpl(); } @@ -87,51 +103,63 @@ protected Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder b public static class Child extends Parent { A field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder, B extends SuperBuilderWithGenerics2.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final A field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics2.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithGenerics2.Child.ChildBuilder, SuperBuilderWithGenerics2.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics2.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics2.Child build() { return new SuperBuilderWithGenerics2.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithGenerics2.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics2.Child.ChildBuilder builder2() { return new SuperBuilderWithGenerics2.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java index ac33d10f22..d8f2b14a4a 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java @@ -3,48 +3,60 @@ public class SuperBuilderWithGenerics3 { public static class Parent { private final String str; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithGenerics3.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private String str; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B str(final String str) { this.str = str; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics3.Parent.ParentBuilder(str=" + this.str + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithGenerics3.Parent.ParentBuilder, SuperBuilderWithGenerics3.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics3.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics3.Parent build() { return new SuperBuilderWithGenerics3.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithGenerics3.Parent.ParentBuilder b) { this.str = b.str; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics3.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics3.Parent.ParentBuilderImpl(); } @@ -54,53 +66,65 @@ public static class SomeInnerStaticClass { } double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final double field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics3.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithGenerics3.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics3.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics3.Child build() { return new SuperBuilderWithGenerics3.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithGenerics3.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics3.Child.ChildBuilder builder() { return new SuperBuilderWithGenerics3.Child.ChildBuilderImpl(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java index b85e233c79..77bb57d2c8 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java @@ -4,19 +4,25 @@ public static class Parent { A field1; Map items; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items$key; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items$value; @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { b.field1(instance.field1); b.items(instance.items == null ? java.util.Collections.emptyMap() : instance.items); @@ -25,11 +31,13 @@ public static abstract class ParentBuilder(); @@ -40,6 +48,7 @@ public B item(final Integer itemKey, final String itemValue) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Map items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -55,6 +64,7 @@ public B items(final java.util.Map items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items$key != null) { this.items$key.clear(); @@ -63,32 +73,40 @@ public B clearItems() { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder(field1=" + this.field1 + ", items$key=" + this.items$key + ", items$value=" + this.items$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder, SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenericsAndToBuilder.Parent build() { return new SuperBuilderWithGenericsAndToBuilder.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.Map items; @@ -107,10 +125,12 @@ protected Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } @@ -118,17 +138,21 @@ protected Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder public static class Child extends Parent { double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Child instance, final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { b.field3(instance.field3); } @@ -136,48 +160,59 @@ public static abstract class ChildBuilder extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder, SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenericsAndToBuilder.Child build() { return new SuperBuilderWithGenericsAndToBuilder.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder builder() { return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder toBuilder() { return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java index f51b204dce..b12962f5d3 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java @@ -5,19 +5,24 @@ public static class Parent { @lombok.NonNull final String nonNullParentField; @java.lang.SuppressWarnings("all") + @lombok.Generated private static String $default$nonNullParentField() { return "default"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean nonNullParentField$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private String nonNullParentField$value; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B nonNullParentField(@lombok.NonNull final String nonNullParentField) { if (nonNullParentField == null) { throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); @@ -27,32 +32,40 @@ public B nonNullParentField(@lombok.NonNull final String nonNullParentField) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithNonNull.Parent.ParentBuilder(nonNullParentField$value=" + this.nonNullParentField$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithNonNull.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithNonNull.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithNonNull.Parent build() { return new SuperBuilderWithNonNull.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithNonNull.Parent.ParentBuilder b) { if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField$value; else this.nonNullParentField = SuperBuilderWithNonNull.Parent.$default$nonNullParentField(); @@ -61,6 +74,7 @@ protected Parent(final SuperBuilderWithNonNull.Parent.ParentBuilder b) { } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithNonNull.Parent.ParentBuilder builder() { return new SuperBuilderWithNonNull.Parent.ParentBuilderImpl(); } @@ -69,13 +83,16 @@ public static class Child extends Parent { @lombok.NonNull String nonNullChildField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String nonNullChildField; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B nonNullChildField(@lombok.NonNull final String nonNullChildField) { if (nonNullChildField == null) { throw new java.lang.NullPointerException("nonNullChildField is marked non-null but is null"); @@ -85,33 +102,41 @@ public B nonNullChildField(@lombok.NonNull final String nonNullChildField) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithNonNull.Child.ChildBuilder(super=" + super.toString() + ", nonNullChildField=" + this.nonNullChildField + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithNonNull.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithNonNull.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithNonNull.Child build() { return new SuperBuilderWithNonNull.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithNonNull.Child.ChildBuilder b) { super(b); this.nonNullChildField = b.nonNullChildField; @@ -120,6 +145,7 @@ protected Child(final SuperBuilderWithNonNull.Child.ChildBuilder b) { } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithNonNull.Child.ChildBuilder builder() { return new SuperBuilderWithNonNull.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithOverloadedGeneratedMethods.java b/test/transform/resource/after-delombok/SuperBuilderWithOverloadedGeneratedMethods.java index 4c8b77a826..bc1657018b 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithOverloadedGeneratedMethods.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithOverloadedGeneratedMethods.java @@ -2,48 +2,60 @@ public class SuperBuilderWithOverloadedGeneratedMethods { public static class Parent { int self; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int self; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B self(final int self) { this.self = self; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder(self=" + this.self + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithOverloadedGeneratedMethods.Parent build() { return new SuperBuilderWithOverloadedGeneratedMethods.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder b) { this.self = b.self; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder builder() { return new SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl(); } @@ -51,51 +63,63 @@ protected Parent(final SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentB public static class Child extends Parent { double build; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double build; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B build(final double build) { this.build = build; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder(super=" + super.toString() + ", build=" + this.build + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithOverloadedGeneratedMethods.Child build() { return new SuperBuilderWithOverloadedGeneratedMethods.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder b) { super(b); this.build = b.build; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder builder() { return new SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java b/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java index 04c230516f..39a3485c82 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java @@ -3,17 +3,22 @@ class SuperBuilderWithPrefixes { int xOtherField; java.util.List mItems; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class SuperBuilderWithPrefixesBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field; @java.lang.SuppressWarnings("all") + @lombok.Generated private int otherField; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field(final int field) { this.field = field; return self(); @@ -22,17 +27,20 @@ public B field(final int field) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B otherField(final int otherField) { this.otherField = otherField; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -42,37 +50,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder(field=" + this.field + ", otherField=" + this.otherField + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class SuperBuilderWithPrefixesBuilderImpl extends SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private SuperBuilderWithPrefixesBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithPrefixes build() { return new SuperBuilderWithPrefixes(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithPrefixes(final SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder b) { this.mField = b.field; this.xOtherField = b.otherField; @@ -90,7 +107,8 @@ protected SuperBuilderWithPrefixes(final SuperBuilderWithPrefixes.SuperBuilderWi this.mItems = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder builder() { return new SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java index a82e2eac08..82c9c96a87 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java @@ -13,23 +13,31 @@ private static String staticMethod(Parent instance) { return "staticMethod"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private int obtainViaField; @java.lang.SuppressWarnings("all") + @lombok.Generated private int obtainViaMethod; @java.lang.SuppressWarnings("all") + @lombok.Generated private String obtainViaStaticMethod; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { SuperBuilderWithSetterPrefix.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Parent instance, final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { b.withField1(instance.field1); b.withObtainViaField(instance.field1); @@ -41,6 +49,7 @@ public static abstract class ParentBuilder(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B withItems(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -85,37 +99,46 @@ public B withItems(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithSetterPrefix.Parent.ParentBuilder(field1=" + this.field1 + ", obtainViaField=" + this.obtainViaField + ", obtainViaMethod=" + this.obtainViaMethod + ", obtainViaStaticMethod=" + this.obtainViaStaticMethod + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithSetterPrefix.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithSetterPrefix.Parent build() { return new SuperBuilderWithSetterPrefix.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { this.field1 = b.field1; this.obtainViaField = b.obtainViaField; @@ -135,10 +158,12 @@ protected Parent(final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithSetterPrefix.Parent.ParentBuilder builder() { return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithSetterPrefix.Parent.ParentBuilder toBuilder() { return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl().$fillValuesFrom(this); } @@ -146,17 +171,21 @@ protected Parent(final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b public static class Child extends Parent { private double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderWithSetterPrefix.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Child instance, final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { b.setField3(instance.field3); } @@ -164,48 +193,59 @@ public static abstract class ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithSetterPrefix.Child build() { return new SuperBuilderWithSetterPrefix.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithSetterPrefix.Child.ChildBuilder builder() { return new SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithSetterPrefix.Child.ChildBuilder toBuilder() { return new SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl().$fillValuesFrom(this); } diff --git a/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java b/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java index 904487a317..69243cf1c5 100644 --- a/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java +++ b/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java @@ -1,10 +1,9 @@ public class SynchronizedInAnonymousClass { Object annonymous = new Object() { - class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; - public void foo() { synchronized (this.$lock) { String foo = "bar"; diff --git a/test/transform/resource/after-delombok/SynchronizedInInitializer.java b/test/transform/resource/after-delombok/SynchronizedInInitializer.java index c63f4e74bd..0a0491cbdc 100644 --- a/test/transform/resource/after-delombok/SynchronizedInInitializer.java +++ b/test/transform/resource/after-delombok/SynchronizedInInitializer.java @@ -1,6 +1,7 @@ public class SynchronizedInInitializer { public static final Runnable SYNCHRONIZED = new Runnable() { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; @Override public void run() { diff --git a/test/transform/resource/after-delombok/SynchronizedPlain.java b/test/transform/resource/after-delombok/SynchronizedPlain.java index f178aa4ee7..2c0735e61f 100644 --- a/test/transform/resource/after-delombok/SynchronizedPlain.java +++ b/test/transform/resource/after-delombok/SynchronizedPlain.java @@ -1,5 +1,6 @@ class SynchronizedPlain1 { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; void test() { synchronized (this.$lock) { @@ -14,6 +15,7 @@ void test2() { } class SynchronizedPlain2 { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.lang.Object $LOCK = new java.lang.Object[0]; static void test() { synchronized (SynchronizedPlain2.$LOCK) { diff --git a/test/transform/resource/after-delombok/ToStringArray.java b/test/transform/resource/after-delombok/ToStringArray.java index ffd614ad39..d44a26b52a 100644 --- a/test/transform/resource/after-delombok/ToStringArray.java +++ b/test/transform/resource/after-delombok/ToStringArray.java @@ -1,12 +1,11 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Target; - public class ToStringArray { int[] primitiveArray; Object[] objectArray; - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringArray(primitiveArray=" + java.util.Arrays.toString(this.primitiveArray) + ", objectArray=" + java.util.Arrays.deepToString(this.objectArray) + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringArrayTypeAnnotations.java b/test/transform/resource/after-delombok/ToStringArrayTypeAnnotations.java index b2104ffd6c..143ff4915c 100644 --- a/test/transform/resource/after-delombok/ToStringArrayTypeAnnotations.java +++ b/test/transform/resource/after-delombok/ToStringArrayTypeAnnotations.java @@ -1,7 +1,6 @@ //version 8: import java.lang.annotation.ElementType; import java.lang.annotation.Target; - public class ToStringArrayTypeAnnotations { @TA int[] primitiveArray1; @@ -9,14 +8,12 @@ public class ToStringArrayTypeAnnotations { @TA Object[] objectArray1; Object @TA [] objectArray2; - - @Target({ElementType.TYPE_USE}) @interface TA { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringArrayTypeAnnotations(primitiveArray1=" + java.util.Arrays.toString(this.primitiveArray1) + ", primitiveArray2=" + java.util.Arrays.toString(this.primitiveArray2) + ", objectArray1=" + java.util.Arrays.deepToString(this.objectArray1) + ", objectArray2=" + java.util.Arrays.deepToString(this.objectArray2) + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringAutoExclude.java b/test/transform/resource/after-delombok/ToStringAutoExclude.java index 2beee75649..5bdf5b9147 100644 --- a/test/transform/resource/after-delombok/ToStringAutoExclude.java +++ b/test/transform/resource/after-delombok/ToStringAutoExclude.java @@ -4,6 +4,7 @@ class ToStringAutoExclude { transient String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringAutoExclude(x=" + this.x + ", b=" + this.b + ")"; } @@ -14,7 +15,8 @@ class ToStringAutoExclude2 { transient String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringAutoExclude2(x=" + this.x + ", $a=" + this.$a + ", b=" + this.b + ")"; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/ToStringAutoSuper.java b/test/transform/resource/after-delombok/ToStringAutoSuper.java index 1fe5958175..91d2caf4d1 100644 --- a/test/transform/resource/after-delombok/ToStringAutoSuper.java +++ b/test/transform/resource/after-delombok/ToStringAutoSuper.java @@ -1,14 +1,15 @@ class ToStringAutoSuperWithNoParent { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringAutoSuperWithNoParent()"; } } - class ToStringAutoSuperWithParent extends ToStringAutoSuperWithNoParent { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringAutoSuperWithParent(super=" + super.toString() + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringConfiguration.java b/test/transform/resource/after-delombok/ToStringConfiguration.java index 6fa9111ec8..7700530d2a 100644 --- a/test/transform/resource/after-delombok/ToStringConfiguration.java +++ b/test/transform/resource/after-delombok/ToStringConfiguration.java @@ -2,10 +2,12 @@ class ToStringConfiguration { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration(" + this.x + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @@ -14,6 +16,7 @@ class ToStringConfiguration2 { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration2(x=" + this.x + ")"; } @@ -22,10 +25,12 @@ class ToStringConfiguration3 { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration3(" + this.getX() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/ToStringEnum.java b/test/transform/resource/after-delombok/ToStringEnum.java index 9d852e1949..10adc1f382 100644 --- a/test/transform/resource/after-delombok/ToStringEnum.java +++ b/test/transform/resource/after-delombok/ToStringEnum.java @@ -2,6 +2,7 @@ enum ToStringEnum1 { CONSTANT; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringEnum1." + this.name(); } @@ -12,6 +13,7 @@ enum ToStringEnum2 { String name; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringEnum2." + this.name() + "(x=" + this.x + ", name=" + this.name + ")"; } @@ -21,8 +23,9 @@ enum MemberEnum { CONSTANT; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringEnum3.MemberEnum." + this.name(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/ToStringExplicitInclude.java b/test/transform/resource/after-delombok/ToStringExplicitInclude.java index e6b4c09a81..db445b0134 100644 --- a/test/transform/resource/after-delombok/ToStringExplicitInclude.java +++ b/test/transform/resource/after-delombok/ToStringExplicitInclude.java @@ -2,7 +2,8 @@ class ToStringExplicitInclude { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringExplicitInclude()"; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/ToStringExplicitIncludeConf.java b/test/transform/resource/after-delombok/ToStringExplicitIncludeConf.java index c4962ed834..9e0954f6a1 100644 --- a/test/transform/resource/after-delombok/ToStringExplicitIncludeConf.java +++ b/test/transform/resource/after-delombok/ToStringExplicitIncludeConf.java @@ -3,6 +3,7 @@ class ToStringExplicitIncludeConf { int y; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringExplicitIncludeConf(y=" + this.y + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringInAnonymousClass.java b/test/transform/resource/after-delombok/ToStringInAnonymousClass.java index aa3651bb49..23755167c1 100644 --- a/test/transform/resource/after-delombok/ToStringInAnonymousClass.java +++ b/test/transform/resource/after-delombok/ToStringInAnonymousClass.java @@ -1,11 +1,10 @@ public class ToStringInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Inner(string=" + this.string + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringInner.java b/test/transform/resource/after-delombok/ToStringInner.java index fe77fcfda1..cc48b9e8ff 100644 --- a/test/transform/resource/after-delombok/ToStringInner.java +++ b/test/transform/resource/after-delombok/ToStringInner.java @@ -5,6 +5,7 @@ class ToStringInner { int y; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringInner(y=" + this.y + ")"; } @@ -13,6 +14,7 @@ static class ToStringStaticInner { int y; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringStaticInner(y=" + this.y + ")"; } @@ -22,14 +24,15 @@ class ToStringMoreInner { String name; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name + ")"; } } } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter(x=" + this.x + ", name=" + this.name + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringNewStyle.java b/test/transform/resource/after-delombok/ToStringNewStyle.java index 0a54bd2498..91fe67fe30 100644 --- a/test/transform/resource/after-delombok/ToStringNewStyle.java +++ b/test/transform/resource/after-delombok/ToStringNewStyle.java @@ -12,6 +12,7 @@ int f() { int j; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringNewStyle(a=" + this.b + ", c=" + this.c + ", e=" + this.d + ", f=" + this.f() + ", g=" + this.g + ", i=" + this.i + ", h=" + this.h + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringPlain.java b/test/transform/resource/after-delombok/ToStringPlain.java index af9daf4fdd..c277b26cf2 100644 --- a/test/transform/resource/after-delombok/ToStringPlain.java +++ b/test/transform/resource/after-delombok/ToStringPlain.java @@ -3,6 +3,7 @@ class ToString1 { String name; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToString1(x=" + this.x + ", name=" + this.name + ")"; } @@ -12,6 +13,7 @@ class ToString2 { String name; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToString2(x=" + this.x + ", name=" + this.name + ")"; } diff --git a/test/transform/resource/after-delombok/Tolerate.java b/test/transform/resource/after-delombok/Tolerate.java index 2539f091ac..8ae38a3ab5 100644 --- a/test/transform/resource/after-delombok/Tolerate.java +++ b/test/transform/resource/after-delombok/Tolerate.java @@ -6,10 +6,12 @@ public void setPattern(String pattern) { setPattern(Pattern.compile(pattern)); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setPattern(final Pattern pattern) { this.pattern = pattern; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Pattern getPattern() { return this.pattern; } @@ -24,6 +26,7 @@ public Tolerate2 withPattern(String nameGlob, String extensionGlob) { return withPattern(nameGlob.replace("*", ".*") + "\\." + extensionGlob.replace("*", ".*")); } @java.lang.SuppressWarnings("all") + @lombok.Generated public Pattern getPattern() { return this.pattern; } @@ -31,10 +34,12 @@ public Pattern getPattern() { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public Tolerate2 withPattern(final Pattern pattern) { return this.pattern == pattern ? this : new Tolerate2(pattern); } @java.lang.SuppressWarnings("all") + @lombok.Generated public Tolerate2(final Pattern pattern) { this.pattern = pattern; } diff --git a/test/transform/resource/after-delombok/TypeUseAnnotations.java b/test/transform/resource/after-delombok/TypeUseAnnotations.java index 37c24c53cb..9b4b731c4b 100644 --- a/test/transform/resource/after-delombok/TypeUseAnnotations.java +++ b/test/transform/resource/after-delombok/TypeUseAnnotations.java @@ -9,16 +9,15 @@ class TypeUseAnnotations { List<@TA(x = 5) String> foo; List bar; - class Inner { } - @java.lang.SuppressWarnings("all") + @lombok.Generated public List<@TA(x = 5) String> getFoo() { return this.foo; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public List getBar() { return this.bar; } diff --git a/test/transform/resource/after-delombok/UtilityClass.java b/test/transform/resource/after-delombok/UtilityClass.java index 1d541b6e98..983fbc29c3 100644 --- a/test/transform/resource/after-delombok/UtilityClass.java +++ b/test/transform/resource/after-delombok/UtilityClass.java @@ -12,6 +12,7 @@ protected static class InnerStaticClass { private String innerInnerMember; } @java.lang.SuppressWarnings("all") + @lombok.Generated private UtilityClass() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -21,6 +22,7 @@ static class InnerInner { static final class InnerInnerInner { static int member; @java.lang.SuppressWarnings("all") + @lombok.Generated private InnerInnerInner() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -31,6 +33,7 @@ enum UtilityInsideEnum { static final class InsideEnum { static int member; @java.lang.SuppressWarnings("all") + @lombok.Generated private InsideEnum() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -40,6 +43,7 @@ interface UtilityInsideInterface { final class InsideInterface { static int member; @java.lang.SuppressWarnings("all") + @lombok.Generated private InsideInterface() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } diff --git a/test/transform/resource/after-delombok/UtilityClassGeneric.java b/test/transform/resource/after-delombok/UtilityClassGeneric.java index 469d2d019c..82bd1630a8 100644 --- a/test/transform/resource/after-delombok/UtilityClassGeneric.java +++ b/test/transform/resource/after-delombok/UtilityClassGeneric.java @@ -2,20 +2,17 @@ final class UtilityClassGeneric { static T convertValue(Class toValueType) { return null; } - static DTO convert(Object json) { return convertValue(DTO.class); } - static Object convert(DTO dto) { return null; } - static class DTO { } - @java.lang.SuppressWarnings("all") + @lombok.Generated private UtilityClassGeneric() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/UtilityClassInner.java b/test/transform/resource/after-delombok/UtilityClassInner.java index 72f1656a90..4c4c674377 100644 --- a/test/transform/resource/after-delombok/UtilityClassInner.java +++ b/test/transform/resource/after-delombok/UtilityClassInner.java @@ -1,8 +1,9 @@ class UtilityClassInner { static final class UtilClass { @java.lang.SuppressWarnings("all") + @lombok.Generated private UtilClass() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/ValueCallSuper.java b/test/transform/resource/after-delombok/ValueCallSuper.java index 5598779fbb..5e21ffec4d 100644 --- a/test/transform/resource/after-delombok/ValueCallSuper.java +++ b/test/transform/resource/after-delombok/ValueCallSuper.java @@ -2,10 +2,12 @@ class ValueParent { } final class ValueCallSuper extends ValueParent { @java.lang.SuppressWarnings("all") + @lombok.Generated public ValueCallSuper() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueCallSuper)) return false; @@ -15,17 +17,20 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof ValueCallSuper; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = super.hashCode(); return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ValueCallSuper()"; } diff --git a/test/transform/resource/after-delombok/ValueInAnonymousClass.java b/test/transform/resource/after-delombok/ValueInAnonymousClass.java index 5bab409312..5e776acd56 100644 --- a/test/transform/resource/after-delombok/ValueInAnonymousClass.java +++ b/test/transform/resource/after-delombok/ValueInAnonymousClass.java @@ -1,21 +1,20 @@ public class ValueInAnonymousClass { Object annonymous = new Object() { - final class Inner { private final String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner(final String string) { this.string = string; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public String getString() { return this.string; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Inner)) return false; @@ -25,9 +24,9 @@ public boolean equals(final java.lang.Object o) { if (this$string == null ? other$string != null : !this$string.equals(other$string)) return false; return true; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -35,9 +34,9 @@ public int hashCode() { result = result * PRIME + ($string == null ? 43 : $string.hashCode()); return result; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Inner(string=" + this.getString() + ")"; } diff --git a/test/transform/resource/after-delombok/ValuePlain.java b/test/transform/resource/after-delombok/ValuePlain.java index cf2c1142c3..db830f9ee1 100644 --- a/test/transform/resource/after-delombok/ValuePlain.java +++ b/test/transform/resource/after-delombok/ValuePlain.java @@ -2,20 +2,24 @@ final class Value1 { private final int x; private final String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Value1(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value1)) return false; @@ -28,6 +32,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -38,6 +43,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Value1(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -46,20 +52,24 @@ class Value2 { public final int x; private final String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Value2(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value2)) return false; @@ -72,11 +82,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Value2; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -87,6 +99,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Value2(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -95,20 +108,24 @@ final class Value3 { private int x; private final int y; @java.lang.SuppressWarnings("all") + @lombok.Generated public Value3(final int x, final int y) { this.x = x; this.y = y; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getY() { return this.y; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value3)) return false; @@ -119,6 +136,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -128,6 +146,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Value3(x=" + this.getX() + ", y=" + this.getY() + ")"; } diff --git a/test/transform/resource/after-delombok/ValueStaticConstructorOf.java b/test/transform/resource/after-delombok/ValueStaticConstructorOf.java index e45646289e..2adcdf90d9 100644 --- a/test/transform/resource/after-delombok/ValueStaticConstructorOf.java +++ b/test/transform/resource/after-delombok/ValueStaticConstructorOf.java @@ -6,19 +6,23 @@ private ValueStaticConstructorOf(String name, Double price) { this.price = price; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static ValueStaticConstructorOf of(final String name, final Double price) { return new ValueStaticConstructorOf(name, price); } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Double getPrice() { return this.price; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueStaticConstructorOf)) return false; @@ -33,6 +37,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -44,6 +49,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ValueStaticConstructorOf(name=" + this.getName() + ", price=" + this.getPrice() + ")"; } diff --git a/test/transform/resource/after-delombok/ValueStaticField.java b/test/transform/resource/after-delombok/ValueStaticField.java index 3ba53faf73..713793acbc 100644 --- a/test/transform/resource/after-delombok/ValueStaticField.java +++ b/test/transform/resource/after-delombok/ValueStaticField.java @@ -2,10 +2,12 @@ final class ValueStaticField { static int x; static String PASSWORD = "Ken sent me"; @java.lang.SuppressWarnings("all") + @lombok.Generated public ValueStaticField() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueStaticField)) return false; @@ -13,12 +15,14 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ValueStaticField()"; } diff --git a/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java index 543481e84b..3d86ef7814 100644 --- a/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java @@ -1,15 +1,18 @@ final class ValueWithJavaBeansSpecCapitalization { private final int aField; @java.lang.SuppressWarnings("all") + @lombok.Generated public ValueWithJavaBeansSpecCapitalization(final int aField) { this.aField = aField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getaField() { return this.aField; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueWithJavaBeansSpecCapitalization)) return false; @@ -19,6 +22,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -27,7 +31,8 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ValueWithJavaBeansSpecCapitalization(aField=" + this.getaField() + ")"; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/WithAlreadyExists.java b/test/transform/resource/after-delombok/WithAlreadyExists.java index 6997deb91a..a96db1624b 100644 --- a/test/transform/resource/after-delombok/WithAlreadyExists.java +++ b/test/transform/resource/after-delombok/WithAlreadyExists.java @@ -36,6 +36,7 @@ void withFoo() { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public With5 withFoo(final String foo) { return this.foo == foo ? this : new With5(foo); } @@ -50,6 +51,7 @@ void withFoo(String foo, int x) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public With6 withFoo(final String foo) { return this.foo == foo ? this : new With6(foo); } diff --git a/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java index 4a88bb0e0c..31945699ba 100644 --- a/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java +++ b/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java @@ -5,6 +5,7 @@ class WithAndAllArgsConstructor { int y = 20; final int z; @java.lang.SuppressWarnings("all") + @lombok.Generated public WithAndAllArgsConstructor(final J test, final java.util.List test2, final int y, final int z) { this.test = test; this.test2 = test2; @@ -15,6 +16,7 @@ public WithAndAllArgsConstructor(final J test, final java.util.List test2, fi * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithAndAllArgsConstructor withTest(final J test) { return this.test == test ? this : new WithAndAllArgsConstructor(test, this.test2, this.y, this.z); } @@ -22,6 +24,7 @@ public WithAndAllArgsConstructor withTest(final J test) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithAndAllArgsConstructor withTest2(final java.util.List test2) { return this.test2 == test2 ? this : new WithAndAllArgsConstructor(this.test, test2, this.y, this.z); } diff --git a/test/transform/resource/after-delombok/WithByInAnonymousClass.java b/test/transform/resource/after-delombok/WithByInAnonymousClass.java index d84955b614..aeaaa2fa80 100644 --- a/test/transform/resource/after-delombok/WithByInAnonymousClass.java +++ b/test/transform/resource/after-delombok/WithByInAnonymousClass.java @@ -1,14 +1,12 @@ //version 8: public class WithByInAnonymousClass { Object annonymous = new Object() { - class Inner { private Inner(String string) { } - private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner withStringBy(final java.util.function.Function transformer) { return new Inner(transformer.apply(this.string)); } diff --git a/test/transform/resource/after-delombok/WithByNullAnnos.java b/test/transform/resource/after-delombok/WithByNullAnnos.java index 04d64f16f4..e69bdafe68 100644 --- a/test/transform/resource/after-delombok/WithByNullAnnos.java +++ b/test/transform/resource/after-delombok/WithByNullAnnos.java @@ -3,11 +3,13 @@ public class WithByNullAnnos { final List test; @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByNullAnnos(final List test) { this.test = test; } @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByNullAnnos withTestBy(final java.util.function.@org.checkerframework.checker.nullness.qual.NonNull Function, ? extends List> transformer) { return new WithByNullAnnos(transformer.apply(this.test)); } diff --git a/test/transform/resource/after-delombok/WithByOnRecord.java b/test/transform/resource/after-delombok/WithByOnRecord.java index 4d1ccd0132..83b9f40dc1 100644 --- a/test/transform/resource/after-delombok/WithByOnRecord.java +++ b/test/transform/resource/after-delombok/WithByOnRecord.java @@ -1,10 +1,12 @@ // version 14: public record WithByOnRecord(String a, String b) { @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByOnRecord withABy(final java.util.function.Function transformer) { return new WithByOnRecord(transformer.apply(this.a), this.b); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByOnRecord withBBy(final java.util.function.Function transformer) { return new WithByOnRecord(this.a, transformer.apply(this.b)); } diff --git a/test/transform/resource/after-delombok/WithByOnRecordComponent.java b/test/transform/resource/after-delombok/WithByOnRecordComponent.java index 851c5560c8..81e1d55a75 100644 --- a/test/transform/resource/after-delombok/WithByOnRecordComponent.java +++ b/test/transform/resource/after-delombok/WithByOnRecordComponent.java @@ -1,6 +1,7 @@ // version 14: public record WithByOnRecordComponent(String a, String b) { @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByOnRecordComponent withABy(final java.util.function.Function transformer) { return new WithByOnRecordComponent(transformer.apply(this.a), this.b); } diff --git a/test/transform/resource/after-delombok/WithByTypes.java b/test/transform/resource/after-delombok/WithByTypes.java index f1f1ef5f00..d9ee4f64c9 100644 --- a/test/transform/resource/after-delombok/WithByTypes.java +++ b/test/transform/resource/after-delombok/WithByTypes.java @@ -13,6 +13,7 @@ public static void example() { new WithByTypes(0, 0, (short) 0, ' ', (byte) 0, 0.0, 0.0F, true, "").withHBy(x -> !x).withFBy(x -> x + 0.5); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes(final int a, final long b, final short c, final char d, final byte e, final double f, final float g, final boolean h, final T i) { this.a = a; this.b = b; @@ -25,39 +26,48 @@ public WithByTypes(final int a, final long b, final short c, final char d, final this.i = i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withABy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(transformer.applyAsInt(this.a), this.b, this.c, this.d, this.e, this.f, this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withBBy(final java.util.function.LongUnaryOperator transformer) { return new WithByTypes(this.a, transformer.applyAsLong(this.b), this.c, this.d, this.e, this.f, this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withCBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, (short) transformer.applyAsInt(this.c), this.d, this.e, this.f, this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withDBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, (char) transformer.applyAsInt(this.d), this.e, this.f, this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withEBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, (byte) transformer.applyAsInt(this.e), this.f, this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withFBy(final java.util.function.DoubleUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, transformer.applyAsDouble(this.f), this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withGBy(final java.util.function.DoubleUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, (float) transformer.applyAsDouble(this.g), this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withHBy(final java.util.function.UnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, this.g, transformer.apply(this.h), this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withIBy(final java.util.function.Function transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, this.g, this.h, transformer.apply(this.i)); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/WithInAnonymousClass.java b/test/transform/resource/after-delombok/WithInAnonymousClass.java index 0249053331..929ecbf2f9 100644 --- a/test/transform/resource/after-delombok/WithInAnonymousClass.java +++ b/test/transform/resource/after-delombok/WithInAnonymousClass.java @@ -1,16 +1,14 @@ public class WithInAnonymousClass { Object annonymous = new Object() { - class Inner { private Inner(String string) { } - private String string; - /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner withString(final String string) { return this.string == string ? this : new Inner(string); } diff --git a/test/transform/resource/after-delombok/WithMethodAbstract.java b/test/transform/resource/after-delombok/WithMethodAbstract.java index 250330f7fc..68e0586be8 100644 --- a/test/transform/resource/after-delombok/WithMethodAbstract.java +++ b/test/transform/resource/after-delombok/WithMethodAbstract.java @@ -4,5 +4,6 @@ abstract class WithMethodAbstract { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract WithMethodAbstract withFoo(final String foo); } diff --git a/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java b/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java index dad6ff9b3c..cc7fc1c89a 100644 --- a/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java +++ b/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java @@ -12,6 +12,7 @@ class WithMethodMarkedDeprecated { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public WithMethodMarkedDeprecated withAnnotation(final int annotation) { return this.annotation == annotation ? this : new WithMethodMarkedDeprecated(annotation, this.javadoc); } @@ -21,6 +22,7 @@ public WithMethodMarkedDeprecated withAnnotation(final int annotation) { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public WithMethodMarkedDeprecated withJavadoc(final int javadoc) { return this.javadoc == javadoc ? this : new WithMethodMarkedDeprecated(this.annotation, javadoc); } diff --git a/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java b/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java index 41139a0fda..a2f4561c37 100644 --- a/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java +++ b/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java @@ -8,6 +8,7 @@ class WithMethodMarkedDeprecatedAnnOnly { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public WithMethodMarkedDeprecatedAnnOnly withAnnotation(final int annotation) { return this.annotation == annotation ? this : new WithMethodMarkedDeprecatedAnnOnly(annotation); } diff --git a/test/transform/resource/after-delombok/WithNested.java b/test/transform/resource/after-delombok/WithNested.java index b186dabfd1..c6e460648d 100644 --- a/test/transform/resource/after-delombok/WithNested.java +++ b/test/transform/resource/after-delombok/WithNested.java @@ -2,6 +2,7 @@ public interface WithNested { class IAmStaticReally { final String x; @java.lang.SuppressWarnings("all") + @lombok.Generated public IAmStaticReally(final String x) { this.x = x; } @@ -9,6 +10,7 @@ public IAmStaticReally(final String x) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithNested.IAmStaticReally withX(final String x) { return this.x == x ? this : new WithNested.IAmStaticReally(x); } diff --git a/test/transform/resource/after-delombok/WithOnClass.java b/test/transform/resource/after-delombok/WithOnClass.java index 0fa973eb45..6b85e6fa14 100644 --- a/test/transform/resource/after-delombok/WithOnClass.java +++ b/test/transform/resource/after-delombok/WithOnClass.java @@ -8,6 +8,7 @@ class WithOnClass1 { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnClass1 withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WithOnClass1(this.isNone, isPublic); } @@ -22,6 +23,7 @@ class WithOnClass2 { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated protected WithOnClass2 withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WithOnClass2(this.isNone, isProtected, this.isPackage); } @@ -29,6 +31,7 @@ protected WithOnClass2 withProtected(final boolean isProtected) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated WithOnClass2 withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WithOnClass2(this.isNone, this.isProtected, isPackage); } @@ -43,6 +46,7 @@ class WithOnClass3 { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnClass3 withCouldBeNull(final String couldBeNull) { return this.couldBeNull == couldBeNull ? this : new WithOnClass3(couldBeNull, this.nonNull); } @@ -50,6 +54,7 @@ public WithOnClass3 withCouldBeNull(final String couldBeNull) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnClass3 withNonNull(@lombok.NonNull final String nonNull) { if (nonNull == null) { throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); @@ -67,6 +72,7 @@ class WithOnClass4 { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnClass4 withY(final int fY) { return this.fY == fY ? this : new WithOnClass4(fY); } diff --git a/test/transform/resource/after-delombok/WithOnNestedRecord.java b/test/transform/resource/after-delombok/WithOnNestedRecord.java index 89a7547818..8a82212692 100644 --- a/test/transform/resource/after-delombok/WithOnNestedRecord.java +++ b/test/transform/resource/after-delombok/WithOnNestedRecord.java @@ -1,19 +1,19 @@ // version 14: public record WithOnNestedRecord() { - public record Nested(String a, String b) { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnNestedRecord.Nested withA(final String a) { return this.a == a ? this : new WithOnNestedRecord.Nested(a, this.b); } - /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnNestedRecord.Nested withB(final String b) { return this.b == b ? this : new WithOnNestedRecord.Nested(this.a, b); } diff --git a/test/transform/resource/after-delombok/WithOnRecord.java b/test/transform/resource/after-delombok/WithOnRecord.java index 5c2f0a8f46..778d994026 100644 --- a/test/transform/resource/after-delombok/WithOnRecord.java +++ b/test/transform/resource/after-delombok/WithOnRecord.java @@ -4,6 +4,7 @@ public record WithOnRecord(String a, String b) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnRecord withA(final String a) { return this.a == a ? this : new WithOnRecord(a, this.b); } @@ -11,6 +12,7 @@ public WithOnRecord withA(final String a) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnRecord withB(final String b) { return this.b == b ? this : new WithOnRecord(this.a, b); } diff --git a/test/transform/resource/after-delombok/WithOnRecordComponent.java b/test/transform/resource/after-delombok/WithOnRecordComponent.java index 217da88af9..806e17a5e3 100644 --- a/test/transform/resource/after-delombok/WithOnRecordComponent.java +++ b/test/transform/resource/after-delombok/WithOnRecordComponent.java @@ -4,6 +4,7 @@ public record WithOnRecordComponent(String a, String b) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnRecordComponent withA(final String a) { return this.a == a ? this : new WithOnRecordComponent(a, this.b); } diff --git a/test/transform/resource/after-delombok/WithPlain.java b/test/transform/resource/after-delombok/WithPlain.java index 6a1c46e6c5..aff3eb7370 100644 --- a/test/transform/resource/after-delombok/WithPlain.java +++ b/test/transform/resource/after-delombok/WithPlain.java @@ -11,6 +11,7 @@ class WithPlain { */ @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public WithPlain withI(final int i) { return this.i == i ? this : new WithPlain(i, this.foo); } @@ -19,6 +20,7 @@ public WithPlain withI(final int i) { */ @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public WithPlain withFoo(final int foo) { return this.foo == foo ? this : new WithPlain(this.i, foo); } diff --git a/test/transform/resource/after-delombok/WithWithGenerics.java b/test/transform/resource/after-delombok/WithWithGenerics.java index d1cd3380bd..971da8832f 100644 --- a/test/transform/resource/after-delombok/WithWithGenerics.java +++ b/test/transform/resource/after-delombok/WithWithGenerics.java @@ -9,6 +9,7 @@ public WithWithGenerics(J test, java.util.List test2, java.util.List withTest(final J test) { return this.test == test ? this : new WithWithGenerics(test, this.test2, this.test3); } @@ -16,6 +17,7 @@ public WithWithGenerics withTest(final J test) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithWithGenerics withTest2(final java.util.List test2) { return this.test2 == test2 ? this : new WithWithGenerics(this.test, test2, this.test3); } @@ -23,6 +25,7 @@ public WithWithGenerics withTest2(final java.util.List test2) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithWithGenerics withTest3(final java.util.List test3) { return this.test3 == test3 ? this : new WithWithGenerics(this.test, this.test2, test3); } diff --git a/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java index e3737848a8..6bbbad1fe1 100644 --- a/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java @@ -6,6 +6,7 @@ class WithWithJavaBeansSpecCapitalization { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithWithJavaBeansSpecCapitalization withaField(final int aField) { return this.aField == aField ? this : new WithWithJavaBeansSpecCapitalization(aField); } diff --git a/test/transform/resource/after-delombok/WithWithTypeAnnos.java b/test/transform/resource/after-delombok/WithWithTypeAnnos.java index 8bc1dc8825..724b40e68b 100644 --- a/test/transform/resource/after-delombok/WithWithTypeAnnos.java +++ b/test/transform/resource/after-delombok/WithWithTypeAnnos.java @@ -18,6 +18,7 @@ class WithWithTypeAnnos { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithWithTypeAnnos withFoo(@TA final List foo) { return this.foo == foo ? this : new WithWithTypeAnnos(foo); } diff --git a/test/transform/resource/after-delombok/WitherAccessLevel.java b/test/transform/resource/after-delombok/WitherAccessLevel.java index eec79cb6ad..c2c820ea88 100644 --- a/test/transform/resource/after-delombok/WitherAccessLevel.java +++ b/test/transform/resource/after-delombok/WitherAccessLevel.java @@ -11,6 +11,7 @@ class WitherAccessLevel { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated private WitherAccessLevel withPrivate(final boolean isPrivate) { return this.isPrivate == isPrivate ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value); } @@ -18,6 +19,7 @@ private WitherAccessLevel withPrivate(final boolean isPrivate) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated WitherAccessLevel withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value); } @@ -25,6 +27,7 @@ WitherAccessLevel withPackage(final boolean isPackage) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated protected WitherAccessLevel withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value); } @@ -32,6 +35,7 @@ protected WitherAccessLevel withProtected(final boolean isProtected) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WitherAccessLevel withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value); } @@ -39,6 +43,7 @@ public WitherAccessLevel withPublic(final boolean isPublic) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WitherAccessLevel withValue(final boolean value) { return this.value == value ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value); } diff --git a/test/transform/resource/after-delombok/WitherLegacyStar.java b/test/transform/resource/after-delombok/WitherLegacyStar.java index 90d55ceeac..5bb12fe7ba 100644 --- a/test/transform/resource/after-delombok/WitherLegacyStar.java +++ b/test/transform/resource/after-delombok/WitherLegacyStar.java @@ -7,6 +7,7 @@ class WitherLegacyStar { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WitherLegacyStar withI(final int i) { return this.i == i ? this : new WitherLegacyStar(i); } From 711ddc184ff4aa2dab7d289182db72756b5b85f0 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:38:55 +0200 Subject: [PATCH 031/118] [tests] Continue with adjusting tests to reflect `lombok.Generated` defaulted: javac usually skipped tests. --- .../resource/after-delombok/OnXJava7Style.java | 12 +++++++++--- .../after-delombok/TrickyTypeResolution.java | 1 + .../after-delombok/ValDelegateMethodReference.java | 8 ++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/test/transform/resource/after-delombok/OnXJava7Style.java b/test/transform/resource/after-delombok/OnXJava7Style.java index 67f8c8c833..9dc0946b08 100644 --- a/test/transform/resource/after-delombok/OnXJava7Style.java +++ b/test/transform/resource/after-delombok/OnXJava7Style.java @@ -20,48 +20,54 @@ public class OnXJava7Style { String i; @Foo @java.lang.SuppressWarnings("all") + @lombok.Generated public String getA() { return this.a; } @Foo @java.lang.SuppressWarnings("all") + @lombok.Generated public void setB(final String b) { this.b = b; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setC(@Foo("a") final String c) { this.c = c; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setD(@Bar(stuff = "b") final String d) { this.d = d; } @Foo("c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") + @lombok.Generated public String getE() { return this.e; } @Array @java.lang.SuppressWarnings("all") + @lombok.Generated public String getF() { return this.f; } - @Array @java.lang.SuppressWarnings("all") + @lombok.Generated public String getG() { return this.g; } - @Array({}) @java.lang.SuppressWarnings("all") + @lombok.Generated public String getH() { return this.h; } - @Array({"a", "b"}) @java.lang.SuppressWarnings("all") + @lombok.Generated public String getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/TrickyTypeResolution.java b/test/transform/resource/after-delombok/TrickyTypeResolution.java index 9a5aae16d6..d8d4b56ca3 100644 --- a/test/transform/resource/after-delombok/TrickyTypeResolution.java +++ b/test/transform/resource/after-delombok/TrickyTypeResolution.java @@ -14,6 +14,7 @@ class TrickyDoNothing2 { class TrickySuccess { int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/ValDelegateMethodReference.java b/test/transform/resource/after-delombok/ValDelegateMethodReference.java index c62edd660b..2a3f9b6627 100644 --- a/test/transform/resource/after-delombok/ValDelegateMethodReference.java +++ b/test/transform/resource/after-delombok/ValDelegateMethodReference.java @@ -20,21 +20,25 @@ class Entity { private MyDelegate innerDelegate; @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String getValue() { return this.innerDelegate.getValue(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.Boolean getABoolean() { return this.innerDelegate.getABoolean(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setValue(final java.lang.String value) { this.innerDelegate.setValue(value); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setABoolean(final java.lang.Boolean aBoolean) { this.innerDelegate.setABoolean(aBoolean); } @@ -45,21 +49,25 @@ class MyDelegate { private Boolean aBoolean; @java.lang.SuppressWarnings("all") + @lombok.Generated public String getValue() { return this.value; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Boolean getABoolean() { return this.aBoolean; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setValue(final String value) { this.value = value; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setABoolean(final Boolean aBoolean) { this.aBoolean = aBoolean; } From 6dc8e08c0d7fad17818302b278b12d44580e74e9 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:45:28 +0200 Subject: [PATCH 032/118] [fixes #3667] [changelog] --- doc/changelog.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 68bf748288..64572a71ed 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -3,6 +3,7 @@ Lombok Changelog ### v1.18.33 "Edgy Guinea Pig" * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). +* IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [https://github.com/projectlombok/lombok/issues/3667](https://github.com/projectlombok/lombok/issues/3638). ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. From c47d7c07bb927fcf24fc3ab9064a8b1a8d87b971 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Fri, 17 May 2024 12:34:03 +0200 Subject: [PATCH 033/118] Fix link name --- doc/changelog.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 64572a71ed..3502e18a41 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -3,7 +3,7 @@ Lombok Changelog ### v1.18.33 "Edgy Guinea Pig" * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). -* IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [https://github.com/projectlombok/lombok/issues/3667](https://github.com/projectlombok/lombok/issues/3638). +* IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3638). ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. From bcf015fe18ec86535790a1453390f9345ed5202c Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Fri, 17 May 2024 12:46:25 +0200 Subject: [PATCH 034/118] Use correct issue link --- doc/changelog.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 3502e18a41..6dd62f4d2b 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -3,7 +3,7 @@ Lombok Changelog ### v1.18.33 "Edgy Guinea Pig" * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). -* IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3638). +* IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3667). ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. From ea2c7ea4cc8150ab2e7165913cfa69edfe565730 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 17:16:44 +0200 Subject: [PATCH 035/118] [tests] Fixing up a few tests --- test/core/src/lombok/AbstractRunTests.java | 2 +- test/transform/resource/after-delombok/MixGetterVal.java | 1 + test/transform/resource/after-ecj/LoggerFloggerRecord.java | 2 +- .../resource/messages-idempotent/NonNullPlain.java.messages | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java index 6877bcfadd..3397a61205 100644 --- a/test/core/src/lombok/AbstractRunTests.java +++ b/test/core/src/lombok/AbstractRunTests.java @@ -51,7 +51,7 @@ import lombok.transform.TestSourceFiles; public abstract class AbstractRunTests { - public final FileTester createTester(final DirectoryRunner.TestParams params, final File file, String platform, int version, boolean copyToSource) throws IOException { + public final FileTester createTester(final DirectoryRunner.TestParams params, final File file, String platform, int version, final boolean copyToSource) throws IOException { ConfigurationKeysLoader.LoaderLoader.loadAllConfigurationKeys(); AssertionError directiveFailure = null; LombokTestSource sourceDirectives = null; diff --git a/test/transform/resource/after-delombok/MixGetterVal.java b/test/transform/resource/after-delombok/MixGetterVal.java index a2b44ea099..2c1921c33d 100644 --- a/test/transform/resource/after-delombok/MixGetterVal.java +++ b/test/transform/resource/after-delombok/MixGetterVal.java @@ -9,6 +9,7 @@ public void test() { m(a); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-ecj/LoggerFloggerRecord.java b/test/transform/resource/after-ecj/LoggerFloggerRecord.java index 47bf4cc6e6..7db8aabebb 100644 --- a/test/transform/resource/after-ecj/LoggerFloggerRecord.java +++ b/test/transform/resource/after-ecj/LoggerFloggerRecord.java @@ -3,7 +3,7 @@ class LoggerFloggerRecord { public @Flogger record Inner(String x) { /* Implicit */ private final String x; - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } } diff --git a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages index 3a3a052dad..236f276d58 100644 --- a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages +++ b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages @@ -1,3 +1,3 @@ -3 @NonNull is meaningless on a primitive. -14 @NonNull is meaningless on a primitive. -36 @NonNull is meaningless on a primitive. +4 @NonNull is meaningless on a primitive. +16 @NonNull is meaningless on a primitive. +42 @NonNull is meaningless on a primitive. From 6585ca08870b8c6313cc80618be4f302b178b701 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Mon, 18 Mar 2024 17:58:20 +0100 Subject: [PATCH 036/118] Support for new CaseStatement constructor --- src/utils/lombok/eclipse/Eclipse.java | 59 ++++++++++++++++++++------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/src/utils/lombok/eclipse/Eclipse.java b/src/utils/lombok/eclipse/Eclipse.java index 624e521a49..e5afa7fd7b 100644 --- a/src/utils/lombok/eclipse/Eclipse.java +++ b/src/utils/lombok/eclipse/Eclipse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2021 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,6 +21,7 @@ */ package lombok.eclipse; +import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; @@ -279,22 +280,50 @@ private static boolean ecjSupportsJava7Features() { } } - private static boolean caseStatementInit = false; - private static Field caseStatementConstantExpressions = null; + private static final Field CASE_STATEMENT_CONSTANT_EXPRESSIONS = Permit.permissiveGetField(CaseStatement.class, "constantExpressions"); + private static final Constructor CASE_STATEMENT_CONSTRUCTOR_SINGLE; + private static final Constructor CASE_STATEMENT_CONSTRUCTOR_ARRAY; + private static final Expression[] EMPTY_EXPRESSIONS; + static { + Constructor constructorSingle = null, constructorArray = null; + Expression[] emptyExpressions = new Expression[0]; + + try { + constructorSingle = Permit.getConstructor(CaseStatement.class, Expression.class, int.class, int.class); + } catch (NoSuchMethodException ignore) { + } + + try { + constructorArray = Permit.getConstructor(CaseStatement.class, Expression[].class, int.class, int.class); + } catch (NoSuchMethodException ignore) { + } + + try { + emptyExpressions = Permit.get(Permit.permissiveGetField(Expression.class, "NO_EXPRESSIONS"), null); + } catch (Throwable ignore) { + } + + CASE_STATEMENT_CONSTRUCTOR_SINGLE = constructorSingle; + CASE_STATEMENT_CONSTRUCTOR_ARRAY = constructorArray; + EMPTY_EXPRESSIONS = emptyExpressions; + } public static CaseStatement createCaseStatement(Expression expr) { - CaseStatement stat = new CaseStatement(expr, 0, 0); - if (expr == null) return stat; - if (!caseStatementInit) { - try { - caseStatementConstantExpressions = Permit.getField(CaseStatement.class, "constantExpressions"); - caseStatementConstantExpressions.setAccessible(true); - } catch (NoSuchFieldException ignore) {} - caseStatementInit = true; + final CaseStatement stat; + if (CASE_STATEMENT_CONSTRUCTOR_SINGLE != null) { + stat = Permit.newInstanceSneaky(CASE_STATEMENT_CONSTRUCTOR_SINGLE, expr, 0, 0); + if (stat != null && expr != null && CASE_STATEMENT_CONSTANT_EXPRESSIONS != null) { + try { + Permit.set(CASE_STATEMENT_CONSTANT_EXPRESSIONS, stat, new Expression[] {expr}); + } catch (IllegalAccessException ignore) { + } + } + } else { + Expression[] expressions = EMPTY_EXPRESSIONS; + if (expr != null) { + expressions = new Expression[] {expr}; + } + stat = Permit.newInstanceSneaky(CASE_STATEMENT_CONSTRUCTOR_ARRAY, expressions, 0, 0); } - if (caseStatementConstantExpressions != null) try { - caseStatementConstantExpressions.set(stat, new Expression[] {expr}); - } catch (IllegalArgumentException ignore) { - } catch (IllegalAccessException ignore) {} return stat; } } From 19a55d0cc232dc44c8759dee70c2137198e9cf9a Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Tue, 19 Mar 2024 17:43:05 +0100 Subject: [PATCH 037/118] Add dynamic selection of eclipse class in CleanupTest --- .../src/lombok/eclipse/cleanup/CleanupTest.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/test/eclipse/src/lombok/eclipse/cleanup/CleanupTest.java b/test/eclipse/src/lombok/eclipse/cleanup/CleanupTest.java index 76956aff5f..ba29926e36 100644 --- a/test/eclipse/src/lombok/eclipse/cleanup/CleanupTest.java +++ b/test/eclipse/src/lombok/eclipse/cleanup/CleanupTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Project Lombok Authors. + * Copyright (C) 2022-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,6 +23,8 @@ import static lombok.eclipse.RefactoringUtils.performRefactoring; +import java.lang.reflect.Constructor; +import java.util.Map; import java.util.Map.Entry; import org.eclipse.jdt.core.ICompilationUnit; @@ -30,8 +32,8 @@ import org.eclipse.jdt.internal.corext.fix.CleanUpRefactoring; import org.eclipse.jdt.internal.corext.fix.CleanUpRegistry; import org.eclipse.jdt.internal.ui.JavaPlugin; -import org.eclipse.jdt.internal.ui.fix.CodeStyleCleanUp; import org.eclipse.jdt.internal.ui.fix.MapCleanUpOptions; +import org.eclipse.jdt.ui.cleanup.ICleanUp; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -59,7 +61,16 @@ public void useThis() throws Exception { CleanUpRefactoring ref = new CleanUpRefactoring(); ref.addCompilationUnit(cu); - ref.addCleanUp(new CodeStyleCleanUp(options.getMap())); + + // Load the class dynamically to avoid compile errors when running with older versions of Eclipse + Class cleanUpClass; + try { + cleanUpClass = Class.forName("org.eclipse.jdt.internal.ui.fix.CodeStyleCleanUp"); + } catch (ClassNotFoundException e) { + cleanUpClass = Class.forName("org.eclipse.jdt.internal.ui.fix.CodeStyleCleanUpCore"); + } + Constructor cleanUpConstructor = cleanUpClass.getConstructor(Map.class); + ref.addCleanUp((ICleanUp) cleanUpConstructor.newInstance(options.getMap())); performRefactoring(ref); } From 77761d9ff7a5ae06bc1fa0957abfb05b0a5887e1 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 14 May 2024 02:11:21 +0200 Subject: [PATCH 038/118] [changelog] [#3638] Reflect fix of issue in previous commit --- doc/changelog.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 7303de1742..68bf748288 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -2,7 +2,7 @@ Lombok Changelog ---------------- ### v1.18.33 "Edgy Guinea Pig" -* We recently released v1.18.32; there is no edge release since then. +* PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. From 8a99ac7d48508754e06a9821b749c248fcef438d Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 01:18:38 +0200 Subject: [PATCH 039/118] [trivial] toss out an unused import --- test/bytecode/src/lombok/bytecode/TestPostCompiler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/test/bytecode/src/lombok/bytecode/TestPostCompiler.java b/test/bytecode/src/lombok/bytecode/TestPostCompiler.java index 3814e00df8..02185f7e56 100644 --- a/test/bytecode/src/lombok/bytecode/TestPostCompiler.java +++ b/test/bytecode/src/lombok/bytecode/TestPostCompiler.java @@ -24,7 +24,6 @@ import static org.junit.Assert.*; import java.io.File; -import java.io.IOException; import lombok.core.DiagnosticsReceiver; import lombok.core.PostCompiler; From 280d12c62d6e7bc2f776109dc50e910d2bae8a17 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 01:44:14 +0200 Subject: [PATCH 040/118] [test-framework] Allow deity decrees when testing: We _know_ lombok is correct, it is the tests that are wrong: Useful for small refactors that cause big test file changes. --- test/core/src/lombok/AbstractRunTests.java | 126 ++++++++++++--------- test/core/src/lombok/DirectoryRunner.java | 13 ++- test/core/src/lombok/LombokTestSource.java | 30 +++-- 3 files changed, 103 insertions(+), 66 deletions(-) diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java index 0cb379ff7f..6877bcfadd 100644 --- a/test/core/src/lombok/AbstractRunTests.java +++ b/test/core/src/lombok/AbstractRunTests.java @@ -25,10 +25,12 @@ import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.io.InputStreamReader; import java.net.URI; import java.util.ArrayList; import java.util.Collection; @@ -49,13 +51,7 @@ import lombok.transform.TestSourceFiles; public abstract class AbstractRunTests { - private final File dumpActualFilesHere; - - public AbstractRunTests() { - this.dumpActualFilesHere = findPlaceToDumpActualFiles(); - } - - public final FileTester createTester(final DirectoryRunner.TestParams params, final File file, String platform, int version) throws IOException { + public final FileTester createTester(final DirectoryRunner.TestParams params, final File file, String platform, int version, boolean copyToSource) throws IOException { ConfigurationKeysLoader.LoaderLoader.loadAllConfigurationKeys(); AssertionError directiveFailure = null; LombokTestSource sourceDirectives = null; @@ -107,7 +103,7 @@ public final FileTester createTester(final DirectoryRunner.TestParams params, fi if (params.expectChanges() && !forceUnchanged && !changed) result.addMessage(new CompilerMessage(-1, -1, true, "not flagged modified")); if (!params.expectChanges() && changed) result.addMessage(new CompilerMessage(-1, -1, true, "unexpected modification")); - compare(file.getName(), expected, result, params.printErrors(), sourceDirectives_.isSkipCompareContent() || expected.isSkipCompareContent()); + compare(file.getName(), expected, result, params.printErrors(), sourceDirectives_.isSkipCompareContent() || expected.isSkipCompareContent(), copyToSource); } }; } @@ -131,20 +127,34 @@ protected String readFile(File file) throws IOException { return result.toString(); } - private static File findPlaceToDumpActualFiles() { - String location = System.getProperty("lombok.tests.dump_actual_files"); - if (location != null) { - File dumpActualFilesHere = new File(location); - dumpActualFilesHere.mkdirs(); - return dumpActualFilesHere; - } - return null; - } - private static void dumpToFile(File file, String content) throws IOException { + List directives = new ArrayList(); + + if (file.exists()) { + BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8")); + try { + while (true) { + String line = br.readLine(); + if (line == null) break; + if (line.startsWith("//")) directives.add(line); + else if (!line.isEmpty()) break; + } + } finally { + br.close(); + } + } + FileOutputStream fos = new FileOutputStream(file); try { - fos.write(content.getBytes("UTF-8")); + for (String directive : directives) fos.write((directive + "\n").getBytes("UTF-8")); + + boolean atStart = true; + for (String line : content.split("(\\r?\\n)")) { + if (line.isEmpty()) continue; + if (atStart && line.startsWith("//")) continue; + atStart = false; + fos.write((line + "\n").getBytes("UTF-8")); + } } finally { fos.close(); } @@ -152,6 +162,7 @@ private static void dumpToFile(File file, String content) throws IOException { private static void dumpToFile(File file, Collection content) throws IOException { FileOutputStream fos = new FileOutputStream(file); + System.err.println(">>> DUMPING ERR MSG: " + file.getAbsolutePath()); try { for (CompilerMessage message : content) { fos.write(CompilerMessageMatcher.asCompilerMessageMatcher(message).toString().getBytes("UTF-8")); @@ -162,56 +173,67 @@ private static void dumpToFile(File file, Collection content) t } } - private void compare(String name, LombokTestSource expected, TransformationResult result, boolean printErrors, boolean skipCompareContent) throws Throwable { + private void compare(String name, LombokTestSource expected, TransformationResult result, boolean printErrors, boolean skipCompareContent, boolean copyToSource) throws Throwable { String actualFile = result.getOutput(); LinkedHashSet actualMessages = result.getMessages(); if (!skipCompareContent) try { compareContent(name, expected.getContent(), actualFile); } catch (Throwable e) { - if (printErrors) { - System.out.println("***** " + name + " *****"); - System.out.println(e.getMessage()); - System.out.println("**** Expected ******"); - System.out.println(expected.getContent()); - System.out.println("**** Actual ******"); - System.out.println(actualFile); - if (actualMessages != null && !actualMessages.isEmpty()) { - System.out.println("**** Actual Errors *****"); - for (CompilerMessage actualMessage : actualMessages) { - System.out.println(actualMessage); + if (copyToSource) { + dumpToFile(expected.getSourceFile(), actualFile); + System.out.println("UPDATED: " + expected.getSourceFile()); + } else { + if (printErrors) { + System.out.println("***** " + name + " *****"); + System.out.println(e.getMessage()); + System.out.println("**** Expected ******"); + System.out.println(expected.getContent()); + System.out.println("**** Actual ******"); + System.out.println(actualFile); + if (actualMessages != null && !actualMessages.isEmpty()) { + System.out.println("**** Actual Errors *****"); + for (CompilerMessage actualMessage : actualMessages) { + System.out.println(actualMessage); + } } + System.out.println("*******************"); } - System.out.println("*******************"); - } - if (dumpActualFilesHere != null) { - dumpToFile(new File(dumpActualFilesHere, name), actualFile); + throw e; } - throw e; } try { compareMessages(name, expected.getMessages(), actualMessages); } catch (Throwable e) { - if (printErrors) { - System.out.println("***** " + name + " *****"); - System.out.println(e.getMessage()); - System.out.println("**** Expected ******"); - for (CompilerMessageMatcher expectedMessage : expected.getMessages()) { - System.out.println(expectedMessage); + if (copyToSource) { + if (actualMessages.isEmpty()) { + if (expected.getMessagesFile().exists()) { + expected.getMessagesFile().delete(); + System.out.println("DELETED: " + expected.getMessagesFile()); + } + } else { + dumpToFile(expected.getMessagesFile(), actualMessages); + System.out.println("UPDATED: " + expected.getMessagesFile()); } - System.out.println("**** Actual ******"); - for (CompilerMessage actualMessage : actualMessages) { - System.out.println(actualMessage); + } else { + if (printErrors) { + System.out.println("***** " + name + " *****"); + System.out.println(e.getMessage()); + System.out.println("**** Expected ******"); + for (CompilerMessageMatcher expectedMessage : expected.getMessages()) { + System.out.println(expectedMessage); + } + System.out.println("**** Actual ******"); + for (CompilerMessage actualMessage : actualMessages) { + System.out.println(actualMessage); + } + System.out.println("**** Actual File ******"); + System.out.println(lineNumber(actualFile)); + System.out.println("*******************"); } - System.out.println("**** Actual File ******"); - System.out.println(lineNumber(actualFile)); - System.out.println("*******************"); - } - if (dumpActualFilesHere != null) { - dumpToFile(new File(dumpActualFilesHere, name + ".messages"), actualMessages); + throw e; } - throw e; } } diff --git a/test/core/src/lombok/DirectoryRunner.java b/test/core/src/lombok/DirectoryRunner.java index 53347e2426..1ed462069d 100644 --- a/test/core/src/lombok/DirectoryRunner.java +++ b/test/core/src/lombok/DirectoryRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2021 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -42,6 +42,13 @@ public class DirectoryRunner extends Runner { private static final List DEBUG_FOCUS_ON_FILE = Arrays.asList( ); + /* + * If this is set to true, you are decreeing that all tests pass, and that any test that dares to say it does not, means the test is wrong and not lombok: The framework will update the 'target' so that it now passes. + * This is, naturally, an exceedingly dangerous tool. The general way to use it is: First ensure all tests pass, then, do some minor refactor that massively impacts the tests, then, enable this, run the tests, then turn this off again, + * then, thoroughly review your commit diff. + */ + private static final boolean ITS_ALL_GOOD = false; + public enum Compiler { DELOMBOK { @Override public int getVersion() { @@ -181,10 +188,10 @@ private FileTester createTester(String fileName) throws IOException { File file = new File(params.getBeforeDirectory(), fileName); switch (params.getCompiler()) { case DELOMBOK: - return new RunTestsViaDelombok().createTester(params, file, "javac", params.getVersion()); + return new RunTestsViaDelombok().createTester(params, file, "javac", params.getVersion(), ITS_ALL_GOOD); case ECJ: String platform = RunTestsViaEcj.eclipseAvailable() ? "eclipse" : "ecj"; - return new RunTestsViaEcj().createTester(params, file, platform, params.getVersion()); + return new RunTestsViaEcj().createTester(params, file, platform, params.getVersion(), ITS_ALL_GOOD); default: case JAVAC: throw new UnsupportedOperationException(); diff --git a/test/core/src/lombok/LombokTestSource.java b/test/core/src/lombok/LombokTestSource.java index 92bc53eab6..79203cd0b5 100644 --- a/test/core/src/lombok/LombokTestSource.java +++ b/test/core/src/lombok/LombokTestSource.java @@ -50,7 +50,8 @@ import lombok.core.configuration.SingleConfigurationSource; public class LombokTestSource { - private final File file; + private final File sourceFile; + private final File messagesFile; private final String content; private final LombokImmutableList messages; private final Map formatPreferences; @@ -86,8 +87,12 @@ public boolean versionWithinLimit(int version) { return version >= versionLowerLimit && version <= versionUpperLimit; } - public File getFile() { - return file; + public File getSourceFile() { + return sourceFile; + } + + public File getMessagesFile() { + return messagesFile; } public String getContent() { @@ -169,8 +174,9 @@ private int[] parseVersionLimit(String spec) { private static final Pattern ISSUE_REF_PATTERN = Pattern.compile("^\\s*issue #?\\d+(:?\\s+.*)?$", Pattern.CASE_INSENSITIVE); private static final Pattern VERIFY_DIET_PATTERN = Pattern.compile("^\\s*eclipse:\\s*verify[- ]?diet\\s*(?:[-:].*)?$", Pattern.CASE_INSENSITIVE); - private LombokTestSource(File file, String content, List messages, List directives) { - this.file = file; + private LombokTestSource(File sourceFile, File messagesFile, String content, List messages, List directives) { + this.sourceFile = sourceFile; + this.messagesFile = messagesFile; this.content = content; this.messages = messages == null ? LombokImmutableList.of() : LombokImmutableList.copyOf(messages); @@ -227,7 +233,7 @@ private LombokTestSource(File file, String content, List if (lc.startsWith("version ")) { int[] limits = parseVersionLimit(lc.substring(7).trim()); if (limits == null) { - Assert.fail("Directive line \"" + directive + "\" in '" + file.getAbsolutePath() + "' invalid: version must be followed by a single integer."); + Assert.fail("Directive line \"" + directive + "\" in '" + sourceFile.getAbsolutePath() + "' invalid: version must be followed by a single integer."); throw new RuntimeException(); } versionLower = limits[0]; @@ -258,7 +264,7 @@ private LombokTestSource(File file, String content, List if (lc.startsWith("issue ")) continue; - Assert.fail("Directive line \"" + directive + "\" in '" + file.getAbsolutePath() + "' invalid: unrecognized directive."); + Assert.fail("Directive line \"" + directive + "\" in '" + sourceFile.getAbsolutePath() + "' invalid: unrecognized directive."); throw new RuntimeException(); } this.specifiedEncoding = encoding; @@ -276,7 +282,7 @@ private LombokTestSource(File file, String content, List Assert.fail("Problem on directive line: " + problem + " at conf line #" + lineNumber + " (" + line + ")"); } }; - final ConfigurationFile configurationFile = ConfigurationFile.fromCharSequence(file.getAbsoluteFile().getPath(), conf, ConfigurationFile.getLastModifiedOrMissing(file)); + final ConfigurationFile configurationFile = ConfigurationFile.fromCharSequence(sourceFile.getAbsoluteFile().getPath(), conf, ConfigurationFile.getLastModifiedOrMissing(sourceFile)); final ConfigurationSource source = SingleConfigurationSource.parse(configurationFile, new ConfigurationParser(reporter)); ConfigurationFileToSource sourceFinder = new ConfigurationFileToSource() { @Override public ConfigurationSource parsed(ConfigurationFile fileLocation) { @@ -315,7 +321,7 @@ public static LombokTestSource readDirectives(File file) throws IOException { } } - return new LombokTestSource(file, "", null, directives); + return new LombokTestSource(file, null, "", null, directives); } public static LombokTestSource read(File sourceFolder, File messagesFolder, String fileName) throws IOException { @@ -360,8 +366,9 @@ private static LombokTestSource read0(File sourceFolder, File messagesFolder, St if (content == null) content = new StringBuilder(); List messages = null; + File messagesFile = null; if (messagesFolder != null) { - File messagesFile = new File(messagesFolder, fileName + ".messages"); + messagesFile = new File(messagesFolder, fileName + ".messages"); try { InputStream rawIn = new FileInputStream(messagesFile); try { @@ -372,10 +379,11 @@ private static LombokTestSource read0(File sourceFolder, File messagesFolder, St } } catch (FileNotFoundException e) { messages = null; + messagesFile = null; } } - LombokTestSource source = new LombokTestSource(sourceFile, content.toString(), messages, directives); + LombokTestSource source = new LombokTestSource(sourceFile, messagesFile, content.toString(), messages, directives); String specifiedEncoding = source.getSpecifiedEncoding(); // The source file has an 'encoding' header to test encoding issues. Of course, reading the encoding header From 3022b26a9b41f26c4e6c4e6e960d1e8202c97afe Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 02:33:36 +0200 Subject: [PATCH 041/118] [bugfix] mixing `@Delegate` and `@Getter(lazy)` causes positions to be lost. 15 years and nobody found this bug - not worth an issue or a changelog. --- .../lombok/javac/handlers/HandleGetter.java | 2 +- .../lombok/javac/handlers/JavacHandlerUtil.java | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index cdd3153172..30224f56c3 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.java @@ -218,7 +218,7 @@ public void createGetterForField(AccessLevel level, long access = toJavacModifier(level) | (fieldDecl.mods.flags & Flags.STATIC); - injectMethod(fieldNode.up(), createGetter(access, fieldNode, fieldNode.getTreeMaker(), source, lazy, onMethod)); + injectMethod(fieldNode.up(), source, createGetter(access, fieldNode, fieldNode.getTreeMaker(), source, lazy, onMethod)); } public JCMethodDecl createGetter(long access, JavacNode field, JavacTreeMaker treeMaker, JavacNode source, boolean lazy, List onMethod) { diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index 8b5638247d..660ebcc8a1 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -1369,6 +1369,21 @@ static void enter(ClassSymbol from, Symbol toEnter) { * Also takes care of updating the JavacAST. */ public static void injectMethod(JavacNode typeNode, JCMethodDecl method) { + JavacNode source = typeNode.getNodeFor(getGeneratedBy(method)); + injectMethod(typeNode, source, method); + } + + /** + * Adds the given new method declaration to the provided type AST Node. + * Can also inject constructors. + * + * Also takes care of updating the JavacAST. + * + * Ordinarily the 'source' is determined automatically. In rare cases generally involving combinations between + * annotations, some of which require re-attribution such as {@code @Delegate}, that doesn't work. This method + * exists if you explicitly have the source. + */ + public static void injectMethod(JavacNode typeNode, JavacNode source, JCMethodDecl method) { JCClassDecl type = (JCClassDecl) typeNode.get(); if (method.getName().contentEquals("")) { @@ -1389,7 +1404,7 @@ public static void injectMethod(JavacNode typeNode, JCMethodDecl method) { } addSuppressWarningsAll(method.mods, typeNode, typeNode.getNodeFor(getGeneratedBy(method)), typeNode.getContext()); - addGenerated(method.mods, typeNode, typeNode.getNodeFor(getGeneratedBy(method)), typeNode.getContext()); + addGenerated(method.mods, typeNode, source, typeNode.getContext()); type.defs = type.defs.append(method); EnterReflect.memberEnter(method, typeNode); From 3735de472e74963f44da5ba80df31b26e6e8ebdb Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 00:54:02 +0200 Subject: [PATCH 042/118] [i3667] change default behaviour: lombok.Generated now generated by default --- src/core/lombok/ConfigurationKeys.java | 2 +- src/core/lombok/Generated.java | 12 ++++++------ .../lombok/eclipse/handlers/EclipseHandlerUtil.java | 2 +- src/core/lombok/javac/handlers/JavacHandlerUtil.java | 2 +- .../resource/before/GeneratedJavaxOnLombokOn.java | 1 - .../resource/before/GeneratedOffLombokOn.java | 1 - 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/core/lombok/ConfigurationKeys.java b/src/core/lombok/ConfigurationKeys.java index 27fe78e058..b19dccfc98 100644 --- a/src/core/lombok/ConfigurationKeys.java +++ b/src/core/lombok/ConfigurationKeys.java @@ -87,7 +87,7 @@ private ConfigurationKeys() {} * * If {@code true}, lombok generates {@code @lombok.Generated} on all fields, methods, and types that are generated. */ - public static final ConfigurationKey ADD_LOMBOK_GENERATED_ANNOTATIONS = new ConfigurationKey("lombok.addLombokGeneratedAnnotation", "Generate @lombok.Generated on all generated code (default: false).") {}; + public static final ConfigurationKey ADD_LOMBOK_GENERATED_ANNOTATIONS = new ConfigurationKey("lombok.addLombokGeneratedAnnotation", "Generate @lombok.Generated on all generated code (default: true).") {}; /** * lombok configuration: {@code lombok.extern.findbugs.addSuppressFBWarnings} = {@code true} | {@code false}. diff --git a/src/core/lombok/Generated.java b/src/core/lombok/Generated.java index 216ab14348..09608e4bb3 100644 --- a/src/core/lombok/Generated.java +++ b/src/core/lombok/Generated.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2016 The Project Lombok Authors. + * Copyright (C) 2015-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -27,14 +27,14 @@ import java.lang.annotation.Target; /** - * Lombok will eventually automatically add this annotation to all generated constructors, methods, fields, and types. + * Lombok automatically adds this annotation to all generated constructors, methods, fields, and types. * * You can mark the presence of this annotation as 'ignore it' for all code style and bug finding tools. *

- * NB: As of v1.16.2 which introduces this annotation, lombok doesn't actually add this annotation; we're setting - * it up so that lombok jars in widespread use start having this, which will make it easier to actually apply it - * later on. By adding {@code lombok.addLombokGeneratedAnnotation = true} to {@code lombok.config} you can already - * get this behavior. + * NB: As of v1.18.34, lombok adds this annotation by default; before then you had to add a lombok config key. + *

+ * If you want to opt out (not recommended), you can add {@code lombok.addLombokGeneratedAnnotation = false} to + * {@code lombok.config}. */ @Target({ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE}) @Retention(RetentionPolicy.CLASS) diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index ef7a7c3a3c..af1aa0fd82 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -2098,7 +2098,7 @@ public static Annotation[] addGenerated(EclipseNode node, ASTNode source, Annota if (Boolean.TRUE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_JAKARTA_GENERATED_ANNOTATIONS))) { result = addAnnotation(source, result, JAKARTA_ANNOTATION_GENERATED, new StringLiteral(LOMBOK, 0, 0, 0)); } - if (Boolean.TRUE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS))) { + if (!Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS))) { result = addAnnotation(source, result, LOMBOK_GENERATED); } return result; diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index 660ebcc8a1..38658bb622 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -1542,7 +1542,7 @@ public static void addGenerated(JCModifiers mods, JavacNode node, JavacNode sour if (Boolean.TRUE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_JAKARTA_GENERATED_ANNOTATIONS))) { addAnnotation(mods, node, source, "jakarta.annotation.Generated", node.getTreeMaker().Literal("lombok")); } - if (Boolean.TRUE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS))) { + if (!Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS))) { addAnnotation(mods, node, source, "lombok.Generated", null); } } diff --git a/test/transform/resource/before/GeneratedJavaxOnLombokOn.java b/test/transform/resource/before/GeneratedJavaxOnLombokOn.java index cee391adb1..b6cc1fe42b 100644 --- a/test/transform/resource/before/GeneratedJavaxOnLombokOn.java +++ b/test/transform/resource/before/GeneratedJavaxOnLombokOn.java @@ -1,5 +1,4 @@ //CONF: lombok.addJavaxGeneratedAnnotation = true -//CONF: lombok.addLombokGeneratedAnnotation = true class GeneratedJavaxOnLombokOn { @lombok.Getter int x; diff --git a/test/transform/resource/before/GeneratedOffLombokOn.java b/test/transform/resource/before/GeneratedOffLombokOn.java index 9d122306dd..ae6094e452 100644 --- a/test/transform/resource/before/GeneratedOffLombokOn.java +++ b/test/transform/resource/before/GeneratedOffLombokOn.java @@ -1,5 +1,4 @@ //CONF: lombok.addGeneratedAnnotation = false -//CONF: lombok.addLombokGeneratedAnnotation = true class GeneratedOffLombokOn { @lombok.Getter int x; From 244d52af2f3a1ff4abc64a86bf715497dc6917e3 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:01:42 +0200 Subject: [PATCH 043/118] [tests] This seemingly humongous commit is actually nothing: All test-cases now have `@Generated` annotations where before they did not. --- ...f.java => GeneratedJavaxOffLombokOff.java} | 2 +- .../resource/after-ecj/Accessors.java | 32 +++---- .../resource/after-ecj/AccessorsCascade.java | 10 +- .../after-ecj/AccessorsConfiguration.java | 8 +- .../after-ecj/AccessorsInAnonymousClass.java | 4 +- .../after-ecj/AccessorsMakeFinal.java | 4 +- .../AccessorsMakeFinalLombokConfig.java | 4 +- .../after-ecj/AccessorsNoParamWarning.java | 6 +- .../after-ecj/BuilderAccessWithGetter.java | 18 ++-- .../resource/after-ecj/BuilderComplex.java | 26 ++--- .../after-ecj/BuilderConstructorJavadoc.java | 22 ++--- .../resource/after-ecj/BuilderDefaults.java | 46 ++++----- .../after-ecj/BuilderDefaultsArray.java | 30 +++--- .../after-ecj/BuilderDefaultsGenerics.java | 36 +++---- .../BuilderDefaultsTargetTyping.java | 20 ++-- .../after-ecj/BuilderDefaultsWarnings.java | 40 ++++---- .../after-ecj/BuilderGenericMethod.java | 18 ++-- .../after-ecj/BuilderInstanceMethod.java | 26 ++--- .../resource/after-ecj/BuilderJavadoc.java | 28 +++--- .../after-ecj/BuilderNestedInEnum.java | 26 ++--- .../after-ecj/BuilderOnNestedClass.java | 16 ++-- .../after-ecj/BuilderOnNestedRecord.java | 16 ++-- .../resource/after-ecj/BuilderSimple.java | 20 ++-- .../after-ecj/BuilderSimpleOnRecord.java | 18 ++-- .../BuilderSimpleWithSetterPrefix.java | 16 ++-- .../BuilderSingularAnnotatedTypes.java | 32 +++---- ...ingularAnnotatedTypesWithSetterPrefix.java | 30 +++--- .../BuilderSingularGuavaListsSets.java | 52 +++++----- .../after-ecj/BuilderSingularGuavaMaps.java | 36 +++---- .../after-ecj/BuilderSingularLists.java | 39 ++++---- .../after-ecj/BuilderSingularMaps.java | 54 +++++------ .../BuilderSingularMapsWithSetterPrefix.java | 54 +++++------ .../after-ecj/BuilderSingularNoAuto.java | 36 +++---- ...BuilderSingularNoAutoWithSetterPrefix.java | 36 +++---- .../BuilderSingularNullBehavior1.java | 30 +++--- .../BuilderSingularNullBehavior2.java | 22 ++--- .../after-ecj/BuilderSingularOnRecord.java | 34 +++---- .../BuilderSingularRedirectToGuava.java | 38 ++++---- .../after-ecj/BuilderSingularSets.java | 46 ++++----- .../BuilderSingularSetsWithSetterPrefix.java | 44 ++++----- .../BuilderSingularToBuilderWithNull.java | 24 ++--- ...ularToBuilderWithNullWithSetterPrefix.java | 22 ++--- ...derSingularWildcardListsWithToBuilder.java | 32 +++---- .../BuilderSingularWithPrefixes.java | 22 ++--- ...rSingularWithPrefixesWithSetterPrefix.java | 20 ++-- .../resource/after-ecj/BuilderTypeAnnos.java | 16 ++-- .../BuilderTypeAnnosWithSetterPrefix.java | 16 ++-- .../resource/after-ecj/BuilderValueData.java | 44 ++++----- .../BuilderValueDataWithSetterPrefix.java | 42 ++++----- .../after-ecj/BuilderWithAccessors.java | 28 +++--- .../after-ecj/BuilderWithBadNames.java | 20 ++-- .../after-ecj/BuilderWithDeprecated.java | 38 ++++---- .../BuilderWithDeprecatedAnnOnly.java | 32 +++---- .../BuilderWithExistingBuilderClass.java | 18 ++-- ...hExistingBuilderClassWithSetterPrefix.java | 16 ++-- ...uilderWithJavaBeansSpecCapitalization.java | 32 +++---- .../after-ecj/BuilderWithNoBuilderMethod.java | 16 ++-- .../after-ecj/BuilderWithNonNull.java | 18 ++-- .../BuilderWithNonNullWithSetterPrefix.java | 16 ++-- .../BuilderWithRecursiveGenerics.java | 31 +++--- .../after-ecj/BuilderWithToBuilder.java | 76 +++++++-------- .../after-ecj/BuilderWithTolerate.java | 16 ++-- .../after-ecj/CheckerFrameworkBasic.java | 22 ++--- .../after-ecj/CheckerFrameworkBuilder.java | 38 ++++---- .../CheckerFrameworkSuperBuilder.java | 72 +++++++------- .../after-ecj/ClassNamedAfterGetter.java | 2 +- .../after-ecj/CommentsInterspersed.java | 2 +- .../ConflictingStaticConstructorNames.java | 12 +-- .../resource/after-ecj/ConstructorInner.java | 6 +- .../resource/after-ecj/Constructors.java | 28 +++--- .../after-ecj/ConstructorsConfiguration.java | 2 +- .../ConstructorsInAnonymousClass.java | 6 +- .../after-ecj/ConstructorsTypeAnnos.java | 2 +- .../after-ecj/ConstructorsWithAccessors.java | 6 +- .../ConstructorsWithBuilderDefaults.java | 36 +++---- .../ConstructorsWithBuilderDefaults2.java | 46 ++++----- .../ConstructorsWithSuperBuilderDefaults.java | 36 +++---- .../resource/after-ecj/DataConfiguration.java | 14 +-- .../resource/after-ecj/DataExtended.java | 14 +-- .../resource/after-ecj/DataIgnore.java | 12 +-- .../after-ecj/DataInAnonymousClass.java | 14 +-- .../resource/after-ecj/DataOnEnum.java | 6 +- .../resource/after-ecj/DataOnLocalClass.java | 42 ++++----- .../resource/after-ecj/DataPlain.java | 76 +++++++-------- .../resource/after-ecj/DataWithGetter.java | 20 ++-- .../after-ecj/DataWithGetterNone.java | 14 +-- .../DataWithOverrideEqualsAndHashCode.java | 4 +- .../resource/after-ecj/EqualsAndHashCode.java | 22 ++--- .../after-ecj/EqualsAndHashCodeAnnotated.java | 8 +- .../EqualsAndHashCodeAutoExclude.java | 12 +-- .../after-ecj/EqualsAndHashCodeCache.java | 48 +++++----- .../EqualsAndHashCodeConfigKeys1.java | 14 +-- .../EqualsAndHashCodeConfigKeys2.java | 20 ++-- .../after-ecj/EqualsAndHashCodeEmpty.java | 14 +-- .../EqualsAndHashCodeExplicitInclude.java | 8 +- .../EqualsAndHashCodeInAnonymousClass.java | 6 +- .../EqualsAndHashCodeNestedShadow.java | 14 +-- .../after-ecj/EqualsAndHashCodeNewStyle.java | 6 +- .../EqualsAndHashCodeOfAndExclude.java | 8 +- .../after-ecj/EqualsAndHashCodeRank.java | 6 +- .../EqualsAndHashCodeWithExistingMethods.java | 6 +- ...EqualsAndHashCodeWithGenericsOnInners.java | 6 +- ...hCodeWithGenericsOnInnersInInterfaces.java | 7 +- ...EqualsAndHashCodeWithNonNullByDefault.java | 8 +- .../EqualsAndHashCodeWithOnParam.java | 9 +- ...alsAndHashCodeWithSomeExistingMethods.java | 26 ++--- ...tsViaConfigAndRequiredArgsConstructor.java | 2 +- .../after-ecj/FieldNameConstantsBasic.java | 6 +- .../FieldNameConstantsConfigKeys.java | 6 +- .../after-ecj/FieldNameConstantsEnum.java | 6 +- .../FieldNameConstantsHandrolled.java | 6 +- .../after-ecj/FieldNameConstantsOnRecord.java | 4 +- .../FieldNameConstantsUppercased.java | 6 +- .../after-ecj/GenerateSuppressFBWarnings.java | 4 +- .../after-ecj/GeneratedJavaxJakarta.java | 2 +- ...f.java => GeneratedJavaxOffLombokOff.java} | 4 +- .../resource/after-ecj/GeneratedOff.java | 2 +- .../after-ecj/GeneratedOffJavaxOn.java | 2 +- .../resource/after-ecj/GeneratedOn.java | 2 +- .../resource/after-ecj/GetterAccessLevel.java | 18 ++-- .../after-ecj/GetterAlreadyExists.java | 20 ++-- .../resource/after-ecj/GetterBoolean.java | 8 +- .../resource/after-ecj/GetterDeprecated.java | 4 +- .../resource/after-ecj/GetterEnum.java | 6 +- .../after-ecj/GetterInAnonymousClass.java | 2 +- .../resource/after-ecj/GetterLazy.java | 2 +- .../after-ecj/GetterLazyArguments.java | 14 +-- .../resource/after-ecj/GetterLazyBoolean.java | 12 +-- .../after-ecj/GetterLazyEahcToString.java | 12 +-- .../after-ecj/GetterLazyGenerics.java | 6 +- .../after-ecj/GetterLazyInAnonymousClass.java | 2 +- .../resource/after-ecj/GetterLazyInvalid.java | 2 +- .../resource/after-ecj/GetterLazyNative.java | 18 ++-- .../after-ecj/GetterLazyTransient.java | 6 +- .../resource/after-ecj/GetterNone.java | 2 +- .../resource/after-ecj/GetterOnClass.java | 16 ++-- .../resource/after-ecj/GetterOnMethod.java | 6 +- .../after-ecj/GetterOnMethodErrors2.java | 18 ++-- .../after-ecj/GetterOnMethodOnType.java | 6 +- .../resource/after-ecj/GetterOnStatic.java | 4 +- .../resource/after-ecj/GetterPlain.java | 4 +- .../after-ecj/GetterSetterJavadoc.java | 32 +++---- .../resource/after-ecj/GetterTypeAnnos.java | 2 +- .../resource/after-ecj/GetterWithDollar.java | 6 +- ...GetterWithJavaBeansSpecCapitalization.java | 6 +- .../I2335_BuilderMultipleObtainVia.java | 20 ++-- .../resource/after-ecj/InnerClass.java | 12 +-- .../after-ecj/JacksonBuilderSingular.java | 48 +++++----- .../after-ecj/JacksonJsonProperty.java | 20 ++-- .../after-ecj/JacksonizedBuilderComplex.java | 26 ++--- .../after-ecj/JacksonizedBuilderSimple.java | 21 ++--- .../after-ecj/JacksonizedOnRecord.java | 22 ++--- .../JacksonizedSuperBuilderSimple.java | 24 ++--- ...onizedSuperBuilderWithJsonDeserialize.java | 24 ++--- .../resource/after-ecj/JavadocMultiline.java | 8 +- .../resource/after-ecj/MultiFieldGetter.java | 8 +- .../after-ecj/NoArgsConstructorForce.java | 4 +- .../after-ecj/NoPrivateNoArgsConstructor.java | 24 ++--- .../NonNullExistingConstructorOnRecord.java | 2 +- .../after-ecj/NonNullOnRecordSimple.java | 2 +- .../after-ecj/NonNullOnRecordTypeUse.java | 2 +- .../resource/after-ecj/NonNullPlain.java | 16 ++-- .../NonNullWithAlternateException.java | 4 +- .../after-ecj/NonNullWithAssertion.java | 4 +- .../resource/after-ecj/NonNullWithGuava.java | 2 +- .../resource/after-ecj/NonNullWithJdk.java | 2 +- ...AnnotatedCheckerFrameworkSuperBuilder.java | 74 +++++++-------- .../resource/after-ecj/NullLibrary1.java | 12 +-- .../resource/after-ecj/NullLibrary2.java | 12 +-- .../resource/after-ecj/NullLibrary3.java | 14 +-- .../resource/after-ecj/OnXJava7StyleOn8.java | 18 ++-- .../resource/after-ecj/OnXJava8Style.java | 18 ++-- .../after-ecj/PrivateNoArgsConstructor.java | 76 +++++++-------- .../resource/after-ecj/SetterAccessLevel.java | 10 +- .../after-ecj/SetterAlreadyExists.java | 4 +- .../after-ecj/SetterAndWithMethodJavadoc.java | 8 +- .../resource/after-ecj/SetterDeprecated.java | 4 +- .../after-ecj/SetterInAnonymousClass.java | 2 +- .../resource/after-ecj/SetterOnClass.java | 16 ++-- .../after-ecj/SetterOnMethodOnParam.java | 8 +- .../resource/after-ecj/SetterOnStatic.java | 4 +- .../resource/after-ecj/SetterPlain.java | 4 +- .../resource/after-ecj/SetterTypeAnnos.java | 2 +- .../resource/after-ecj/SetterWithDollar.java | 6 +- ...SetterWithJavaBeansSpecCapitalization.java | 6 +- .../after-ecj/SimpleTypeResolution.java | 2 +- .../after-ecj/SkipSuppressWarnings.java | 6 +- .../after-ecj/StandardExceptions.java | 16 ++-- .../resource/after-ecj/StaticConstructor.java | 6 +- .../after-ecj/SuperBuilderAbstract.java | 58 ++++++------ .../SuperBuilderAbstractToBuilder.java | 74 +++++++-------- .../resource/after-ecj/SuperBuilderBasic.java | 52 +++++----- .../after-ecj/SuperBuilderBasicToBuilder.java | 76 +++++++-------- .../after-ecj/SuperBuilderCustomName.java | 22 ++--- .../after-ecj/SuperBuilderCustomized.java | 30 +++--- ...uperBuilderCustomizedWithSetterPrefix.java | 18 ++-- .../after-ecj/SuperBuilderInitializer.java | 22 ++--- .../after-ecj/SuperBuilderJavadoc.java | 26 ++--- .../after-ecj/SuperBuilderNameClashes.java | 78 +++++++-------- .../SuperBuilderNestedGenericTypes.java | 22 ++--- .../SuperBuilderSingularAnnotatedTypes.java | 38 ++++---- .../SuperBuilderSingularCustomized.java | 26 ++--- .../SuperBuilderSingularToBuilderGuava.java | 94 +++++++++---------- .../SuperBuilderWithAnnotatedTypeParam.java | 44 ++++----- ...uperBuilderWithCustomBuilderClassName.java | 38 ++++---- .../SuperBuilderWithCustomBuilderMethod.java | 56 +++++------ .../after-ecj/SuperBuilderWithDefaults.java | 62 ++++++------ ...perBuilderWithDefaultsAndTargetTyping.java | 52 +++++----- .../SuperBuilderWithExistingConstructor.java | 20 ++-- .../after-ecj/SuperBuilderWithGenerics.java | 58 ++++++------ .../after-ecj/SuperBuilderWithGenerics2.java | 58 ++++++------ .../after-ecj/SuperBuilderWithGenerics3.java | 44 ++++----- .../SuperBuilderWithGenericsAndToBuilder.java | 72 +++++++------- .../after-ecj/SuperBuilderWithNonNull.java | 48 +++++----- ...BuilderWithOverloadedGeneratedMethods.java | 44 ++++----- .../after-ecj/SuperBuilderWithPrefixes.java | 34 +++---- .../SuperBuilderWithSetterPrefix.java | 76 +++++++-------- .../resource/after-ecj/ToStringArray.java | 2 +- .../ToStringArrayTypeAnnotations.java | 2 +- .../after-ecj/ToStringAutoExclude.java | 6 +- .../resource/after-ecj/ToStringAutoSuper.java | 4 +- .../after-ecj/ToStringConfiguration.java | 12 +-- .../resource/after-ecj/ToStringEnum.java | 8 +- .../after-ecj/ToStringExplicitInclude.java | 2 +- .../ToStringExplicitIncludeConf.java | 2 +- .../after-ecj/ToStringInAnonymousClass.java | 2 +- .../resource/after-ecj/ToStringInner.java | 8 +- .../resource/after-ecj/ToStringNewStyle.java | 2 +- .../resource/after-ecj/ToStringPlain.java | 4 +- .../resource/after-ecj/Tolerate.java | 10 +- .../after-ecj/TypeUseAnnotations.java | 6 +- .../resource/after-ecj/UtilityClass.java | 10 +- .../after-ecj/UtilityClassGeneric.java | 2 +- .../resource/after-ecj/UtilityClassInner.java | 4 +- .../resource/after-ecj/ValueCallSuper.java | 10 +- .../after-ecj/ValueInAnonymousClass.java | 10 +- .../resource/after-ecj/ValuePlain.java | 38 ++++---- .../after-ecj/ValueStaticConstructorOf.java | 12 +-- .../resource/after-ecj/ValueStaticField.java | 10 +- .../ValueWithJavaBeansSpecCapitalization.java | 10 +- .../resource/after-ecj/WithAlreadyExists.java | 4 +- .../after-ecj/WithAndAllArgsConstructor.java | 6 +- .../after-ecj/WithByInAnonymousClass.java | 2 +- .../resource/after-ecj/WithByNullAnnos.java | 6 +- .../resource/after-ecj/WithByOnRecord.java | 4 +- .../after-ecj/WithByOnRecordComponent.java | 2 +- .../resource/after-ecj/WithByTypes.java | 22 ++--- .../after-ecj/WithInAnonymousClass.java | 2 +- .../after-ecj/WithMethodAbstract.java | 2 +- .../after-ecj/WithMethodMarkedDeprecated.java | 4 +- .../WithMethodMarkedDeprecatedAnnOnly.java | 3 +- .../resource/after-ecj/WithNested.java | 4 +- .../resource/after-ecj/WithOnClass.java | 12 +-- .../after-ecj/WithOnNestedRecord.java | 5 +- .../resource/after-ecj/WithOnRecord.java | 4 +- .../after-ecj/WithOnRecordComponent.java | 2 +- .../resource/after-ecj/WithPlain.java | 4 +- .../resource/after-ecj/WithWithGenerics.java | 6 +- .../WithWithJavaBeansSpecCapitalization.java | 2 +- .../resource/after-ecj/WithWithTypeAnnos.java | 2 +- .../resource/after-ecj/WitherAccessLevel.java | 10 +- .../resource/after-ecj/WitherLegacyStar.java | 4 +- .../resource/before/GeneratedJavaxOff.java | 5 - .../before/GeneratedJavaxOffLombokOff.java | 6 ++ 264 files changed, 2496 insertions(+), 2504 deletions(-) rename test/transform/resource/after-delombok/{GeneratedJavaxOff.java => GeneratedJavaxOffLombokOff.java} (71%) rename test/transform/resource/after-ecj/{GeneratedJavaxOff.java => GeneratedJavaxOffLombokOff.java} (64%) delete mode 100644 test/transform/resource/before/GeneratedJavaxOff.java create mode 100644 test/transform/resource/before/GeneratedJavaxOffLombokOff.java diff --git a/test/transform/resource/after-delombok/GeneratedJavaxOff.java b/test/transform/resource/after-delombok/GeneratedJavaxOffLombokOff.java similarity index 71% rename from test/transform/resource/after-delombok/GeneratedJavaxOff.java rename to test/transform/resource/after-delombok/GeneratedJavaxOffLombokOff.java index ca50f3d258..d1ec546418 100644 --- a/test/transform/resource/after-delombok/GeneratedJavaxOff.java +++ b/test/transform/resource/after-delombok/GeneratedJavaxOffLombokOff.java @@ -1,4 +1,4 @@ -class GeneratedJavaxOff { +class GeneratedJavaxOffLombokOff { int x; @java.lang.SuppressWarnings("all") public int getX() { diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java index 149d16f998..77fda247df 100644 --- a/test/transform/resource/after-ecj/Accessors.java +++ b/test/transform/resource/after-ecj/Accessors.java @@ -3,13 +3,13 @@ class AccessorsFluent { AccessorsFluent() { super(); } - public @java.lang.SuppressWarnings("all") String fieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String fieldName() { return this.fieldName; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsFluent fieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; } @@ -23,14 +23,14 @@ class AccessorsFluent { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsFluentOnClass fieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; } - public @java.lang.SuppressWarnings("all") String fieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String fieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") String getOtherFieldWithOverride() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } } @@ -42,7 +42,7 @@ class AccessorsChain { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsChain setRunning(final boolean isRunning) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; } @@ -53,7 +53,7 @@ class AccessorsChain { AccessorsPrefix() { super(); } - public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setActualField(final String fActualField) { this.fActualField = fActualField; } } @@ -63,10 +63,10 @@ class AccessorsChain { AccessorsPrefix2() { super(); } - public @java.lang.SuppressWarnings("all") void setFieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFieldName(final String fieldName) { this.fieldName = fieldName; } - public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setActualField(final String fActualField) { this.fActualField = fActualField; } } @@ -78,10 +78,10 @@ class AccessorsChain { private String getName() { return fName; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("AccessorsPrefix3(fName=" + this.getName()) + ")"); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof AccessorsPrefix3))) @@ -95,10 +95,10 @@ private String getName() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof AccessorsPrefix3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $fName = this.getName(); @@ -114,7 +114,7 @@ class AccessorsFluentGenerics { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsFluentGenerics name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsFluentGenerics name(final String name) { this.name = name; return this; } @@ -124,7 +124,7 @@ class AccessorsFluentNoChaining { AccessorsFluentNoChaining() { super(); } - public @java.lang.SuppressWarnings("all") void name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void name(final String name) { this.name = name; } } @@ -135,7 +135,7 @@ class AccessorsFluentStatic { AccessorsFluentStatic() { super(); } - public static @java.lang.SuppressWarnings("all") void name(final String name) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated void name(final String name) { AccessorsFluentStatic.name = name; } } diff --git a/test/transform/resource/after-ecj/AccessorsCascade.java b/test/transform/resource/after-ecj/AccessorsCascade.java index cacd338f68..a6f8dadc03 100644 --- a/test/transform/resource/after-ecj/AccessorsCascade.java +++ b/test/transform/resource/after-ecj/AccessorsCascade.java @@ -7,7 +7,7 @@ class AccessorsInner1 { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsOuter.AccessorsInner1 setTest3(final String zTest3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsOuter.AccessorsInner1 setTest3(final String zTest3) { this.zTest3 = zTest3; return this; } @@ -17,7 +17,7 @@ class AccessorsInner1 { AccessorsInner2() { super(); } - public @java.lang.SuppressWarnings("all") void setTest4(final String fTest4) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest4(final String fTest4) { this.fTest4 = fTest4; } } @@ -29,15 +29,15 @@ class AccessorsInner1 { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsOuter setTest(final String fTest) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsOuter setTest(final String fTest) { this.fTest = fTest; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsOuter setTest2(final String zTest2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsOuter setTest2(final String zTest2) { this.zTest2 = zTest2; return this; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/AccessorsConfiguration.java b/test/transform/resource/after-ecj/AccessorsConfiguration.java index a844763c96..219ec4e2f3 100644 --- a/test/transform/resource/after-ecj/AccessorsConfiguration.java +++ b/test/transform/resource/after-ecj/AccessorsConfiguration.java @@ -3,10 +3,10 @@ class AccessorsConfiguration { AccessorsConfiguration() { super(); } - public @java.lang.SuppressWarnings("all") String fieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String fieldName() { return this.m_FieldName; } - public @java.lang.SuppressWarnings("all") void fieldName(final String m_FieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void fieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } } @@ -15,7 +15,7 @@ class AccessorsConfiguration { AccessorsConfiguration2() { super(); } - public @java.lang.SuppressWarnings("all") void setM_FieldName(final String m_FieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setM_FieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } } @@ -27,7 +27,7 @@ class AccessorsConfiguration { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") AccessorsConfiguration3 setFieldName(final String fFieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsConfiguration3 setFieldName(final String fFieldName) { this.fFieldName = fFieldName; return this; } diff --git a/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java b/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java index 34db4f2dce..ec9df3f69b 100644 --- a/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java +++ b/test/transform/resource/after-ecj/AccessorsInAnonymousClass.java @@ -8,13 +8,13 @@ public class AccessorsInAnonymousClass { Inner() { super(); } - public @java.lang.SuppressWarnings("all") String string() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String string() { return this.string; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") Inner string(final String string) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner string(final String string) { this.string = string; return this; } diff --git a/test/transform/resource/after-ecj/AccessorsMakeFinal.java b/test/transform/resource/after-ecj/AccessorsMakeFinal.java index c8ac4bbd56..ed4f6ebc31 100644 --- a/test/transform/resource/after-ecj/AccessorsMakeFinal.java +++ b/test/transform/resource/after-ecj/AccessorsMakeFinal.java @@ -6,8 +6,8 @@ /** * @return {@code this}. */ - public final @java.lang.SuppressWarnings("all") AccessorsMakeFinal1 test(final String test) { + public final @java.lang.SuppressWarnings("all") @lombok.Generated AccessorsMakeFinal1 test(final String test) { this.test = test; return this; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/AccessorsMakeFinalLombokConfig.java b/test/transform/resource/after-ecj/AccessorsMakeFinalLombokConfig.java index f7c411e36b..6aba9814ae 100644 --- a/test/transform/resource/after-ecj/AccessorsMakeFinalLombokConfig.java +++ b/test/transform/resource/after-ecj/AccessorsMakeFinalLombokConfig.java @@ -3,7 +3,7 @@ class AccessorsMakeFinalLombokConfig { AccessorsMakeFinalLombokConfig() { super(); } - public final @java.lang.SuppressWarnings("all") void setTest(final String test) { + public final @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final String test) { this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/AccessorsNoParamWarning.java b/test/transform/resource/after-ecj/AccessorsNoParamWarning.java index e5d2d9051a..eefabbe2be 100644 --- a/test/transform/resource/after-ecj/AccessorsNoParamWarning.java +++ b/test/transform/resource/after-ecj/AccessorsNoParamWarning.java @@ -3,7 +3,7 @@ AccessorsNoParams() { super(); } - public @java.lang.SuppressWarnings("all") String otherFieldWithOverride() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String otherFieldWithOverride() { return this.otherFieldWithOverride; } } @@ -12,7 +12,7 @@ AccessorsNoParams2() { super(); } - public @java.lang.SuppressWarnings("all") void setFoo(final boolean foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final boolean foo) { this.foo = foo; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderAccessWithGetter.java b/test/transform/resource/after-ecj/BuilderAccessWithGetter.java index 7ad5fa6a77..d42cdb40f8 100644 --- a/test/transform/resource/after-ecj/BuilderAccessWithGetter.java +++ b/test/transform/resource/after-ecj/BuilderAccessWithGetter.java @@ -2,34 +2,34 @@ import lombok.Builder; import lombok.Getter; public final @Builder(access = AccessLevel.PRIVATE) class BuilderAccessWithGetter { - private static @java.lang.SuppressWarnings("all") class BuilderAccessWithGetterBuilder { - private @java.lang.SuppressWarnings("all") String string; - @java.lang.SuppressWarnings("all") BuilderAccessWithGetterBuilder() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderAccessWithGetterBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String string; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAccessWithGetterBuilder() { super(); } /** * @return {@code this}. */ - private @java.lang.SuppressWarnings("all") BuilderAccessWithGetter.BuilderAccessWithGetterBuilder string(final String string) { + private @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAccessWithGetter.BuilderAccessWithGetterBuilder string(final String string) { this.string = string; return this; } - private @java.lang.SuppressWarnings("all") BuilderAccessWithGetter build() { + private @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAccessWithGetter build() { return new BuilderAccessWithGetter(this.string); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderAccessWithGetter.BuilderAccessWithGetterBuilder(string=" + this.string) + ")"); } } private final @Getter String string; - @java.lang.SuppressWarnings("all") BuilderAccessWithGetter(final String string) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAccessWithGetter(final String string) { super(); this.string = string; } - private static @java.lang.SuppressWarnings("all") BuilderAccessWithGetter.BuilderAccessWithGetterBuilder builder() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAccessWithGetter.BuilderAccessWithGetterBuilder builder() { return new BuilderAccessWithGetter.BuilderAccessWithGetterBuilder(); } - public @java.lang.SuppressWarnings("all") String getString() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getString() { return this.string; } } diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java index ce6b0fd45b..e36c9be4b4 100644 --- a/test/transform/resource/after-ecj/BuilderComplex.java +++ b/test/transform/resource/after-ecj/BuilderComplex.java @@ -1,46 +1,46 @@ import java.util.List; import lombok.Builder; class BuilderComplex { - public static @java.lang.SuppressWarnings("all") class TestVoidName { - private @java.lang.SuppressWarnings("all") T number; - private @java.lang.SuppressWarnings("all") int arg2; - private @java.lang.SuppressWarnings("all") String arg3; - private @java.lang.SuppressWarnings("all") BuilderComplex selfRef; - @java.lang.SuppressWarnings("all") TestVoidName() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class TestVoidName { + private @java.lang.SuppressWarnings("all") @lombok.Generated T number; + private @java.lang.SuppressWarnings("all") @lombok.Generated int arg2; + private @java.lang.SuppressWarnings("all") @lombok.Generated String arg3; + private @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex selfRef; + @java.lang.SuppressWarnings("all") @lombok.Generated TestVoidName() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName number(final T number) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex.TestVoidName number(final T number) { this.number = number; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName arg2(final int arg2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex.TestVoidName arg2(final int arg2) { this.arg2 = arg2; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName arg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex.TestVoidName arg3(final String arg3) { this.arg3 = arg3; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName selfRef(final BuilderComplex selfRef) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex.TestVoidName selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } - public @java.lang.SuppressWarnings("all") void execute() { + public @java.lang.SuppressWarnings("all") @lombok.Generated void execute() { BuilderComplex.testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderComplex.TestVoidName(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")"); } } @@ -49,7 +49,7 @@ class BuilderComplex { } private static @Builder(buildMethodName = "execute") void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) { } - public static @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderComplex.TestVoidName builder() { return new BuilderComplex.TestVoidName(); } } diff --git a/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java b/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java index 29b6373b94..273a803f53 100644 --- a/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java +++ b/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java @@ -1,10 +1,10 @@ import java.util.List; class BuilderConstructorJavadoc { public static class BuilderConstructorJavadocBuilder { - private @java.lang.SuppressWarnings("all") int basic; - private @java.lang.SuppressWarnings("all") int multiline; - private @java.lang.SuppressWarnings("all") int predef; - private @java.lang.SuppressWarnings("all") int predefWithJavadoc; + private @java.lang.SuppressWarnings("all") @lombok.Generated int basic; + private @java.lang.SuppressWarnings("all") @lombok.Generated int multiline; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predef; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predefWithJavadoc; public BuilderConstructorJavadocBuilder predef(final int x) { this.predef = x; return this; @@ -13,34 +13,34 @@ public BuilderConstructorJavadocBuilder predefWithJavadoc(final int x) { this.predefWithJavadoc = x; return this; } - @java.lang.SuppressWarnings("all") BuilderConstructorJavadocBuilder() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadocBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder basic(final int basic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder basic(final int basic) { this.basic = basic; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder multiline(final int multiline) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder multiline(final int multiline) { this.multiline = multiline; return this; } - public @java.lang.SuppressWarnings("all") BuilderConstructorJavadoc build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc build() { return new BuilderConstructorJavadoc(this.basic, this.multiline, this.predef, this.predefWithJavadoc); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(basic=" + this.basic) + ", multiline=") + this.multiline) + ", predef=") + this.predef) + ", predefWithJavadoc=") + this.predefWithJavadoc) + ")"); } } @lombok.Builder BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc) { super(); } - public static @java.lang.SuppressWarnings("all") BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder builder() { return new BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderDefaults.java b/test/transform/resource/after-ecj/BuilderDefaults.java index 37a00cbfef..2bb467c0b1 100644 --- a/test/transform/resource/after-ecj/BuilderDefaults.java +++ b/test/transform/resource/after-ecj/BuilderDefaults.java @@ -1,19 +1,19 @@ import lombok.Builder; import lombok.Value; public final @Value @Builder class BuilderDefaults { - public static @java.lang.SuppressWarnings("all") class BuilderDefaultsBuilder { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") String name; - private @java.lang.SuppressWarnings("all") long z$value; - private @java.lang.SuppressWarnings("all") boolean z$set; - @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderDefaultsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated String name; + private @java.lang.SuppressWarnings("all") @lombok.Generated long z$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean z$set; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder x(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults.BuilderDefaultsBuilder x(final int x) { this.x$value = x; x$set = true; return this; @@ -21,19 +21,19 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults.BuilderDefaultsBuilder name(final String name) { this.name = name; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder z(final long z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults.BuilderDefaultsBuilder z(final long z) { this.z$value = z; z$set = true; return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaults build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults build() { int x$value = this.x$value; if ((! this.x$set)) x$value = BuilderDefaults.$default$x(); @@ -42,38 +42,38 @@ z$value = BuilderDefaults.$default$z(); return new BuilderDefaults(x$value, this.name, z$value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderDefaults.BuilderDefaultsBuilder(x$value=" + this.x$value) + ", name=") + this.name) + ", z$value=") + this.z$value) + ")"); } } private final @Builder.Default int x; private final String name; private final @Builder.Default long z; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 10; } - private static @java.lang.SuppressWarnings("all") long $default$z() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated long $default$z() { return System.currentTimeMillis(); } - @java.lang.SuppressWarnings("all") BuilderDefaults(final int x, final String name, final long z) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults(final int x, final String name, final long z) { super(); this.x = x; this.name = name; this.z = z; } - public static @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaults.BuilderDefaultsBuilder builder() { return new BuilderDefaults.BuilderDefaultsBuilder(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") long getZ() { + public @java.lang.SuppressWarnings("all") @lombok.Generated long getZ() { return this.z; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderDefaults))) @@ -89,7 +89,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -99,7 +99,7 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderDefaults(x=" + this.getX()) + ", name=") + this.getName()) + ", z=") + this.getZ()) + ")"); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderDefaultsArray.java b/test/transform/resource/after-ecj/BuilderDefaultsArray.java index d25e037134..74b74596c1 100644 --- a/test/transform/resource/after-ecj/BuilderDefaultsArray.java +++ b/test/transform/resource/after-ecj/BuilderDefaultsArray.java @@ -1,18 +1,18 @@ import lombok.Builder; import lombok.Value; public @Builder class BuilderDefaultsArray { - public static @java.lang.SuppressWarnings("all") class BuilderDefaultsArrayBuilder { - private @java.lang.SuppressWarnings("all") int[] x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") java.lang.String[][] y$value; - private @java.lang.SuppressWarnings("all") boolean y$set; - @java.lang.SuppressWarnings("all") BuilderDefaultsArrayBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderDefaultsArrayBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int[] x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String[][] y$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean y$set; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArrayBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsArray.BuilderDefaultsArrayBuilder x(final int[] x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArray.BuilderDefaultsArrayBuilder x(final int[] x) { this.x$value = x; x$set = true; return this; @@ -20,12 +20,12 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsArray.BuilderDefaultsArrayBuilder y(final java.lang.String[][] y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArray.BuilderDefaultsArrayBuilder y(final java.lang.String[][] y) { this.y$value = y; y$set = true; return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsArray build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArray build() { int[] x$value = this.x$value; if ((! this.x$set)) x$value = BuilderDefaultsArray.$default$x(); @@ -34,24 +34,24 @@ y$value = BuilderDefaultsArray.$default$y(); return new BuilderDefaultsArray(x$value, y$value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderDefaultsArray.BuilderDefaultsArrayBuilder(x$value=" + java.util.Arrays.toString(this.x$value)) + ", y$value=") + java.util.Arrays.deepToString(this.y$value)) + ")"); } } @Builder.Default int[] x; @Builder.Default java.lang.String[][] y; - private static @java.lang.SuppressWarnings("all") int[] $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int[] $default$x() { return new int[]{1, 2}; } - private static @java.lang.SuppressWarnings("all") java.lang.String[][] $default$y() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String[][] $default$y() { return new java.lang.String[][]{}; } - @java.lang.SuppressWarnings("all") BuilderDefaultsArray(final int[] x, final java.lang.String[][] y) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArray(final int[] x, final java.lang.String[][] y) { super(); this.x = x; this.y = y; } - public static @java.lang.SuppressWarnings("all") BuilderDefaultsArray.BuilderDefaultsArrayBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsArray.BuilderDefaultsArrayBuilder builder() { return new BuilderDefaultsArray.BuilderDefaultsArrayBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java b/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java index 4f9a3cfdde..83d5367ee6 100644 --- a/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java +++ b/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java @@ -1,20 +1,20 @@ import lombok.Builder; import java.util.*; public @Builder class BuilderDefaultsGenerics> { - public static @java.lang.SuppressWarnings("all") class BuilderDefaultsGenericsBuilder> { - private @java.lang.SuppressWarnings("all") java.util.concurrent.Callable callable$value; - private @java.lang.SuppressWarnings("all") boolean callable$set; - private @java.lang.SuppressWarnings("all") T tee$value; - private @java.lang.SuppressWarnings("all") boolean tee$set; - private @java.lang.SuppressWarnings("all") R arrr$value; - private @java.lang.SuppressWarnings("all") boolean arrr$set; - @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderDefaultsGenericsBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.Callable callable$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean callable$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated T tee$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean tee$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated R arrr$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean arrr$set; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenericsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder callable(final java.util.concurrent.Callable callable) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder callable(final java.util.concurrent.Callable callable) { this.callable$value = callable; callable$set = true; return this; @@ -22,7 +22,7 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder tee(final T tee) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder tee(final T tee) { this.tee$value = tee; tee$set = true; return this; @@ -30,12 +30,12 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder arrr(final R arrr) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder arrr(final R arrr) { this.arrr$value = arrr; arrr$set = true; return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenerics build() { java.util.concurrent.Callable callable$value = this.callable$value; if ((! this.callable$set)) callable$value = BuilderDefaultsGenerics.$default$callable(); @@ -47,29 +47,29 @@ arrr$value = BuilderDefaultsGenerics.$default$arrr(); return new BuilderDefaultsGenerics(callable$value, tee$value, arrr$value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(callable$value=" + this.callable$value) + ", tee$value=") + this.tee$value) + ", arrr$value=") + this.arrr$value) + ")"); } } private @Builder.Default java.util.concurrent.Callable callable; private @Builder.Default T tee; private @Builder.Default R arrr; - private static @java.lang.SuppressWarnings("all") >java.util.concurrent.Callable $default$callable() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated >java.util.concurrent.Callable $default$callable() { return null; } - private static @java.lang.SuppressWarnings("all") >T $default$tee() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated >T $default$tee() { return null; } - private static @java.lang.SuppressWarnings("all") >R $default$arrr() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated >R $default$arrr() { return null; } - @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics(final java.util.concurrent.Callable callable, final T tee, final R arrr) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsGenerics(final java.util.concurrent.Callable callable, final T tee, final R arrr) { super(); this.callable = callable; this.tee = tee; this.arrr = arrr; } - public static @java.lang.SuppressWarnings("all") >BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated >BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder builder() { return new BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderDefaultsTargetTyping.java b/test/transform/resource/after-ecj/BuilderDefaultsTargetTyping.java index 4b9235d6f2..d41aecbe82 100644 --- a/test/transform/resource/after-ecj/BuilderDefaultsTargetTyping.java +++ b/test/transform/resource/after-ecj/BuilderDefaultsTargetTyping.java @@ -1,27 +1,27 @@ import java.util.Arrays; import lombok.Builder; public @Builder class BuilderDefaultsTargetTyping { - public static @java.lang.SuppressWarnings("all") class BuilderDefaultsTargetTypingBuilder { - private @java.lang.SuppressWarnings("all") String foo$value; - private @java.lang.SuppressWarnings("all") boolean foo$set; - @java.lang.SuppressWarnings("all") BuilderDefaultsTargetTypingBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderDefaultsTargetTypingBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String foo$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean foo$set; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsTargetTypingBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder foo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder foo(final String foo) { this.foo$value = foo; foo$set = true; return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsTargetTyping build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsTargetTyping build() { String foo$value = this.foo$value; if ((! this.foo$set)) foo$value = BuilderDefaultsTargetTyping.$default$foo(); return new BuilderDefaultsTargetTyping(foo$value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder(foo$value=" + this.foo$value) + ")"); } } @@ -29,14 +29,14 @@ static String doSth(java.util.List i, java.util.List c) { return null; } - private static @java.lang.SuppressWarnings("all") String $default$foo() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - @java.lang.SuppressWarnings("all") BuilderDefaultsTargetTyping(final String foo) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsTargetTyping(final String foo) { super(); this.foo = foo; } - public static @java.lang.SuppressWarnings("all") BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder builder() { return new BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java b/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java index 16caf39eab..1d9474572a 100644 --- a/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java +++ b/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java @@ -1,34 +1,34 @@ import lombok.Builder; import lombok.Singular; public @Builder class BuilderDefaultsWarnings { - public static @java.lang.SuppressWarnings("all") class BuilderDefaultsWarningsBuilder { - private @java.lang.SuppressWarnings("all") long x; - private @java.lang.SuppressWarnings("all") int z; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; - @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderDefaultsWarningsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated long x; + private @java.lang.SuppressWarnings("all") @lombok.Generated int z; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarningsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) { this.x = x; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) { this.z = z; return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -38,12 +38,12 @@ this.items.addAll(items); return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() { if ((this.items != null)) this.items.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings build() { java.util.List items; switch (((this.items == null) ? 0 : this.items.size())) { case 0 : @@ -57,7 +57,7 @@ } return new BuilderDefaultsWarnings(this.x, this.z, items); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(x=" + this.x) + ", z=") + this.z) + ", items=") + this.items) + ")"); } } @@ -65,25 +65,25 @@ final int y = 5; @Builder.Default int z; @Builder.Default @Singular java.util.List items; - @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings(final long x, final int z, final java.util.List items) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings(final long x, final int z, final java.util.List items) { super(); this.x = x; this.z = z; this.items = items; } - public static @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() { return new BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(); } } class NoBuilderButHasDefaults { - public static @java.lang.SuppressWarnings("all") class NoBuilderButHasDefaultsBuilder { - @java.lang.SuppressWarnings("all") NoBuilderButHasDefaultsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class NoBuilderButHasDefaultsBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated NoBuilderButHasDefaultsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") NoBuilderButHasDefaults build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoBuilderButHasDefaults build() { return new NoBuilderButHasDefaults(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder()"; } } @@ -91,7 +91,7 @@ class NoBuilderButHasDefaults { public @Builder NoBuilderButHasDefaults() { super(); } - public static @java.lang.SuppressWarnings("all") NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() { return new NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderGenericMethod.java b/test/transform/resource/after-ecj/BuilderGenericMethod.java index be35cf9e65..20d5d5bb61 100644 --- a/test/transform/resource/after-ecj/BuilderGenericMethod.java +++ b/test/transform/resource/after-ecj/BuilderGenericMethod.java @@ -2,30 +2,30 @@ import lombok.Builder; import java.util.*; class BuilderGenericMethod { - public @java.lang.SuppressWarnings("all") class MapBuilder { - private @java.lang.SuppressWarnings("all") int a; - private @java.lang.SuppressWarnings("all") long b; - @java.lang.SuppressWarnings("all") MapBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated class MapBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int a; + private @java.lang.SuppressWarnings("all") @lombok.Generated long b; + @java.lang.SuppressWarnings("all") @lombok.Generated MapBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderGenericMethod.MapBuilder a(final int a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderGenericMethod.MapBuilder a(final int a) { this.a = a; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderGenericMethod.MapBuilder b(final long b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderGenericMethod.MapBuilder b(final long b) { this.b = b; return this; } - public @java.lang.SuppressWarnings("all") Map build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Map build() { return BuilderGenericMethod.this.foo(this.a, this.b); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderGenericMethod.MapBuilder(a=" + this.a) + ", b=") + this.b) + ")"); } } @@ -35,7 +35,7 @@ class BuilderGenericMethod { public @Builder Map foo(int a, long b) { return null; } - public @java.lang.SuppressWarnings("all") BuilderGenericMethod.MapBuilder builder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderGenericMethod.MapBuilder builder() { return this.new MapBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderInstanceMethod.java b/test/transform/resource/after-ecj/BuilderInstanceMethod.java index 33502ca91b..d9eae54bdf 100644 --- a/test/transform/resource/after-ecj/BuilderInstanceMethod.java +++ b/test/transform/resource/after-ecj/BuilderInstanceMethod.java @@ -1,45 +1,45 @@ import java.util.List; class BuilderInstanceMethod { - public @java.lang.SuppressWarnings("all") class StringBuilder { - private @java.lang.SuppressWarnings("all") int show; - private @java.lang.SuppressWarnings("all") int yes; - private @java.lang.SuppressWarnings("all") List also; - private @java.lang.SuppressWarnings("all") int $andMe; - @java.lang.SuppressWarnings("all") StringBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated class StringBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int show; + private @java.lang.SuppressWarnings("all") @lombok.Generated int yes; + private @java.lang.SuppressWarnings("all") @lombok.Generated List also; + private @java.lang.SuppressWarnings("all") @lombok.Generated int $andMe; + @java.lang.SuppressWarnings("all") @lombok.Generated StringBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderInstanceMethod.StringBuilder show(final int show) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderInstanceMethod.StringBuilder show(final int show) { this.show = show; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderInstanceMethod.StringBuilder yes(final int yes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderInstanceMethod.StringBuilder yes(final int yes) { this.yes = yes; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderInstanceMethod.StringBuilder also(final List also) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderInstanceMethod.StringBuilder also(final List also) { this.also = also; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderInstanceMethod.StringBuilder $andMe(final int $andMe) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderInstanceMethod.StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } - public @java.lang.SuppressWarnings("all") String build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String build() { return BuilderInstanceMethod.this.create(this.show, this.yes, this.also, this.$andMe); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderInstanceMethod.StringBuilder(show=" + this.show) + ", yes=") + this.yes) + ", also=") + this.also) + ", $andMe=") + this.$andMe) + ")"); } } @@ -49,7 +49,7 @@ class BuilderInstanceMethod { public @lombok.Builder String create(int show, final int yes, List also, int $andMe) { return (((("" + show) + yes) + also) + $andMe); } - public @java.lang.SuppressWarnings("all") BuilderInstanceMethod.StringBuilder builder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderInstanceMethod.StringBuilder builder() { return this.new StringBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderJavadoc.java b/test/transform/resource/after-ecj/BuilderJavadoc.java index f5790ee7ad..718b1c457c 100644 --- a/test/transform/resource/after-ecj/BuilderJavadoc.java +++ b/test/transform/resource/after-ecj/BuilderJavadoc.java @@ -1,10 +1,10 @@ import java.util.List; @lombok.Builder class BuilderJavadoc { public static class BuilderJavadocBuilder { - private @java.lang.SuppressWarnings("all") int basic; - private @java.lang.SuppressWarnings("all") int getsetwith; - private @java.lang.SuppressWarnings("all") int predef; - private @java.lang.SuppressWarnings("all") int predefWithJavadoc; + private @java.lang.SuppressWarnings("all") @lombok.Generated int basic; + private @java.lang.SuppressWarnings("all") @lombok.Generated int getsetwith; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predef; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predefWithJavadoc; public BuilderJavadocBuilder predef(final int x) { this.predef = (x * 10); return this; @@ -13,7 +13,7 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { this.predefWithJavadoc = (x * 100); return this; } - @java.lang.SuppressWarnings("all") BuilderJavadocBuilder() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadocBuilder() { super(); } /** @@ -22,7 +22,7 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { * @param tag is moved to the setter. * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderJavadoc.BuilderJavadocBuilder basic(final int basic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc.BuilderJavadocBuilder basic(final int basic) { this.basic = basic; return this; } @@ -31,14 +31,14 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { * @param tag is moved to the setters and wither. * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderJavadoc.BuilderJavadocBuilder getsetwith(final int getsetwith) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc.BuilderJavadocBuilder getsetwith(final int getsetwith) { this.getsetwith = getsetwith; return this; } - public @java.lang.SuppressWarnings("all") BuilderJavadoc build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc build() { return new BuilderJavadoc(this.basic, this.getsetwith, this.predef, this.predefWithJavadoc); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderJavadoc.BuilderJavadocBuilder(basic=" + this.basic) + ", getsetwith=") + this.getsetwith) + ", predef=") + this.predef) + ", predefWithJavadoc=") + this.predefWithJavadoc) + ")"); } } @@ -46,28 +46,28 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { private @lombok.Getter @lombok.Setter @lombok.experimental.Wither int getsetwith; private final int predef; private final int predefWithJavadoc; - @java.lang.SuppressWarnings("all") BuilderJavadoc(final int basic, final int getsetwith, final int predef, final int predefWithJavadoc) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc(final int basic, final int getsetwith, final int predef, final int predefWithJavadoc) { super(); this.basic = basic; this.getsetwith = getsetwith; this.predef = predef; this.predefWithJavadoc = predefWithJavadoc; } - public static @java.lang.SuppressWarnings("all") BuilderJavadoc.BuilderJavadocBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc.BuilderJavadocBuilder builder() { return new BuilderJavadoc.BuilderJavadocBuilder(); } /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @return tag is moved to the getter. */ - public @java.lang.SuppressWarnings("all") int getGetsetwith() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getGetsetwith() { return this.getsetwith; } /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @param tag is moved to the setters and wither. */ - public @java.lang.SuppressWarnings("all") void setGetsetwith(final int getsetwith) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setGetsetwith(final int getsetwith) { this.getsetwith = getsetwith; } /** @@ -75,7 +75,7 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { * @param tag is moved to the setters and wither. * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") BuilderJavadoc withGetsetwith(final int getsetwith) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc withGetsetwith(final int getsetwith) { return ((this.getsetwith == getsetwith) ? this : new BuilderJavadoc(this.basic, getsetwith, this.predef, this.predefWithJavadoc)); } } diff --git a/test/transform/resource/after-ecj/BuilderNestedInEnum.java b/test/transform/resource/after-ecj/BuilderNestedInEnum.java index b3fb54f319..da72cdaac3 100644 --- a/test/transform/resource/after-ecj/BuilderNestedInEnum.java +++ b/test/transform/resource/after-ecj/BuilderNestedInEnum.java @@ -1,37 +1,37 @@ class BuilderNestedInEnum { public enum TestEnum { public static final @lombok.Builder @lombok.Value class TestBuilder { - public static @java.lang.SuppressWarnings("all") class TestBuilderBuilder { - private @java.lang.SuppressWarnings("all") String field; - @java.lang.SuppressWarnings("all") TestBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class TestBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String field; + @java.lang.SuppressWarnings("all") @lombok.Generated TestBuilderBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) { this.field = field; return this; } - public @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedInEnum.TestEnum.TestBuilder build() { return new BuilderNestedInEnum.TestEnum.TestBuilder(this.field); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(field=" + this.field) + ")"); } } private final String field; - @java.lang.SuppressWarnings("all") TestBuilder(final String field) { + @java.lang.SuppressWarnings("all") @lombok.Generated TestBuilder(final String field) { super(); this.field = field; } - public static @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() { return new BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(); } - public @java.lang.SuppressWarnings("all") String getField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getField() { return this.field; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderNestedInEnum.TestEnum.TestBuilder))) @@ -43,14 +43,14 @@ public enum TestEnum { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $field = this.getField(); result = ((result * PRIME) + (($field == null) ? 43 : $field.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderNestedInEnum.TestEnum.TestBuilder(field=" + this.getField()) + ")"); } } @@ -65,4 +65,4 @@ public TestEnum() { BuilderNestedInEnum() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderOnNestedClass.java b/test/transform/resource/after-ecj/BuilderOnNestedClass.java index b100223ba1..c9cfa4740d 100644 --- a/test/transform/resource/after-ecj/BuilderOnNestedClass.java +++ b/test/transform/resource/after-ecj/BuilderOnNestedClass.java @@ -1,30 +1,30 @@ public class BuilderOnNestedClass { public static @lombok.Builder class Nested { - public static @java.lang.SuppressWarnings("all") class NestedBuilder { - private @java.lang.SuppressWarnings("all") String a; - @java.lang.SuppressWarnings("all") NestedBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class NestedBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String a; + @java.lang.SuppressWarnings("all") @lombok.Generated NestedBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderOnNestedClass.Nested.NestedBuilder a(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedClass.Nested.NestedBuilder a(final String a) { this.a = a; return this; } - public @java.lang.SuppressWarnings("all") BuilderOnNestedClass.Nested build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedClass.Nested build() { return new BuilderOnNestedClass.Nested(this.a); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderOnNestedClass.Nested.NestedBuilder(a=" + this.a) + ")"); } } private String a; - @java.lang.SuppressWarnings("all") Nested(final String a) { + @java.lang.SuppressWarnings("all") @lombok.Generated Nested(final String a) { super(); this.a = a; } - public static @java.lang.SuppressWarnings("all") BuilderOnNestedClass.Nested.NestedBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedClass.Nested.NestedBuilder builder() { return new BuilderOnNestedClass.Nested.NestedBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderOnNestedRecord.java b/test/transform/resource/after-ecj/BuilderOnNestedRecord.java index 4e025485f9..61737b17a5 100644 --- a/test/transform/resource/after-ecj/BuilderOnNestedRecord.java +++ b/test/transform/resource/after-ecj/BuilderOnNestedRecord.java @@ -1,30 +1,28 @@ public record BuilderOnNestedRecord(T t) { public @lombok.Builder record Nested(String a) { - public static @java.lang.SuppressWarnings("all") class NestedBuilder { - private @java.lang.SuppressWarnings("all") String a; - @java.lang.SuppressWarnings("all") NestedBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class NestedBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String a; + @java.lang.SuppressWarnings("all") @lombok.Generated NestedBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderOnNestedRecord.Nested.NestedBuilder a(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedRecord.Nested.NestedBuilder a(final String a) { this.a = a; return this; } - public @java.lang.SuppressWarnings("all") BuilderOnNestedRecord.Nested build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedRecord.Nested build() { return new BuilderOnNestedRecord.Nested(this.a); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderOnNestedRecord.Nested.NestedBuilder(a=" + this.a) + ")"); } } /* Implicit */ private final String a; - - public static @java.lang.SuppressWarnings("all") BuilderOnNestedRecord.Nested.NestedBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderOnNestedRecord.Nested.NestedBuilder builder() { return new BuilderOnNestedRecord.Nested.NestedBuilder(); } } /* Implicit */ private final T t; - } diff --git a/test/transform/resource/after-ecj/BuilderSimple.java b/test/transform/resource/after-ecj/BuilderSimple.java index a991545ef1..22b727c1ec 100644 --- a/test/transform/resource/after-ecj/BuilderSimple.java +++ b/test/transform/resource/after-ecj/BuilderSimple.java @@ -1,29 +1,29 @@ import java.util.List; @lombok.Builder(access = lombok.AccessLevel.PROTECTED) class BuilderSimple { - protected static @java.lang.SuppressWarnings("all") class BuilderSimpleBuilder { - private @java.lang.SuppressWarnings("all") int yes; - private @java.lang.SuppressWarnings("all") List also; - @java.lang.SuppressWarnings("all") BuilderSimpleBuilder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSimpleBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int yes; + private @java.lang.SuppressWarnings("all") @lombok.Generated List also; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderSimple.BuilderSimpleBuilder yes(final int yes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimple.BuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderSimple.BuilderSimpleBuilder also(final List also) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimple.BuilderSimpleBuilder also(final List also) { this.also = also; return this; } - public @java.lang.SuppressWarnings("all") BuilderSimple build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimple build() { return new BuilderSimple(this.yes, this.also); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes) + ", also=") + this.also) + ")"); } } @@ -31,12 +31,12 @@ private final int yes; private List also; private int $butNotMe; - @java.lang.SuppressWarnings("all") BuilderSimple(final int yes, final List also) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimple(final int yes, final List also) { super(); this.yes = yes; this.also = also; } - protected static @java.lang.SuppressWarnings("all") BuilderSimple.BuilderSimpleBuilder builder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimple.BuilderSimpleBuilder builder() { return new BuilderSimple.BuilderSimpleBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java b/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java index 860b436304..fac87407eb 100644 --- a/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java +++ b/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java @@ -1,36 +1,36 @@ // version 14: import java.util.List; public @lombok.Builder(access = lombok.AccessLevel.PROTECTED) record BuilderSimpleOnRecord(List l, String a) { - protected static @java.lang.SuppressWarnings("all") class BuilderSimpleOnRecordBuilder { - private @java.lang.SuppressWarnings("all") List l; - private @java.lang.SuppressWarnings("all") String a; - @java.lang.SuppressWarnings("all") BuilderSimpleOnRecordBuilder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSimpleOnRecordBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated List l; + private @java.lang.SuppressWarnings("all") @lombok.Generated String a; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleOnRecordBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder l(final List l) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder l(final List l) { this.l = l; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder a(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder a(final String a) { this.a = a; return this; } - public @java.lang.SuppressWarnings("all") BuilderSimpleOnRecord build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleOnRecord build() { return new BuilderSimpleOnRecord(this.l, this.a); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder(l=" + this.l) + ", a=") + this.a) + ")"); } } /* Implicit */ private final List l; /* Implicit */ private final String a; - protected static @java.lang.SuppressWarnings("all") BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder builder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder builder() { return new BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java index 51077a91c7..7b251243c8 100644 --- a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java @@ -1,30 +1,30 @@ import java.util.List; @lombok.Builder(access = lombok.AccessLevel.PROTECTED,setterPrefix = "with") class BuilderSimpleWithSetterPrefix { - protected static @java.lang.SuppressWarnings("all") class BuilderSimpleWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") int unprefixed; - @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSimpleWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int unprefixed; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleWithSetterPrefixBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder withUnprefixed(final int unprefixed) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder withUnprefixed(final int unprefixed) { this.unprefixed = unprefixed; return this; } - public @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleWithSetterPrefix build() { return new BuilderSimpleWithSetterPrefix(this.unprefixed); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(unprefixed=" + this.unprefixed) + ")"); } } private int unprefixed; - @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix(final int unprefixed) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleWithSetterPrefix(final int unprefixed) { super(); this.unprefixed = unprefixed; } - protected static @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder builder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder builder() { return new BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypes.java b/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypes.java index 977d081b47..9dcd5769aa 100644 --- a/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypes.java @@ -7,14 +7,14 @@ @Target(ElementType.TYPE_USE) @interface MyAnnotation { } @lombok.Builder class BuilderSingularAnnotatedTypes { - public static @java.lang.SuppressWarnings("all") class BuilderSingularAnnotatedTypesBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> foos; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; - @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularAnnotatedTypesBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> foos; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(final @MyAnnotation @NonNull String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(final @MyAnnotation @NonNull String foo) { if ((foo == null)) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -24,7 +24,7 @@ this.foos.add(foo); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection foos) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection foos) { if ((foos == null)) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -34,12 +34,12 @@ this.foos.addAll(foos); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearFoos() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearFoos() { if ((this.foos != null)) this.foos.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { if ((barKey == null)) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); @@ -57,7 +57,7 @@ this.bars$value.add(barValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map bars) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map bars) { if ((bars == null)) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -74,7 +74,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearBars() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearBars() { if ((this.bars$key != null)) { this.bars$key.clear(); @@ -82,7 +82,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes build() { java.util.Set<@MyAnnotation @NonNull String> foos; switch (((this.foos == null) ? 0 : this.foos.size())) { case 0 : @@ -112,18 +112,18 @@ } return new BuilderSingularAnnotatedTypes(foos, bars); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(foos=" + this.foos) + ", bars$key=") + this.bars$key) + ", bars$value=") + this.bars$value) + ")"); } } private @Singular Set<@MyAnnotation @NonNull String> foos; private @Singular Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; - @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { super(); this.foos = foos; this.bars = bars; } - public static @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder builder() { return new BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java index 96f346d451..92916c2073 100644 --- a/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java @@ -7,14 +7,14 @@ @Target(ElementType.TYPE_USE) @interface MyAnnotation { } @lombok.Builder(setterPrefix = "with") class BuilderSingularAnnotatedTypesWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularAnnotatedTypesWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> foos; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; - @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularAnnotatedTypesWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> foos; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(final @MyAnnotation @NonNull String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(final @MyAnnotation @NonNull String foo) { if ((foo == null)) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -24,7 +24,7 @@ this.foos.add(foo); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection foos) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection foos) { if ((foos == null)) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -34,12 +34,12 @@ this.foos.addAll(foos); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() { if ((this.foos != null)) this.foos.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { if ((barKey == null)) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); @@ -57,7 +57,7 @@ this.bars$value.add(barValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map bars) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map bars) { if ((bars == null)) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -74,7 +74,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() { if ((this.bars$key != null)) { this.bars$key.clear(); @@ -82,7 +82,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix build() { java.util.Set<@MyAnnotation @NonNull String> foos; switch (((this.foos == null) ? 0 : this.foos.size())) { case 0 : @@ -112,18 +112,18 @@ } return new BuilderSingularAnnotatedTypesWithSetterPrefix(foos, bars); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(foos=" + this.foos) + ", bars$key=") + this.bars$key) + ", bars$value=") + this.bars$value) + ")"); } } private @Singular Set<@MyAnnotation @NonNull String> foos; private @Singular Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; - @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { super(); this.foos = foos; this.bars = bars; } - public static @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() { return new BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java index ce15928889..f6eb7435b7 100644 --- a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java @@ -5,22 +5,22 @@ import com.google.common.collect.ImmutableTable; import lombok.Singular; @lombok.Builder class BuilderSingularGuavaListsSets { - public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaListsSetsBuilder { - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder cards; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder frogs; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder rawSet; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedSet.Builder passes; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableTable.Builder users; - @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularGuavaListsSetsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder cards; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder frogs; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSet.Builder rawSet; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSortedSet.Builder passes; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableTable.Builder users; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSetsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder card(final T card) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder card(final T card) { if ((this.cards == null)) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { if ((cards == null)) { throw new java.lang.NullPointerException("cards cannot be null"); @@ -30,17 +30,17 @@ this.cards.addAll(cards); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearCards() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearCards() { this.cards = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { if ((this.frogs == null)) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { if ((frogs == null)) { throw new java.lang.NullPointerException("frogs cannot be null"); @@ -50,17 +50,17 @@ this.frogs.addAll(frogs); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearFrogs() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearFrogs() { this.frogs = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { if ((rawSet == null)) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -70,17 +70,17 @@ this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearRawSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearRawSet() { this.rawSet = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder pass(final String pass) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder pass(final String pass) { if ((this.passes == null)) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { if ((passes == null)) { throw new java.lang.NullPointerException("passes cannot be null"); @@ -90,17 +90,17 @@ this.passes.addAll(passes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearPasses() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearPasses() { this.passes = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder user(final Number rowKey, final Number columnKey, final String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder users(final com.google.common.collect.Table users) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder users(final com.google.common.collect.Table users) { if ((users == null)) { throw new java.lang.NullPointerException("users cannot be null"); @@ -110,11 +110,11 @@ this.users.putAll(users); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearUsers() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearUsers() { this.users = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated 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()); com.google.common.collect.ImmutableSet rawSet = ((this.rawSet == null) ? com.google.common.collect.ImmutableSet.of() : this.rawSet.build()); @@ -122,7 +122,7 @@ com.google.common.collect.ImmutableTable users = ((this.users == null) ? com.google.common.collect.ImmutableTable.of() : this.users.build()); return new BuilderSingularGuavaListsSets(cards, frogs, rawSet, passes, users); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((("BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ", users=") + this.users) + ")"); } } @@ -131,7 +131,7 @@ private @SuppressWarnings("all") @Singular("rawSet") ImmutableSet rawSet; private @Singular ImmutableSortedSet passes; private @Singular ImmutableTable users; - @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { super(); this.cards = cards; this.frogs = frogs; @@ -139,7 +139,7 @@ this.passes = passes; this.users = users; } - public static @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder builder() { return new BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java index 76e6653b46..c05c33a0fd 100644 --- a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java @@ -3,20 +3,20 @@ import com.google.common.collect.ImmutableSortedMap; import lombok.Singular; @lombok.Builder class BuilderSingularGuavaMaps { - public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaMapsBuilder { - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableMap.Builder battleaxes; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedMap.Builder vertices; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableBiMap.Builder rawMap; - @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularGuavaMapsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableMap.Builder battleaxes; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSortedMap.Builder vertices; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableBiMap.Builder rawMap; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMapsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxe(final K key, final V value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { if ((battleaxes == null)) { throw new java.lang.NullPointerException("battleaxes cannot be null"); @@ -26,17 +26,17 @@ this.battleaxes.putAll(battleaxes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearBattleaxes() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearBattleaxes() { this.battleaxes = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertex(final Integer key, final V value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { if ((vertices == null)) { throw new java.lang.NullPointerException("vertices cannot be null"); @@ -46,17 +46,17 @@ this.vertices.putAll(vertices); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearVertices() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearVertices() { this.vertices = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(final java.lang.Object key, final java.lang.Object value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { if ((rawMap == null)) { throw new java.lang.NullPointerException("rawMap cannot be null"); @@ -66,30 +66,30 @@ this.rawMap.putAll(rawMap); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearRawMap() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearRawMap() { this.rawMap = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated 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()); com.google.common.collect.ImmutableBiMap rawMap = ((this.rawMap == null) ? com.google.common.collect.ImmutableBiMap.of() : this.rawMap.build()); return new BuilderSingularGuavaMaps(battleaxes, vertices, rawMap); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")"); } } private @Singular ImmutableMap battleaxes; private @Singular ImmutableSortedMap vertices; private @SuppressWarnings("all") @Singular("rawMap") ImmutableBiMap rawMap; - @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { super(); this.battleaxes = battleaxes; this.vertices = vertices; this.rawMap = rawMap; } - public static @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder builder() { return new BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularLists.java b/test/transform/resource/after-ecj/BuilderSingularLists.java index 712b5e863d..4f19c7da4e 100644 --- a/test/transform/resource/after-ecj/BuilderSingularLists.java +++ b/test/transform/resource/after-ecj/BuilderSingularLists.java @@ -1,22 +1,21 @@ import java.util.List; import java.util.Collection; - import lombok.Singular; @lombok.Builder class BuilderSingularLists { - public static @java.lang.SuppressWarnings("all") class BuilderSingularListsBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList children; - private @java.lang.SuppressWarnings("all") java.util.ArrayList scarves; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawList; - @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularListsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList children; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList scarves; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawList; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularListsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder child(final T child) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder child(final T child) { if ((this.children == null)) this.children = new java.util.ArrayList(); this.children.add(child); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder children(final java.util.Collection children) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder children(final java.util.Collection children) { if ((children == null)) { throw new java.lang.NullPointerException("children cannot be null"); @@ -26,18 +25,18 @@ this.children.addAll(children); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder clearChildren() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder clearChildren() { if ((this.children != null)) this.children.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder scarf(final Number scarf) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder scarf(final Number scarf) { if ((this.scarves == null)) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { if ((scarves == null)) { throw new java.lang.NullPointerException("scarves cannot be null"); @@ -47,18 +46,18 @@ this.scarves.addAll(scarves); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder clearScarves() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder clearScarves() { if ((this.scarves != null)) this.scarves.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { if ((this.rawList == null)) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { if ((rawList == null)) { throw new java.lang.NullPointerException("rawList cannot be null"); @@ -68,12 +67,12 @@ this.rawList.addAll(rawList); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder clearRawList() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder clearRawList() { if ((this.rawList != null)) this.rawList.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularLists build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists build() { java.util.List children; switch (((this.children == null) ? 0 : this.children.size())) { case 0 : @@ -109,20 +108,20 @@ } return new BuilderSingularLists(children, scarves, rawList); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")"); } } private @Singular List children; private @Singular Collection scarves; private @SuppressWarnings("all") @Singular("rawList") List rawList; - @java.lang.SuppressWarnings("all") BuilderSingularLists(final List children, final Collection scarves, final List rawList) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists(final List children, final Collection scarves, final List rawList) { super(); this.children = children; this.scarves = scarves; this.rawList = rawList; } - public static @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularLists.BuilderSingularListsBuilder builder() { return new BuilderSingularLists.BuilderSingularListsBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularMaps.java b/test/transform/resource/after-ecj/BuilderSingularMaps.java index 072cf5e7f6..a1d682f8f1 100644 --- a/test/transform/resource/after-ecj/BuilderSingularMaps.java +++ b/test/transform/resource/after-ecj/BuilderSingularMaps.java @@ -2,19 +2,19 @@ import java.util.SortedMap; import lombok.Singular; @lombok.Builder class BuilderSingularMaps { - public static @java.lang.SuppressWarnings("all") class BuilderSingularMapsBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList women$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList women$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList men$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList men$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawMap$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawMap$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringMap$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringMap$value; - @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularMapsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList women$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList women$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList men$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList men$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawMap$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawMap$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringMap$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringMap$value; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder woman(final K womanKey, final V womanValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder woman(final K womanKey, final V womanValue) { if ((this.women$key == null)) { this.women$key = new java.util.ArrayList(); @@ -24,7 +24,7 @@ this.women$value.add(womanValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder women(final java.util.Map women) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder women(final java.util.Map women) { if ((women == null)) { throw new java.lang.NullPointerException("women cannot be null"); @@ -41,7 +41,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder clearWomen() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder clearWomen() { if ((this.women$key != null)) { this.women$key.clear(); @@ -49,7 +49,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder man(final K manKey, final Number manValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder man(final K manKey, final Number manValue) { if ((this.men$key == null)) { this.men$key = new java.util.ArrayList(); @@ -59,7 +59,7 @@ this.men$value.add(manValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder men(final java.util.Map men) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder men(final java.util.Map men) { if ((men == null)) { throw new java.lang.NullPointerException("men cannot be null"); @@ -76,7 +76,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder clearMen() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder clearMen() { if ((this.men$key != null)) { this.men$key.clear(); @@ -84,7 +84,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { if ((this.rawMap$key == null)) { this.rawMap$key = new java.util.ArrayList(); @@ -94,7 +94,7 @@ this.rawMap$value.add(rawMapValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder rawMap(final java.util.Map rawMap) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder rawMap(final java.util.Map rawMap) { if ((rawMap == null)) { throw new java.lang.NullPointerException("rawMap cannot be null"); @@ -111,7 +111,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder clearRawMap() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder clearRawMap() { if ((this.rawMap$key != null)) { this.rawMap$key.clear(); @@ -119,7 +119,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder stringMap(final String stringMapKey, final V stringMapValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder stringMap(final String stringMapKey, final V stringMapValue) { if ((this.stringMap$key == null)) { this.stringMap$key = new java.util.ArrayList(); @@ -129,7 +129,7 @@ this.stringMap$value.add(stringMapValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder stringMap(final java.util.Map stringMap) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder stringMap(final java.util.Map stringMap) { if ((stringMap == null)) { throw new java.lang.NullPointerException("stringMap cannot be null"); @@ -146,7 +146,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder clearStringMap() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder clearStringMap() { if ((this.stringMap$key != null)) { this.stringMap$key.clear(); @@ -154,7 +154,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMaps build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps build() { java.util.Map women; switch (((this.women$key == null) ? 0 : this.women$key.size())) { case 0 : @@ -204,7 +204,7 @@ } return new BuilderSingularMaps(women, men, rawMap, stringMap); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((((((((("BuilderSingularMaps.BuilderSingularMapsBuilder(women$key=" + this.women$key) + ", women$value=") + this.women$value) + ", men$key=") + this.men$key) + ", men$value=") + this.men$value) + ", rawMap$key=") + this.rawMap$key) + ", rawMap$value=") + this.rawMap$value) + ", stringMap$key=") + this.stringMap$key) + ", stringMap$value=") + this.stringMap$value) + ")"); } } @@ -212,14 +212,14 @@ private @Singular SortedMap men; private @SuppressWarnings("all") @Singular("rawMap") Map rawMap; private @Singular("stringMap") Map stringMap; - @java.lang.SuppressWarnings("all") BuilderSingularMaps(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { super(); this.women = women; this.men = men; this.rawMap = rawMap; this.stringMap = stringMap; } - public static @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMaps.BuilderSingularMapsBuilder builder() { return new BuilderSingularMaps.BuilderSingularMapsBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java index dfa495bf5f..dae0512b5a 100644 --- a/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java @@ -2,19 +2,19 @@ import java.util.SortedMap; import lombok.Singular; @lombok.Builder(setterPrefix = "with") class BuilderSingularMapsWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularMapsWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList women$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList women$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList men$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList men$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawMap$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawMap$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringMap$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringMap$value; - @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularMapsWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList women$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList women$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList men$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList men$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawMap$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawMap$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringMap$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringMap$value; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withWoman(final K womanKey, final V womanValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withWoman(final K womanKey, final V womanValue) { if ((this.women$key == null)) { this.women$key = new java.util.ArrayList(); @@ -24,7 +24,7 @@ this.women$value.add(womanValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withWomen(final java.util.Map women) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withWomen(final java.util.Map women) { if ((women == null)) { throw new java.lang.NullPointerException("women cannot be null"); @@ -41,7 +41,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearWomen() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearWomen() { if ((this.women$key != null)) { this.women$key.clear(); @@ -49,7 +49,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withMan(final K manKey, final Number manValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withMan(final K manKey, final Number manValue) { if ((this.men$key == null)) { this.men$key = new java.util.ArrayList(); @@ -59,7 +59,7 @@ this.men$value.add(manValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withMen(final java.util.Map men) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withMen(final java.util.Map men) { if ((men == null)) { throw new java.lang.NullPointerException("men cannot be null"); @@ -76,7 +76,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearMen() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearMen() { if ((this.men$key != null)) { this.men$key.clear(); @@ -84,7 +84,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withRawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withRawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { if ((this.rawMap$key == null)) { this.rawMap$key = new java.util.ArrayList(); @@ -94,7 +94,7 @@ this.rawMap$value.add(rawMapValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withRawMap(final java.util.Map rawMap) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withRawMap(final java.util.Map rawMap) { if ((rawMap != null)) { if ((this.rawMap$key == null)) @@ -110,7 +110,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearRawMap() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearRawMap() { if ((this.rawMap$key != null)) { this.rawMap$key.clear(); @@ -118,7 +118,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withStringMap(final String stringMapKey, final V stringMapValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withStringMap(final String stringMapKey, final V stringMapValue) { if ((this.stringMap$key == null)) { this.stringMap$key = new java.util.ArrayList(); @@ -128,7 +128,7 @@ this.stringMap$value.add(stringMapValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withStringMap(final java.util.Map stringMap) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder withStringMap(final java.util.Map stringMap) { if ((stringMap == null)) { throw new java.lang.NullPointerException("stringMap cannot be null"); @@ -145,7 +145,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearStringMap() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder clearStringMap() { if ((this.stringMap$key != null)) { this.stringMap$key.clear(); @@ -153,7 +153,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix build() { java.util.Map women; switch (((this.women$key == null) ? 0 : this.women$key.size())) { case 0 : @@ -203,7 +203,7 @@ } return new BuilderSingularMapsWithSetterPrefix(women, men, rawMap, stringMap); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((((((((("BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder(women$key=" + this.women$key) + ", women$value=") + this.women$value) + ", men$key=") + this.men$key) + ", men$value=") + this.men$value) + ", rawMap$key=") + this.rawMap$key) + ", rawMap$value=") + this.rawMap$value) + ", stringMap$key=") + this.stringMap$key) + ", stringMap$value=") + this.stringMap$value) + ")"); } } @@ -211,14 +211,14 @@ private @Singular SortedMap men; private @SuppressWarnings("all") @Singular(value = "rawMap",ignoreNullCollections = true) Map rawMap; private @Singular("stringMap") Map stringMap; - @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { super(); this.women = women; this.men = men; this.rawMap = rawMap; this.stringMap = stringMap; } - public static @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder builder() { return new BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularNoAuto.java b/test/transform/resource/after-ecj/BuilderSingularNoAuto.java index 80870c342c..c7cb687669 100644 --- a/test/transform/resource/after-ecj/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-ecj/BuilderSingularNoAuto.java @@ -1,20 +1,20 @@ import java.util.List; import lombok.Singular; @lombok.Builder class BuilderSingularNoAuto { - public static @java.lang.SuppressWarnings("all") class BuilderSingularNoAutoBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList things; - private @java.lang.SuppressWarnings("all") java.util.ArrayList widgets; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; - @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularNoAutoBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList things; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList widgets; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final String things) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final String things) { if ((this.things == null)) this.things = new java.util.ArrayList(); this.things.add(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final java.util.Collection things) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final java.util.Collection things) { if ((things == null)) { throw new java.lang.NullPointerException("things cannot be null"); @@ -24,18 +24,18 @@ this.things.addAll(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearThings() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearThings() { if ((this.things != null)) this.things.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widget(final String widget) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widget(final String widget) { if ((this.widgets == null)) this.widgets = new java.util.ArrayList(); this.widgets.add(widget); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widgets(final java.util.Collection widgets) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widgets(final java.util.Collection widgets) { if ((widgets == null)) { throw new java.lang.NullPointerException("widgets cannot be null"); @@ -45,18 +45,18 @@ this.widgets.addAll(widgets); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearWidgets() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearWidgets() { if ((this.widgets != null)) this.widgets.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final String items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final String items) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(items); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -66,12 +66,12 @@ this.items.addAll(items); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearItems() { if ((this.items != null)) this.items.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto build() { java.util.List things; switch (((this.things == null) ? 0 : this.things.size())) { case 0 : @@ -107,20 +107,20 @@ } return new BuilderSingularNoAuto(things, widgets, items); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things) + ", widgets=") + this.widgets) + ", items=") + this.items) + ")"); } } private @Singular List things; private @Singular("widget") List widgets; private @Singular List items; - @java.lang.SuppressWarnings("all") BuilderSingularNoAuto(final List things, final List widgets, final List items) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto(final List things, final List widgets, final List items) { super(); this.things = things; this.widgets = widgets; this.items = items; } - public static @java.lang.SuppressWarnings("all") BuilderSingularNoAuto.BuilderSingularNoAutoBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAuto.BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java index a3a02841f6..ed3c00815a 100644 --- a/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java @@ -1,20 +1,20 @@ import java.util.List; import lombok.Singular; @lombok.Builder(setterPrefix = "with") class BuilderSingularNoAutoWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularNoAutoWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList things; - private @java.lang.SuppressWarnings("all") java.util.ArrayList widgets; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; - @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularNoAutoWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList things; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList widgets; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) { if ((this.things == null)) this.things = new java.util.ArrayList(); this.things.add(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection things) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection things) { if ((things == null)) { throw new java.lang.NullPointerException("things cannot be null"); @@ -24,18 +24,18 @@ this.things.addAll(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() { if ((this.things != null)) this.things.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) { if ((this.widgets == null)) this.widgets = new java.util.ArrayList(); this.widgets.add(widget); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection widgets) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection widgets) { if ((widgets == null)) { throw new java.lang.NullPointerException("widgets cannot be null"); @@ -45,18 +45,18 @@ this.widgets.addAll(widgets); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() { if ((this.widgets != null)) this.widgets.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(items); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -66,12 +66,12 @@ this.items.addAll(items); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() { if ((this.items != null)) this.items.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix build() { java.util.List things; switch (((this.things == null) ? 0 : this.things.size())) { case 0 : @@ -107,20 +107,20 @@ } return new BuilderSingularNoAutoWithSetterPrefix(things, widgets, items); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(things=" + this.things) + ", widgets=") + this.widgets) + ", items=") + this.items) + ")"); } } private @Singular List things; private @Singular("widget") List widgets; private @Singular List items; - @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix(final List things, final List widgets, final List items) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix(final List things, final List widgets, final List items) { super(); this.things = things; this.widgets = widgets; this.items = items; } - public static @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder builder() { return new BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularNullBehavior1.java b/test/transform/resource/after-ecj/BuilderSingularNullBehavior1.java index 94ef45eb1e..7ab519750e 100644 --- a/test/transform/resource/after-ecj/BuilderSingularNullBehavior1.java +++ b/test/transform/resource/after-ecj/BuilderSingularNullBehavior1.java @@ -2,37 +2,37 @@ import java.util.Collection; import lombok.Singular; @lombok.Builder class BuilderSingularNullBehavior1 { - public static @java.lang.SuppressWarnings("all") class BuilderSingularNullBehavior1Builder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList names; - private @java.lang.SuppressWarnings("all") java.util.ArrayList locations; - @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1Builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularNullBehavior1Builder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList names; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList locations; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1Builder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder name(final String name) { if ((this.names == null)) this.names = new java.util.ArrayList(); this.names.add(name); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder names(final java.util. @org.checkerframework.checker.nullness.qual.NonNull Collection names) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder names(final java.util. @org.checkerframework.checker.nullness.qual.NonNull Collection names) { assert (names != null): "names cannot be null"; if ((this.names == null)) this.names = new java.util.ArrayList(); this.names.addAll(names); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearNames() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearNames() { if ((this.names != null)) this.names.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder location(final String location) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder location(final String location) { if ((this.locations == null)) this.locations = new java.util.ArrayList(); this.locations.add(location); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder locations(final java.util. @org.checkerframework.checker.nullness.qual.Nullable Collection locations) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder locations(final java.util. @org.checkerframework.checker.nullness.qual.Nullable Collection locations) { if ((locations != null)) { if ((this.locations == null)) @@ -41,12 +41,12 @@ } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearLocations() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearLocations() { if ((this.locations != null)) this.locations.clear(); return this; } - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1 build() { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1 build() { java.util.List names; switch (((this.names == null) ? 0 : this.names.size())) { case 0 : @@ -71,18 +71,18 @@ } return new BuilderSingularNullBehavior1(names, locations); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return (((("BuilderSingularNullBehavior1.BuilderSingularNullBehavior1Builder(names=" + this.names) + ", locations=") + this.locations) + ")"); } } private @Singular List names; private @Singular(ignoreNullCollections = true) List locations; - @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1(final List names, final List locations) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1(final List names, final List locations) { super(); this.names = names; this.locations = locations; } - public static @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder builder() { return new BuilderSingularNullBehavior1.BuilderSingularNullBehavior1Builder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularNullBehavior2.java b/test/transform/resource/after-ecj/BuilderSingularNullBehavior2.java index e1adccb5b9..3e730f8c56 100644 --- a/test/transform/resource/after-ecj/BuilderSingularNullBehavior2.java +++ b/test/transform/resource/after-ecj/BuilderSingularNullBehavior2.java @@ -2,30 +2,30 @@ import java.util.List; import lombok.Singular; @lombok.Builder class BuilderSingularNullBehavior2 { - public static @java.lang.SuppressWarnings("all") class BuilderSingularNullBehavior2Builder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList locations; - @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2Builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularNullBehavior2Builder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList locations; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2Builder() { super(); } - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder location(final String location) { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder location(final String location) { if ((this.locations == null)) this.locations = new java.util.ArrayList(); this.locations.add(location); return this; } - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder locations(final @org.springframework.lang.NonNull java.util.Collection locations) { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder locations(final @org.springframework.lang.NonNull java.util.Collection locations) { java.util.Objects.requireNonNull(locations, "locations cannot be null"); if ((this.locations == null)) this.locations = new java.util.ArrayList(); this.locations.addAll(locations); return this; } - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder clearLocations() { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder clearLocations() { if ((this.locations != null)) this.locations.clear(); return this; } - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2 build() { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2 build() { java.util.List locations; switch (((this.locations == null) ? 0 : this.locations.size())) { case 0 : @@ -39,16 +39,16 @@ } return new BuilderSingularNullBehavior2(locations); } - public @java.lang.Override @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder(locations=" + this.locations) + ")"); } } private @Singular List locations; - @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2(final List locations) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2(final List locations) { super(); this.locations = locations; } - public static @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder builder() { + public static @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder builder() { return new BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularOnRecord.java b/test/transform/resource/after-ecj/BuilderSingularOnRecord.java index 10d109ed5b..4dcdb6eb10 100644 --- a/test/transform/resource/after-ecj/BuilderSingularOnRecord.java +++ b/test/transform/resource/after-ecj/BuilderSingularOnRecord.java @@ -4,20 +4,20 @@ import lombok.Builder; import lombok.Singular; public @Builder record BuilderSingularOnRecord(List children, Collection scarves, List rawList) { - public static @java.lang.SuppressWarnings("all") class BuilderSingularOnRecordBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList children; - private @java.lang.SuppressWarnings("all") java.util.ArrayList scarves; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawList; - @java.lang.SuppressWarnings("all") BuilderSingularOnRecordBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularOnRecordBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList children; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList scarves; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawList; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecordBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder child(final T child) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder child(final T child) { if ((this.children == null)) this.children = new java.util.ArrayList(); this.children.add(child); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder children(final java.util.Collection children) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder children(final java.util.Collection children) { if ((children == null)) { throw new java.lang.NullPointerException("children cannot be null"); @@ -27,18 +27,18 @@ this.children.addAll(children); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearChildren() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearChildren() { if ((this.children != null)) this.children.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarf(final Number scarf) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarf(final Number scarf) { if ((this.scarves == null)) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarves(final java.util.Collection scarves) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarves(final java.util.Collection scarves) { if ((scarves == null)) { throw new java.lang.NullPointerException("scarves cannot be null"); @@ -48,18 +48,18 @@ this.scarves.addAll(scarves); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearScarves() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearScarves() { if ((this.scarves != null)) this.scarves.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final java.lang.Object rawList) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final java.lang.Object rawList) { if ((this.rawList == null)) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final java.util.Collection rawList) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final java.util.Collection rawList) { if ((rawList == null)) { throw new java.lang.NullPointerException("rawList cannot be null"); @@ -69,12 +69,12 @@ this.rawList.addAll(rawList); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearRawList() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearRawList() { if ((this.rawList != null)) this.rawList.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularOnRecord build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord build() { java.util.List children; switch (((this.children == null) ? 0 : this.children.size())) { case 0 : @@ -110,14 +110,14 @@ } return new BuilderSingularOnRecord(children, scarves, rawList); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularOnRecord.BuilderSingularOnRecordBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")"); } } /* Implicit */ private final List children; /* Implicit */ private final Collection scarves; /* Implicit */ private final List rawList; - public static @java.lang.SuppressWarnings("all") BuilderSingularOnRecord.BuilderSingularOnRecordBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularOnRecord.BuilderSingularOnRecordBuilder builder() { return new BuilderSingularOnRecord.BuilderSingularOnRecordBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java index 73f24f9700..f367b1c288 100644 --- a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java @@ -3,20 +3,20 @@ import java.util.Collection; import lombok.Singular; @lombok.Builder class BuilderSingularRedirectToGuava { - public static @java.lang.SuppressWarnings("all") class BuilderSingularRedirectToGuavaBuilder { - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder dangerMice; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedMap.Builder things; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder> doohickeys; - @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularRedirectToGuavaBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSet.Builder dangerMice; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSortedMap.Builder things; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder> doohickeys; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuavaBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable dangerMice) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable dangerMice) { if ((dangerMice == null)) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -26,17 +26,17 @@ this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDangerMice() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder thing(final Integer key, final Number value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.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; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder things(final java.util.Map things) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder things(final java.util.Map things) { if ((things == null)) { throw new java.lang.NullPointerException("things cannot be null"); @@ -46,17 +46,17 @@ this.things.putAll(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearThings() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickey(final Class doohickey) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickey(final Class doohickey) { if ((this.doohickeys == null)) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable> doohickeys) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable> doohickeys) { if ((doohickeys == null)) { throw new java.lang.NullPointerException("doohickeys cannot be null"); @@ -66,30 +66,30 @@ this.doohickeys.addAll(doohickeys); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated 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()); java.util.Collection> doohickeys = ((this.doohickeys == null) ? com.google.common.collect.ImmutableList.>of() : this.doohickeys.build()); return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice) + ", things=") + this.things) + ", doohickeys=") + this.doohickeys) + ")"); } } private @Singular Set dangerMice; private @Singular NavigableMap things; private @Singular Collection> doohickeys; - @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { super(); this.dangerMice = dangerMice; this.things = things; this.doohickeys = doohickeys; } - public static @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularSets.java b/test/transform/resource/after-ecj/BuilderSingularSets.java index 8e1f448457..e2d3ff8735 100644 --- a/test/transform/resource/after-ecj/BuilderSingularSets.java +++ b/test/transform/resource/after-ecj/BuilderSingularSets.java @@ -2,21 +2,21 @@ import java.util.SortedSet; import lombok.Singular; @lombok.Builder class BuilderSingularSets { - public static @java.lang.SuppressWarnings("all") class BuilderSingularSetsBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList dangerMice; - private @java.lang.SuppressWarnings("all") java.util.ArrayList octopodes; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawSet; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringSet; - @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularSetsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList dangerMice; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList octopodes; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawSet; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringSet; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder dangerMouse(final T dangerMouse) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder dangerMouse(final T dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder dangerMice(final java.util.Collection dangerMice) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder dangerMice(final java.util.Collection dangerMice) { if ((dangerMice == null)) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -26,18 +26,18 @@ this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder clearDangerMice() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder clearDangerMice() { if ((this.dangerMice != null)) this.dangerMice.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder octopus(final Number octopus) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder octopus(final Number octopus) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder octopodes(final java.util.Collection octopodes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder octopodes(final java.util.Collection octopodes) { if ((octopodes == null)) { throw new java.lang.NullPointerException("octopodes cannot be null"); @@ -47,18 +47,18 @@ this.octopodes.addAll(octopodes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder clearOctopodes() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder clearOctopodes() { if ((this.octopodes != null)) this.octopodes.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.util.Collection rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.util.Collection rawSet) { if ((rawSet == null)) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -68,18 +68,18 @@ this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder clearRawSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder clearRawSet() { if ((this.rawSet != null)) this.rawSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final String stringSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final String stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final java.util.Collection stringSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final java.util.Collection stringSet) { if ((stringSet == null)) { throw new java.lang.NullPointerException("stringSet cannot be null"); @@ -89,12 +89,12 @@ this.stringSet.addAll(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder clearStringSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder clearStringSet() { if ((this.stringSet != null)) this.stringSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSets build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets build() { java.util.Set dangerMice; switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) { case 0 : @@ -140,7 +140,7 @@ } return new BuilderSingularSets(dangerMice, octopodes, rawSet, stringSet); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")"); } } @@ -148,14 +148,14 @@ private @Singular SortedSet octopodes; private @SuppressWarnings("all") @Singular("rawSet") Set rawSet; private @Singular("stringSet") Set stringSet; - @java.lang.SuppressWarnings("all") BuilderSingularSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { super(); this.dangerMice = dangerMice; this.octopodes = octopodes; this.rawSet = rawSet; this.stringSet = stringSet; } - public static @java.lang.SuppressWarnings("all") BuilderSingularSets.BuilderSingularSetsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSets.BuilderSingularSetsBuilder builder() { return new BuilderSingularSets.BuilderSingularSetsBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java index 0dc9185149..2ede85ec7b 100644 --- a/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java @@ -2,21 +2,21 @@ import java.util.SortedSet; import lombok.Singular; @lombok.Builder(setterPrefix = "with") class BuilderSingularSetsWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularSetsWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList dangerMice; - private @java.lang.SuppressWarnings("all") java.util.ArrayList octopodes; - private @java.lang.SuppressWarnings("all") java.util.ArrayList rawSet; - private @java.lang.SuppressWarnings("all") java.util.ArrayList stringSet; - @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularSetsWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList dangerMice; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList octopodes; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList rawSet; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList stringSet; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMouse(final T dangerMouse) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMouse(final T dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMice(final java.util.Collection dangerMice) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMice(final java.util.Collection dangerMice) { if ((dangerMice == null)) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -26,18 +26,18 @@ this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearDangerMice() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearDangerMice() { if ((this.dangerMice != null)) this.dangerMice.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopus(final Number octopus) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopus(final Number octopus) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopodes(final java.util.Collection octopodes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopodes(final java.util.Collection octopodes) { if ((octopodes == null)) { throw new java.lang.NullPointerException("octopodes cannot be null"); @@ -47,18 +47,18 @@ this.octopodes.addAll(octopodes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearOctopodes() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearOctopodes() { if ((this.octopodes != null)) this.octopodes.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.util.Collection rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.util.Collection rawSet) { if ((rawSet == null)) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -68,18 +68,18 @@ this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearRawSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearRawSet() { if ((this.rawSet != null)) this.rawSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final String stringSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final String stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final java.util.Collection stringSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final java.util.Collection stringSet) { if ((stringSet == null)) { throw new java.lang.NullPointerException("stringSet cannot be null"); @@ -89,12 +89,12 @@ this.stringSet.addAll(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearStringSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearStringSet() { if ((this.stringSet != null)) this.stringSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix build() { java.util.Set dangerMice; switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) { case 0 : @@ -140,7 +140,7 @@ } return new BuilderSingularSetsWithSetterPrefix(dangerMice, octopodes, rawSet, stringSet); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")"); } } @@ -148,14 +148,14 @@ private @Singular SortedSet octopodes; private @SuppressWarnings("all") @Singular("rawSet") Set rawSet; private @Singular("stringSet") Set stringSet; - @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { super(); this.dangerMice = dangerMice; this.octopodes = octopodes; this.rawSet = rawSet; this.stringSet = stringSet; } - public static @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder builder() { return new BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java index 41ed6dcc4f..268a51bb1d 100644 --- a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java +++ b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java @@ -1,17 +1,17 @@ import lombok.Singular; @lombok.Builder(toBuilder = true) class BuilderSingularToBuilderWithNull { - public static @java.lang.SuppressWarnings("all") class BuilderSingularToBuilderWithNullBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList elems; - @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularToBuilderWithNullBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList elems; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elem(final String elem) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elem(final String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection elems) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection elems) { if ((elems == null)) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -21,12 +21,12 @@ this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder clearElems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull build() { java.util.List elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -40,7 +40,7 @@ } return new BuilderSingularToBuilderWithNull(elems); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(elems=" + this.elems) + ")"); } } @@ -48,17 +48,17 @@ public static void test() { new BuilderSingularToBuilderWithNull(null).toBuilder(); } - @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull(final java.util.List elems) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull(final java.util.List elems) { super(); this.elems = elems; } - public static @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder() { return new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(); } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder toBuilder() { final BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(); if ((this.elems != null)) builder.elems(this.elems); return builder; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java index 6940cc08c2..7e0f5c96bd 100644 --- a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java @@ -1,17 +1,17 @@ import lombok.Singular; @lombok.Builder(toBuilder = true,setterPrefix = "with") class BuilderSingularToBuilderWithNullWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList elems; - @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList elems; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection elems) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if ((elems == null)) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -21,12 +21,12 @@ this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix build() { java.util.List elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -40,7 +40,7 @@ } return new BuilderSingularToBuilderWithNullWithSetterPrefix(elems); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(elems=" + this.elems) + ")"); } } @@ -48,14 +48,14 @@ public static void test() { new BuilderSingularToBuilderWithNullWithSetterPrefix(null).toBuilder(); } - @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix(final java.util.List elems) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix(final java.util.List elems) { super(); this.elems = elems; } - public static @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() { return new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); } - public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() { final BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); if ((this.elems != null)) builder.withElems(this.elems); diff --git a/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilder.java b/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilder.java index bc5e2a50e7..1379b6c8c8 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilder.java +++ b/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilder.java @@ -2,19 +2,19 @@ import java.util.Collection; import lombok.Singular; @lombok.Builder(toBuilder = true) class BuilderSingularWildcardListsWithToBuilder { - public static @java.lang.SuppressWarnings("all") class BuilderSingularWildcardListsWithToBuilderBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList objects; - private @java.lang.SuppressWarnings("all") java.util.ArrayList numbers; - @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularWildcardListsWithToBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList objects; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList numbers; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilderBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) { if ((this.objects == null)) this.objects = new java.util.ArrayList(); this.objects.add(object); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection objects) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection objects) { if ((objects == null)) { throw new java.lang.NullPointerException("objects cannot be null"); @@ -24,18 +24,18 @@ this.objects.addAll(objects); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() { if ((this.objects != null)) this.objects.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) { if ((this.numbers == null)) this.numbers = new java.util.ArrayList(); this.numbers.add(number); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection numbers) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection numbers) { if ((numbers == null)) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -45,12 +45,12 @@ this.numbers.addAll(numbers); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() { if ((this.numbers != null)) this.numbers.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder build() { java.util.List objects; switch (((this.objects == null) ? 0 : this.objects.size())) { case 0 : @@ -75,21 +75,21 @@ } return new BuilderSingularWildcardListsWithToBuilder(objects, numbers); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(objects=" + this.objects) + ", numbers=") + this.numbers) + ")"); } } private @Singular List objects; private @Singular Collection numbers; - @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder(final List objects, final Collection numbers) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder(final List objects, final Collection numbers) { super(); this.objects = objects; this.numbers = numbers; } - public static @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder() { return new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(); } - public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() { final BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(); if ((this.objects != null)) builder.objects(this.objects); @@ -97,4 +97,4 @@ builder.numbers(this.numbers); return builder; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java index 4bc79326cb..eef235ccc8 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java +++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java @@ -1,17 +1,17 @@ import lombok.Singular; @lombok.Builder @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixes { - public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList elems; - @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularWithPrefixesBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList elems; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elem(final String elem) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elem(final String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elems(final java.util.Collection elems) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elems(final java.util.Collection elems) { if ((elems == null)) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -21,12 +21,12 @@ this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder clearElems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes build() { java.util.List elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -40,16 +40,16 @@ } return new BuilderSingularWithPrefixes(elems); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems) + ")"); } } private @Singular java.util.List _elems; - @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes(final java.util.List elems) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes(final java.util.List elems) { super(); this._elems = elems; } - public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder builder() { return new BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java index f492005b77..92f95066cb 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java @@ -1,17 +1,17 @@ import lombok.Singular; @lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixesWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList elems; - @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderSingularWithPrefixesWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList elems; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection elems) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if ((elems == null)) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -21,12 +21,12 @@ this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix build() { java.util.List elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -40,16 +40,16 @@ } return new BuilderSingularWithPrefixesWithSetterPrefix(elems); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(elems=" + this.elems) + ")"); } } private @Singular java.util.List _elems; - @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix(final java.util.List elems) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix(final java.util.List elems) { super(); this._elems = elems; } - public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() { return new BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnos.java b/test/transform/resource/after-ecj/BuilderTypeAnnos.java index cae7f2b4a3..5ea456dd79 100644 --- a/test/transform/resource/after-ecj/BuilderTypeAnnos.java +++ b/test/transform/resource/after-ecj/BuilderTypeAnnos.java @@ -6,31 +6,31 @@ @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB { } @lombok.Builder class BuilderTypeAnnos { - public static @java.lang.SuppressWarnings("all") class BuilderTypeAnnosBuilder { - private @java.lang.SuppressWarnings("all") List foo; - @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderTypeAnnosBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated List foo; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderTypeAnnos.BuilderTypeAnnosBuilder foo(final @TA List foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnos.BuilderTypeAnnosBuilder foo(final @TA List foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") BuilderTypeAnnos build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnos build() { return new BuilderTypeAnnos(this.foo); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo) + ")"); } } private @TA @TB List foo; - @java.lang.SuppressWarnings("all") BuilderTypeAnnos(final @TA List foo) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnos(final @TA List foo) { super(); this.foo = foo; } - public static @java.lang.SuppressWarnings("all") BuilderTypeAnnos.BuilderTypeAnnosBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnos.BuilderTypeAnnosBuilder builder() { return new BuilderTypeAnnos.BuilderTypeAnnosBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java index a3e279851c..dcc492c531 100644 --- a/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java @@ -6,31 +6,31 @@ @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB { } @lombok.Builder(setterPrefix = "with") class BuilderTypeAnnosWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderTypeAnnosWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") List foo; - @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderTypeAnnosWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated List foo; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosWithSetterPrefixBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder withFoo(final @TA List foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder withFoo(final @TA List foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosWithSetterPrefix build() { return new BuilderTypeAnnosWithSetterPrefix(this.foo); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(foo=" + this.foo) + ")"); } } private @TA @TB List foo; - @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix(final @TA List foo) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosWithSetterPrefix(final @TA List foo) { super(); this.foo = foo; } - public static @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder builder() { return new BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderValueData.java b/test/transform/resource/after-ecj/BuilderValueData.java index deffcbb9d2..e92446dd44 100644 --- a/test/transform/resource/after-ecj/BuilderValueData.java +++ b/test/transform/resource/after-ecj/BuilderValueData.java @@ -1,27 +1,27 @@ import java.util.List; final @lombok.Builder @lombok.Value class BuilderAndValue { - public static @java.lang.SuppressWarnings("all") class BuilderAndValueBuilder { - @java.lang.SuppressWarnings("all") BuilderAndValueBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderAndValueBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValueBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderAndValue build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValue build() { return new BuilderAndValue(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "BuilderAndValue.BuilderAndValueBuilder()"; } } private final int zero = 0; - @java.lang.SuppressWarnings("all") BuilderAndValue() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValue() { super(); } - public static @java.lang.SuppressWarnings("all") BuilderAndValue.BuilderAndValueBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValue.BuilderAndValueBuilder builder() { return new BuilderAndValue.BuilderAndValueBuilder(); } - public @java.lang.SuppressWarnings("all") int getZero() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getZero() { return this.zero; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderAndValue))) @@ -31,39 +31,39 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getZero()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderAndValue(zero=" + this.getZero()) + ")"); } } @lombok.Builder @lombok.Data class BuilderAndData { - public static @java.lang.SuppressWarnings("all") class BuilderAndDataBuilder { - @java.lang.SuppressWarnings("all") BuilderAndDataBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderAndDataBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndDataBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderAndData build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndData build() { return new BuilderAndData(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "BuilderAndData.BuilderAndDataBuilder()"; } } private final int zero = 0; - @java.lang.SuppressWarnings("all") BuilderAndData() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndData() { super(); } - public static @java.lang.SuppressWarnings("all") BuilderAndData.BuilderAndDataBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndData.BuilderAndDataBuilder builder() { return new BuilderAndData.BuilderAndDataBuilder(); } - public @java.lang.SuppressWarnings("all") int getZero() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getZero() { return this.zero; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderAndData))) @@ -75,16 +75,16 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof BuilderAndData); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getZero()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderAndData(zero=" + this.getZero()) + ")"); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java index 832bac2462..f19cf776a4 100644 --- a/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java @@ -1,27 +1,27 @@ import java.util.List; final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValueWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderAndValueWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderAndValueWithSetterPrefixBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValueWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValueWithSetterPrefix build() { return new BuilderAndValueWithSetterPrefix(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder()"; } } private final int zero = 0; - @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefix() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValueWithSetterPrefix() { super(); } - public static @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder builder() { return new BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder(); } - public @java.lang.SuppressWarnings("all") int getZero() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getZero() { return this.zero; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderAndValueWithSetterPrefix))) @@ -31,39 +31,39 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getZero()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderAndValueWithSetterPrefix(zero=" + this.getZero()) + ")"); } } @lombok.Builder(setterPrefix = "with") @lombok.Data class BuilderAndDataWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderAndDataWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderAndDataWithSetterPrefixBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndDataWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndDataWithSetterPrefix build() { return new BuilderAndDataWithSetterPrefix(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder()"; } } private final int zero = 0; - @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefix() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndDataWithSetterPrefix() { super(); } - public static @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder builder() { return new BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder(); } - public @java.lang.SuppressWarnings("all") int getZero() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getZero() { return this.zero; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderAndDataWithSetterPrefix))) @@ -75,16 +75,16 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof BuilderAndDataWithSetterPrefix); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getZero()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderAndDataWithSetterPrefix(zero=" + this.getZero()) + ")"); } } diff --git a/test/transform/resource/after-ecj/BuilderWithAccessors.java b/test/transform/resource/after-ecj/BuilderWithAccessors.java index 2d9f80d568..719baa46e5 100644 --- a/test/transform/resource/after-ecj/BuilderWithAccessors.java +++ b/test/transform/resource/after-ecj/BuilderWithAccessors.java @@ -1,44 +1,44 @@ @lombok.Builder @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors { - public static @java.lang.SuppressWarnings("all") class BuilderWithAccessorsBuilder { - private @java.lang.SuppressWarnings("all") int plower; - private @java.lang.SuppressWarnings("all") int upper; - private @java.lang.SuppressWarnings("all") int foo; - private @java.lang.SuppressWarnings("all") int _bar; - @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithAccessorsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int plower; + private @java.lang.SuppressWarnings("all") @lombok.Generated int upper; + private @java.lang.SuppressWarnings("all") @lombok.Generated int foo; + private @java.lang.SuppressWarnings("all") @lombok.Generated int _bar; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessorsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) { this.plower = plower; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) { this.upper = upper; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) { this.foo = foo; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder _bar(final int _bar) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors.BuilderWithAccessorsBuilder _bar(final int _bar) { this._bar = _bar; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithAccessors build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors build() { return new BuilderWithAccessors(this.plower, this.upper, this.foo, this._bar); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower) + ", upper=") + this.upper) + ", foo=") + this.foo) + ", _bar=") + this._bar) + ")"); } } @@ -46,14 +46,14 @@ private final int pUpper; private int _foo; private int __bar; - @java.lang.SuppressWarnings("all") BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { super(); this.plower = plower; this.pUpper = upper; this._foo = foo; this.__bar = _bar; } - public static @java.lang.SuppressWarnings("all") BuilderWithAccessors.BuilderWithAccessorsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithAccessors.BuilderWithAccessorsBuilder builder() { return new BuilderWithAccessors.BuilderWithAccessorsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithBadNames.java b/test/transform/resource/after-ecj/BuilderWithBadNames.java index c0366e141b..2ccedddc94 100644 --- a/test/transform/resource/after-ecj/BuilderWithBadNames.java +++ b/test/transform/resource/after-ecj/BuilderWithBadNames.java @@ -1,39 +1,39 @@ public @lombok.Builder class BuilderWithBadNames { - public static @java.lang.SuppressWarnings("all") class BuilderWithBadNamesBuilder { - private @java.lang.SuppressWarnings("all") String build; - private @java.lang.SuppressWarnings("all") String toString; - @java.lang.SuppressWarnings("all") BuilderWithBadNamesBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithBadNamesBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String build; + private @java.lang.SuppressWarnings("all") @lombok.Generated String toString; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNamesBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) { this.build = build; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithBadNames.BuilderWithBadNamesBuilder toString(final String toString) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNames.BuilderWithBadNamesBuilder toString(final String toString) { this.toString = toString; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithBadNames build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNames build() { return new BuilderWithBadNames(this.build, this.toString); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderWithBadNames.BuilderWithBadNamesBuilder(build=" + this.build) + ", toString=") + this.toString) + ")"); } } String build; String toString; - @java.lang.SuppressWarnings("all") BuilderWithBadNames(final String build, final String toString) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNames(final String build, final String toString) { super(); this.build = build; this.toString = toString; } - public static @java.lang.SuppressWarnings("all") BuilderWithBadNames.BuilderWithBadNamesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithBadNames.BuilderWithBadNamesBuilder builder() { return new BuilderWithBadNames.BuilderWithBadNamesBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithDeprecated.java b/test/transform/resource/after-ecj/BuilderWithDeprecated.java index 7e484b5db9..1d18360a9b 100644 --- a/test/transform/resource/after-ecj/BuilderWithDeprecated.java +++ b/test/transform/resource/after-ecj/BuilderWithDeprecated.java @@ -2,36 +2,36 @@ import lombok.Builder; import lombok.Singular; public @Builder class BuilderWithDeprecated { - public static @java.lang.SuppressWarnings("all") class BuilderWithDeprecatedBuilder { - private @java.lang.SuppressWarnings("all") String dep1; - private @java.lang.SuppressWarnings("all") int dep2; - private @java.lang.SuppressWarnings("all") java.util.ArrayList strings; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder numbers; - @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithDeprecatedBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String dep1; + private @java.lang.SuppressWarnings("all") @lombok.Generated int dep2; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList strings; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder numbers; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedBuilder() { super(); } /** * @deprecated since always * @return {@code this}. */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep1(final String dep1) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep1(final String dep1) { this.dep1 = dep1; return this; } /** * @return {@code this}. */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep2(final int dep2) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep2(final int dep2) { this.dep2 = dep2; return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder string(final String string) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder string(final String string) { if ((this.strings == null)) this.strings = new java.util.ArrayList(); this.strings.add(string); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder strings(final java.util.Collection strings) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder strings(final java.util.Collection strings) { if ((strings == null)) { throw new java.lang.NullPointerException("strings cannot be null"); @@ -41,18 +41,18 @@ this.strings.addAll(strings); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearStrings() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearStrings() { if ((this.strings != null)) this.strings.clear(); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder number(final Integer number) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder number(final Integer number) { if ((this.numbers == null)) this.numbers = com.google.common.collect.ImmutableList.builder(); this.numbers.add(number); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable numbers) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable numbers) { if ((numbers == null)) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -62,11 +62,11 @@ this.numbers.addAll(numbers); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearNumbers() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearNumbers() { this.numbers = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithDeprecated build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated build() { java.util.List strings; switch (((this.strings == null) ? 0 : this.strings.size())) { case 0 : @@ -81,7 +81,7 @@ com.google.common.collect.ImmutableList numbers = ((this.numbers == null) ? com.google.common.collect.ImmutableList.of() : this.numbers.build()); return new BuilderWithDeprecated(this.dep1, this.dep2, strings, numbers); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderWithDeprecated.BuilderWithDeprecatedBuilder(dep1=" + this.dep1) + ", dep2=") + this.dep2) + ", strings=") + this.strings) + ", numbers=") + this.numbers) + ")"); } } @@ -89,14 +89,14 @@ @Deprecated int dep2; @Singular @Deprecated java.util.List strings; @Singular @Deprecated ImmutableList numbers; - @java.lang.SuppressWarnings("all") BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List strings, final ImmutableList numbers) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List strings, final ImmutableList numbers) { super(); this.dep1 = dep1; this.dep2 = dep2; this.strings = strings; this.numbers = numbers; } - public static @java.lang.SuppressWarnings("all") BuilderWithDeprecated.BuilderWithDeprecatedBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated.BuilderWithDeprecatedBuilder builder() { return new BuilderWithDeprecated.BuilderWithDeprecatedBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java b/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java index 2c563387fc..eacd49832a 100644 --- a/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java +++ b/test/transform/resource/after-ecj/BuilderWithDeprecatedAnnOnly.java @@ -2,27 +2,27 @@ import lombok.Builder; import lombok.Singular; public @Builder class BuilderWithDeprecatedAnnOnly { - public static @java.lang.SuppressWarnings("all") class BuilderWithDeprecatedAnnOnlyBuilder { - private @java.lang.SuppressWarnings("all") int dep1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList strings; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder numbers; - @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnlyBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithDeprecatedAnnOnlyBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int dep1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList strings; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder numbers; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnlyBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder dep1(final int dep1) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder dep1(final int dep1) { this.dep1 = dep1; return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder string(final String string) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder string(final String string) { if ((this.strings == null)) this.strings = new java.util.ArrayList(); this.strings.add(string); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder strings(final java.util.Collection strings) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder strings(final java.util.Collection strings) { if ((strings == null)) { throw new java.lang.NullPointerException("strings cannot be null"); @@ -32,18 +32,18 @@ this.strings.addAll(strings); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearStrings() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearStrings() { if ((this.strings != null)) this.strings.clear(); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder number(final Integer number) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder number(final Integer number) { if ((this.numbers == null)) this.numbers = com.google.common.collect.ImmutableList.builder(); this.numbers.add(number); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder numbers(final java.lang.Iterable numbers) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder numbers(final java.lang.Iterable numbers) { if ((numbers == null)) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -53,11 +53,11 @@ this.numbers.addAll(numbers); return this; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearNumbers() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearNumbers() { this.numbers = null; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly build() { java.util.List strings; switch (((this.strings == null) ? 0 : this.strings.size())) { case 0 : @@ -72,20 +72,20 @@ com.google.common.collect.ImmutableList numbers = ((this.numbers == null) ? com.google.common.collect.ImmutableList.of() : this.numbers.build()); return new BuilderWithDeprecatedAnnOnly(this.dep1, strings, numbers); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder(dep1=" + this.dep1) + ", strings=") + this.strings) + ", numbers=") + this.numbers) + ")"); } } @Deprecated int dep1; @Singular @Deprecated java.util.List strings; @Singular @Deprecated ImmutableList numbers; - @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly(final int dep1, final java.util.List strings, final ImmutableList numbers) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly(final int dep1, final java.util.List strings, final ImmutableList numbers) { super(); this.dep1 = dep1; this.strings = strings; this.numbers = numbers; } - public static @java.lang.SuppressWarnings("all") BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder builder() { return new BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java index b8c716a7e2..22c4323224 100644 --- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java +++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java @@ -1,32 +1,32 @@ import lombok.Builder; class BuilderWithExistingBuilderClass { public static class BuilderWithExistingBuilderClassBuilder { - private @java.lang.SuppressWarnings("all") boolean arg2; - private @java.lang.SuppressWarnings("all") String arg3; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean arg2; + private @java.lang.SuppressWarnings("all") @lombok.Generated String arg3; private Z arg1; public void arg2(boolean arg) { } - @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg1(final Z arg1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg1(final Z arg1) { this.arg1 = arg1; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg3(final String arg3) { this.arg3 = arg3; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClass build() { return BuilderWithExistingBuilderClass.staticMethod(this.arg1, this.arg2, this.arg3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")"); } } @@ -36,7 +36,7 @@ public void arg2(boolean arg) { public static @Builder BuilderWithExistingBuilderClass staticMethod(Z arg1, boolean arg2, String arg3) { return null; } - public static @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder builder() { return new BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java index f3619019d2..c1ec261d12 100644 --- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -1,32 +1,32 @@ import lombok.Builder; class BuilderWithExistingBuilderClassWithSetterPrefix { public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") boolean arg2; - private @java.lang.SuppressWarnings("all") String arg3; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean arg2; + private @java.lang.SuppressWarnings("all") @lombok.Generated String arg3; private Z arg1; public void withArg2(boolean arg) { } - @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefixBuilder() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefixBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg1(final Z arg1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg1(final Z arg1) { this.arg1 = arg1; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg3(final String arg3) { this.arg3 = arg3; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefix build() { return BuilderWithExistingBuilderClassWithSetterPrefix.staticMethod(this.arg1, this.arg2, this.arg3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")"); } } @@ -36,7 +36,7 @@ public void withArg2(boolean arg) { public static @Builder(setterPrefix = "with") BuilderWithExistingBuilderClassWithSetterPrefix staticMethod(Z arg1, boolean arg2, String arg3) { return null; } - public static @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder builder() { return new BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java index 1107254fea..e86e1c73ba 100644 --- a/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-ecj/BuilderWithJavaBeansSpecCapitalization.java @@ -1,18 +1,18 @@ @lombok.Builder(setterPrefix = "set") class BuilderWithJavaBeansSpecCapitalization { - public static @java.lang.SuppressWarnings("all") class BuilderWithJavaBeansSpecCapitalizationBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList a; - private @java.lang.SuppressWarnings("all") java.util.ArrayList aField; - private @java.lang.SuppressWarnings("all") String bField; - @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalizationBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithJavaBeansSpecCapitalizationBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList a; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList aField; + private @java.lang.SuppressWarnings("all") @lombok.Generated String bField; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalizationBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setZ(final String z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setZ(final String z) { if ((this.a == null)) this.a = new java.util.ArrayList(); this.a.add(z); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setA(final java.util.Collection a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setA(final java.util.Collection a) { if ((a == null)) { throw new java.lang.NullPointerException("a cannot be null"); @@ -22,18 +22,18 @@ this.a.addAll(a); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearA() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearA() { if ((this.a != null)) this.a.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setyField(final String yField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setyField(final String yField) { if ((this.aField == null)) this.aField = new java.util.ArrayList(); this.aField.add(yField); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setaField(final java.util.Collection aField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setaField(final java.util.Collection aField) { if ((aField == null)) { throw new java.lang.NullPointerException("aField cannot be null"); @@ -43,7 +43,7 @@ this.aField.addAll(aField); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearaField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearaField() { if ((this.aField != null)) this.aField.clear(); return this; @@ -51,11 +51,11 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setbField(final String bField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setbField(final String bField) { this.bField = bField; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization build() { java.util.List a; switch (((this.a == null) ? 0 : this.a.size())) { case 0 : @@ -80,20 +80,20 @@ } return new BuilderWithJavaBeansSpecCapitalization(a, aField, this.bField); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder(a=" + this.a) + ", aField=") + this.aField) + ", bField=") + this.bField) + ")"); } } @lombok.Singular("z") java.util.List a; @lombok.Singular("yField") java.util.List aField; String bField; - @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization(final java.util.List a, final java.util.List aField, final String bField) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization(final java.util.List a, final java.util.List aField, final String bField) { super(); this.a = a; this.aField = aField; this.bField = bField; } - public static @java.lang.SuppressWarnings("all") BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder builder() { return new BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java b/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java index d5cdf765be..1c76d8a53c 100644 --- a/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java +++ b/test/transform/resource/after-ecj/BuilderWithNoBuilderMethod.java @@ -1,30 +1,30 @@ import lombok.Builder; @Builder(toBuilder = true,builderMethodName = "") class BuilderWithNoBuilderMethod { - public static @java.lang.SuppressWarnings("all") class BuilderWithNoBuilderMethodBuilder { - private @java.lang.SuppressWarnings("all") String a; - @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithNoBuilderMethodBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String a; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNoBuilderMethodBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder a(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder a(final String a) { this.a = a; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNoBuilderMethod build() { return new BuilderWithNoBuilderMethod(this.a); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder(a=" + this.a) + ")"); } } private String a = ""; - @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod(final String a) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNoBuilderMethod(final String a) { super(); this.a = a; } - public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder toBuilder() { return new BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder().a(this.a); } } diff --git a/test/transform/resource/after-ecj/BuilderWithNonNull.java b/test/transform/resource/after-ecj/BuilderWithNonNull.java index eb041fae71..9486ff943a 100644 --- a/test/transform/resource/after-ecj/BuilderWithNonNull.java +++ b/test/transform/resource/after-ecj/BuilderWithNonNull.java @@ -1,13 +1,13 @@ @lombok.Builder class BuilderWithNonNull { - public static @java.lang.SuppressWarnings("all") class BuilderWithNonNullBuilder { - private @java.lang.SuppressWarnings("all") String id; - @java.lang.SuppressWarnings("all") BuilderWithNonNullBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithNonNullBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String id; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithNonNull.BuilderWithNonNullBuilder id(final @lombok.NonNull String id) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNull.BuilderWithNonNullBuilder id(final @lombok.NonNull String id) { if ((id == null)) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -15,15 +15,15 @@ this.id = id; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithNonNull build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNull build() { return new BuilderWithNonNull(this.id); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderWithNonNull.BuilderWithNonNullBuilder(id=" + this.id) + ")"); } } private final @lombok.NonNull String id; - @java.lang.SuppressWarnings("all") BuilderWithNonNull(final @lombok.NonNull String id) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNull(final @lombok.NonNull String id) { super(); if ((id == null)) { @@ -31,7 +31,7 @@ } this.id = id; } - public static @java.lang.SuppressWarnings("all") BuilderWithNonNull.BuilderWithNonNullBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNull.BuilderWithNonNullBuilder builder() { return new BuilderWithNonNull.BuilderWithNonNullBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java index dc43f9a930..140e04f568 100644 --- a/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java @@ -1,13 +1,13 @@ @lombok.Builder(setterPrefix = "with") class BuilderWithNonNullWithSetterPrefix { - public static @java.lang.SuppressWarnings("all") class BuilderWithNonNullWithSetterPrefixBuilder { - private @java.lang.SuppressWarnings("all") String id; - @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefixBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithNonNullWithSetterPrefixBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String id; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullWithSetterPrefixBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder withId(final @lombok.NonNull String id) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder withId(final @lombok.NonNull String id) { if ((id == null)) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -15,15 +15,15 @@ this.id = id; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullWithSetterPrefix build() { return new BuilderWithNonNullWithSetterPrefix(this.id); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(id=" + this.id) + ")"); } } private final @lombok.NonNull String id; - @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix(final @lombok.NonNull String id) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullWithSetterPrefix(final @lombok.NonNull String id) { super(); if ((id == null)) { @@ -31,7 +31,7 @@ } this.id = id; } - public static @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder builder() { return new BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java b/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java index e42b9e5faa..bd8d5d2042 100644 --- a/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java +++ b/test/transform/resource/after-ecj/BuilderWithRecursiveGenerics.java @@ -5,50 +5,50 @@ public class BuilderWithRecursiveGenerics { interface Inter> { } public static final @Builder @Value class Test, Quz extends Inter> { - public static @java.lang.SuppressWarnings("all") class TestBuilder, Quz extends Inter> { - private @java.lang.SuppressWarnings("all") Foo foo; - private @java.lang.SuppressWarnings("all") Bar bar; - @java.lang.SuppressWarnings("all") TestBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class TestBuilder, Quz extends Inter> { + private @java.lang.SuppressWarnings("all") @lombok.Generated Foo foo; + private @java.lang.SuppressWarnings("all") @lombok.Generated Bar bar; + @java.lang.SuppressWarnings("all") @lombok.Generated TestBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithRecursiveGenerics.Test.TestBuilder foo(final Foo foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithRecursiveGenerics.Test.TestBuilder foo(final Foo foo) { this.foo = foo; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithRecursiveGenerics.Test.TestBuilder bar(final Bar bar) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithRecursiveGenerics.Test.TestBuilder bar(final Bar bar) { this.bar = bar; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithRecursiveGenerics.Test build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithRecursiveGenerics.Test build() { return new BuilderWithRecursiveGenerics.Test(this.foo, this.bar); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderWithRecursiveGenerics.Test.TestBuilder(foo=" + this.foo) + ", bar=") + this.bar) + ")"); } } private final Foo foo; private final Bar bar; - @java.lang.SuppressWarnings("all") Test(final Foo foo, final Bar bar) { + @java.lang.SuppressWarnings("all") @lombok.Generated Test(final Foo foo, final Bar bar) { super(); this.foo = foo; this.bar = bar; } - public static @java.lang.SuppressWarnings("all") , Quz extends Inter>BuilderWithRecursiveGenerics.Test.TestBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated , Quz extends Inter>BuilderWithRecursiveGenerics.Test.TestBuilder builder() { return new BuilderWithRecursiveGenerics.Test.TestBuilder(); } - public @java.lang.SuppressWarnings("all") Foo getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Foo getFoo() { return this.foo; } - public @java.lang.SuppressWarnings("all") Bar getBar() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Bar getBar() { return this.bar; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderWithRecursiveGenerics.Test))) @@ -64,7 +64,7 @@ interface Inter> { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $foo = this.getFoo(); @@ -73,7 +73,7 @@ interface Inter> { result = ((result * PRIME) + (($bar == null) ? 43 : $bar.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("BuilderWithRecursiveGenerics.Test(foo=" + this.getFoo()) + ", bar=") + this.getBar()) + ")"); } } @@ -81,4 +81,3 @@ public BuilderWithRecursiveGenerics() { super(); } } - diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilder.java b/test/transform/resource/after-ecj/BuilderWithToBuilder.java index 0ba3e11a99..2da1611b8c 100644 --- a/test/transform/resource/after-ecj/BuilderWithToBuilder.java +++ b/test/transform/resource/after-ecj/BuilderWithToBuilder.java @@ -1,42 +1,42 @@ import java.util.List; import lombok.Builder; @Builder(toBuilder = true) @lombok.experimental.Accessors(prefix = "m") class BuilderWithToBuilder { - public static @java.lang.SuppressWarnings("all") class BuilderWithToBuilderBuilder { - private @java.lang.SuppressWarnings("all") String one; - private @java.lang.SuppressWarnings("all") String two; - private @java.lang.SuppressWarnings("all") T foo; - private @java.lang.SuppressWarnings("all") java.util.ArrayList bars; - @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderWithToBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String one; + private @java.lang.SuppressWarnings("all") @lombok.Generated String two; + private @java.lang.SuppressWarnings("all") @lombok.Generated T foo; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList bars; + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilderBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder one(final String one) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder one(final String one) { this.one = one; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder two(final String two) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder two(final String two) { this.two = two; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder foo(final T foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder foo(final T foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder bar(final T bar) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder bar(final T bar) { if ((this.bars == null)) this.bars = new java.util.ArrayList(); this.bars.add(bar); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder bars(final java.util.Collection bars) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder bars(final java.util.Collection bars) { if ((bars == null)) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -46,12 +46,12 @@ this.bars.addAll(bars); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder clearBars() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder clearBars() { if ((this.bars != null)) this.bars.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder build() { java.util.List bars; switch (((this.bars == null) ? 0 : this.bars.size())) { case 0 : @@ -65,7 +65,7 @@ } return new BuilderWithToBuilder(this.one, this.two, this.foo, bars); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one) + ", two=") + this.two) + ", foo=") + this.foo) + ", bars=") + this.bars) + ")"); } } @@ -76,17 +76,17 @@ public static K rrr(BuilderWithToBuilder x) { return x.foo; } - @java.lang.SuppressWarnings("all") BuilderWithToBuilder(final String one, final String two, final T foo, final List bars) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder(final String one, final String two, final T foo, final List bars) { super(); this.mOne = one; this.mTwo = two; this.foo = foo; this.bars = bars; } - public static @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder builder() { return new BuilderWithToBuilder.BuilderWithToBuilderBuilder(); } - public @java.lang.SuppressWarnings("all") BuilderWithToBuilder.BuilderWithToBuilderBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithToBuilder.BuilderWithToBuilderBuilder toBuilder() { final T foo = BuilderWithToBuilder.rrr(this); final BuilderWithToBuilder.BuilderWithToBuilderBuilder builder = new BuilderWithToBuilder.BuilderWithToBuilderBuilder().one(this.mOne).two(this.mTwo).foo(foo); if ((this.bars != null)) @@ -95,38 +95,38 @@ public static K rrr(BuilderWithToBuilder x) { } } @lombok.experimental.Accessors(prefix = "m") class ConstructorWithToBuilder { - public static @java.lang.SuppressWarnings("all") class ConstructorWithToBuilderBuilder { - private @java.lang.SuppressWarnings("all") String mOne; - private @java.lang.SuppressWarnings("all") T baz; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList bars; - @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorWithToBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String mOne; + private @java.lang.SuppressWarnings("all") @lombok.Generated T baz; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList bars; + @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilderBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder mOne(final String mOne) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder.ConstructorWithToBuilderBuilder mOne(final String mOne) { this.mOne = mOne; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder baz(final T baz) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder.ConstructorWithToBuilderBuilder baz(final T baz) { this.baz = baz; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder bars(final com.google.common.collect.ImmutableList bars) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder.ConstructorWithToBuilderBuilder bars(final com.google.common.collect.ImmutableList bars) { this.bars = bars; return this; } - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder build() { return new ConstructorWithToBuilder(this.mOne, this.baz, this.bars); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne) + ", baz=") + this.baz) + ", bars=") + this.bars) + ")"); } } @@ -137,30 +137,30 @@ public static K rrr(BuilderWithToBuilder x) { public @Builder(toBuilder = true) ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T baz, com.google.common.collect.ImmutableList bars) { super(); } - public static @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder.ConstructorWithToBuilderBuilder builder() { return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(); } - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder.ConstructorWithToBuilderBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorWithToBuilder.ConstructorWithToBuilderBuilder toBuilder() { return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder().mOne(this.mOne).baz(this.foo).bars(this.bars); } } class StaticMethodWithToBuilder { - public static @java.lang.SuppressWarnings("all") class StaticMethodWithToBuilderBuilder { - private @java.lang.SuppressWarnings("all") T foo; - @java.lang.SuppressWarnings("all") StaticMethodWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class StaticMethodWithToBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated T foo; + @java.lang.SuppressWarnings("all") @lombok.Generated StaticMethodWithToBuilderBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder foo(final T foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder foo(final T foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") StaticMethodWithToBuilder build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated StaticMethodWithToBuilder build() { return StaticMethodWithToBuilder.of(this.foo); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder(foo=" + this.foo) + ")"); } } @@ -172,10 +172,10 @@ public StaticMethodWithToBuilder(T foo) { public static @Builder(toBuilder = true) StaticMethodWithToBuilder of(T foo) { return new StaticMethodWithToBuilder(foo); } - public static @java.lang.SuppressWarnings("all") StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder builder() { return new StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder(); } - public @java.lang.SuppressWarnings("all") StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder toBuilder() { return new StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder().foo(this.foo); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/BuilderWithTolerate.java b/test/transform/resource/after-ecj/BuilderWithTolerate.java index 8b6fbb536b..9dff72005a 100644 --- a/test/transform/resource/after-ecj/BuilderWithTolerate.java +++ b/test/transform/resource/after-ecj/BuilderWithTolerate.java @@ -2,24 +2,24 @@ import lombok.experimental.Tolerate; public @Builder class BuilderWithTolerate { public static class BuilderWithTolerateBuilder { - private @java.lang.SuppressWarnings("all") int value; + private @java.lang.SuppressWarnings("all") @lombok.Generated int value; public @Tolerate BuilderWithTolerateBuilder value(String s) { return this.value(Integer.parseInt(s)); } - @java.lang.SuppressWarnings("all") BuilderWithTolerateBuilder() { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithTolerateBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") BuilderWithTolerate.BuilderWithTolerateBuilder value(final int value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithTolerate.BuilderWithTolerateBuilder value(final int value) { this.value = value; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithTolerate build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithTolerate build() { return new BuilderWithTolerate(this.value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value) + ")"); } } @@ -27,11 +27,11 @@ public static class BuilderWithTolerateBuilder { public static void main(String[] args) { BuilderWithTolerate.builder().value("42").build(); } - @java.lang.SuppressWarnings("all") BuilderWithTolerate(final int value) { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithTolerate(final int value) { super(); this.value = value; } - public static @java.lang.SuppressWarnings("all") BuilderWithTolerate.BuilderWithTolerateBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithTolerate.BuilderWithTolerateBuilder builder() { return new BuilderWithTolerate.BuilderWithTolerateBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java index 670d7a2dfa..a52e0c2c43 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java @@ -9,26 +9,26 @@ /** * @return {@code this}. */ - public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBasic withX(final int x) { + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBasic withX(final int x) { return ((this.x == x) ? this : new CheckerFrameworkBasic(x, this.y, this.z)); } - public @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") int getX() { + public @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") int getY() { + public @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } - public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int getZ() { + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated int getZ() { return this.z; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBasic setZ(final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBasic setZ(final int z) { this.z = z; return this; } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof CheckerFrameworkBasic))) @@ -44,10 +44,10 @@ return false; return true; } - protected @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof CheckerFrameworkBasic); } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -55,13 +55,13 @@ result = ((result * PRIME) + this.getZ()); return result; } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("CheckerFrameworkBasic(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")"); } - public @java.lang.SuppressWarnings("all") CheckerFrameworkBasic(final int x, final int y, final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBasic(final int x, final int y, final int z) { super(); this.x = x; this.y = y; this.z = z; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java index 2aa89e5d15..15872a1229 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java @@ -2,19 +2,19 @@ import lombok.Builder; import lombok.Singular; @Builder class CheckerFrameworkBuilder { - public static @java.lang.SuppressWarnings("all") class CheckerFrameworkBuilderBuilder { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") int y; - private @java.lang.SuppressWarnings("all") int z; - private @java.lang.SuppressWarnings("all") java.util.ArrayList names; - @java.lang.SuppressWarnings("all") CheckerFrameworkBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class CheckerFrameworkBuilderBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int y; + private @java.lang.SuppressWarnings("all") @lombok.Generated int z; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList names; + @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilderBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder x(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder x(final int x) { this.x$value = x; x$set = true; return this; @@ -22,24 +22,24 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder y(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder y(final int y) { this.y = y; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder z(final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder z(final int z) { this.z = z; return this; } - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder name(final String name) { if ((this.names == null)) this.names = new java.util.ArrayList(); this.names.add(name); return this; } - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder names(final java.util.Collection names) { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder names(final java.util.Collection names) { if ((names == null)) { throw new java.lang.NullPointerException("names cannot be null"); @@ -49,12 +49,12 @@ this.names.addAll(names); return this; } - public @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder clearNames() { + public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder clearNames() { if ((this.names != null)) this.names.clear(); return this; } - public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder build(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) { + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder build(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) { java.util.List names; switch (((this.names == null) ? 0 : this.names.size())) { case 0 : @@ -71,7 +71,7 @@ x$value = CheckerFrameworkBuilder.$default$x(); return new CheckerFrameworkBuilder(x$value, this.y, this.z, names); } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ", z=") + this.z) + ", names=") + this.names) + ")"); } } @@ -79,17 +79,17 @@ int y; int z; @Singular List names; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { + @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { super(); this.x = x; this.y = y; this.z = z; this.names = names; } - public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkBuilder.@org.checkerframework.common.aliasing.qual.Unique CheckerFrameworkBuilderBuilder builder() { + public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder.@org.checkerframework.common.aliasing.qual.Unique CheckerFrameworkBuilderBuilder builder() { return new CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java index 228993e0a6..4a7c9b352b 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkSuperBuilder.java @@ -2,19 +2,19 @@ import lombok.Singular; class CheckerFrameworkSuperBuilder { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") int y; - private @java.lang.SuppressWarnings("all") int z; - private @java.lang.SuppressWarnings("all") java.util.ArrayList names; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int y; + private @java.lang.SuppressWarnings("all") @lombok.Generated int z; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList names; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B x(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B x(final int x) { this.x$value = x; x$set = true; return self(); @@ -22,24 +22,24 @@ public ParentBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B y(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B y(final int y) { this.y = y; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B z(final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B z(final int z) { this.z = z; return self(); } - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B name(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B name(final String name) { if ((this.names == null)) this.names = new java.util.ArrayList(); this.names.add(name); return self(); } - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B names(final java.util.Collection names) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B names(final java.util.Collection names) { if ((names == null)) { throw new java.lang.NullPointerException("names cannot be null"); @@ -49,25 +49,25 @@ public ParentBuilder() { this.names.addAll(names); return self(); } - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B clearNames() { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B clearNames() { if ((this.names != null)) this.names.clear(); return self(); } - protected abstract @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B self(); - public abstract @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") C build(CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilder this); - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B self(); + public abstract @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated C build(CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilder this); + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("CheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ", z=") + this.z) + ", names=") + this.names) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.common.returnsreceiver.qual.This ParentBuilderImpl self() { + protected @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.common.returnsreceiver.qual.This ParentBuilderImpl self() { return this; } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Parent build(CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.Parent build(CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) { return new CheckerFrameworkSuperBuilder.Parent(this); } } @@ -75,10 +75,10 @@ private ParentBuilderImpl() { int y; int z; @Singular List names; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - protected @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") Parent(final CheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { + protected @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final CheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { super(); if (b.x$set) this.x = b.x$value; @@ -99,22 +99,22 @@ private ParentBuilderImpl() { } this.names = names; } - public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.common.aliasing.qual.Unique ParentBuilder builder() { + public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.Parent. @org.checkerframework.common.aliasing.qual.Unique ParentBuilder builder() { return new CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class ZChild extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ZChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") int a$value; - private @java.lang.SuppressWarnings("all") boolean a$set; - private @java.lang.SuppressWarnings("all") int b; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ZChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int a$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean a$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int b; public ZChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B a(final int a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B a(final int a) { this.a$value = a; a$set = true; return self(); @@ -122,33 +122,33 @@ public ZChildBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B b(final int b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B b(final int b) { this.b = b; return self(); } - protected abstract @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @org.checkerframework.common.returnsreceiver.qual.This B self(); - public abstract @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") C build(CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilder this); - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated @org.checkerframework.common.returnsreceiver.qual.This B self(); + public abstract @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated C build(CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilder this); + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder(super=" + super.toString()) + ", a$value=") + this.a$value) + ", b=") + this.b) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ZChildBuilderImpl extends CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ZChildBuilderImpl extends CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { private ZChildBuilderImpl() { super(); } - protected @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.common.returnsreceiver.qual.This ZChildBuilderImpl self() { + protected @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.common.returnsreceiver.qual.This ZChildBuilderImpl self() { return this; } - public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.ZChild build(CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilderImpl this) { + public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.ZChild build(CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilderImpl this) { return new CheckerFrameworkSuperBuilder.ZChild(this); } } @lombok.Builder.Default int a; int b; - private static @java.lang.SuppressWarnings("all") int $default$a() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$a() { return 1; } - protected @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") ZChild(final CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { + protected @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated ZChild(final CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { super(b); if (b.a$set) this.a = b.a$value; @@ -156,7 +156,7 @@ private ZChildBuilderImpl() { this.a = CheckerFrameworkSuperBuilder.ZChild.$default$a(); this.b = b.b; } - public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.common.aliasing.qual.Unique ZChildBuilder builder() { + public static @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.common.aliasing.qual.Unique ZChildBuilder builder() { return new CheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java index fdb6f1228d..2dbf8d1f26 100644 --- a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java +++ b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java @@ -3,7 +3,7 @@ class GetFoo { GetFoo() { super(); } - public @java.lang.SuppressWarnings("all") int getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/CommentsInterspersed.java b/test/transform/resource/after-ecj/CommentsInterspersed.java index d708ad7280..b3b3de6606 100644 --- a/test/transform/resource/after-ecj/CommentsInterspersed.java +++ b/test/transform/resource/after-ecj/CommentsInterspersed.java @@ -6,7 +6,7 @@ public CommentsInterspersed() { super(); } public native void gwtTest(); - public @java.lang.SuppressWarnings("all") String getTest() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getTest() { return this.test; } } diff --git a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java index a7a53ac05a..39df9e560e 100644 --- a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java +++ b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java @@ -1,5 +1,5 @@ @lombok.Data(staticConstructor = "of") @lombok.NoArgsConstructor class ConflictingStaticConstructorNames { - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ConflictingStaticConstructorNames))) @@ -9,17 +9,17 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof ConflictingStaticConstructorNames); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "ConflictingStaticConstructorNames()"; } - public @java.lang.SuppressWarnings("all") ConflictingStaticConstructorNames() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConflictingStaticConstructorNames() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ConstructorInner.java b/test/transform/resource/after-ecj/ConstructorInner.java index be8ea17e2a..aecda71636 100644 --- a/test/transform/resource/after-ecj/ConstructorInner.java +++ b/test/transform/resource/after-ecj/ConstructorInner.java @@ -1,13 +1,13 @@ class ConstructorInner { static @lombok.AllArgsConstructor(staticName = "of") class Inner { - private @java.lang.SuppressWarnings("all") Inner() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Inner() { super(); } - public static @java.lang.SuppressWarnings("all") ConstructorInner.Inner of() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorInner.Inner of() { return new ConstructorInner.Inner(); } } ConstructorInner() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/Constructors.java b/test/transform/resource/after-ecj/Constructors.java index 8f8ee12949..40f3c912a0 100644 --- a/test/transform/resource/after-ecj/Constructors.java +++ b/test/transform/resource/after-ecj/Constructors.java @@ -1,7 +1,7 @@ @lombok.RequiredArgsConstructor class RequiredArgsConstructor1 { final int x; String name; - public @java.lang.SuppressWarnings("all") RequiredArgsConstructor1(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructor1(final int x) { super(); this.x = x; } @@ -9,7 +9,7 @@ @lombok.RequiredArgsConstructor(access = lombok.AccessLevel.PROTECTED) class RequiredArgsConstructorAccess { final int x; String name; - protected @java.lang.SuppressWarnings("all") RequiredArgsConstructorAccess(final int x) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorAccess(final int x) { super(); this.x = x; } @@ -17,18 +17,18 @@ @lombok.RequiredArgsConstructor(staticName = "staticname") class RequiredArgsConstructorStaticName { final int x; String name; - private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticName(final int x) { + private @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticName(final int x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticName staticname(final int x) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticName staticname(final int x) { return new RequiredArgsConstructorStaticName(x); } } @lombok.RequiredArgsConstructor() class RequiredArgsConstructorWithAnnotations { final int x; String name; - public @Deprecated @java.lang.SuppressWarnings("all") RequiredArgsConstructorWithAnnotations(final int x) { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorWithAnnotations(final int x) { super(); this.x = x; } @@ -36,7 +36,7 @@ @lombok.AllArgsConstructor class AllArgsConstructor1 { final int x; String name; - public @java.lang.SuppressWarnings("all") AllArgsConstructor1(final int x, final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated AllArgsConstructor1(final int x, final String name) { super(); this.x = x; this.name = name; @@ -45,35 +45,35 @@ @lombok.NoArgsConstructor class NoArgsConstructor1 { int x; String name; - public @java.lang.SuppressWarnings("all") NoArgsConstructor1() { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsConstructor1() { super(); } } @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics { final T x; String name; - private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics(final T x) { + private @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticNameGenerics(final T x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics of(final T x) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticNameGenerics of(final T x) { return new RequiredArgsConstructorStaticNameGenerics(x); } } @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics2 { final Class x; String name; - private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics2(final Class x) { + private @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticNameGenerics2(final Class x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics2 of(final Class x) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated RequiredArgsConstructorStaticNameGenerics2 of(final Class x) { return new RequiredArgsConstructorStaticNameGenerics2(x); } } @lombok.AllArgsConstructor(access = lombok.AccessLevel.PACKAGE) class AllArgsConstructorPackageAccess { final String x; - @java.lang.SuppressWarnings("all") AllArgsConstructorPackageAccess(final String x) { + @java.lang.SuppressWarnings("all") @lombok.Generated AllArgsConstructorPackageAccess(final String x) { super(); this.x = x; } @@ -86,7 +86,7 @@ final float f; final String s; byte z; - public @java.lang.SuppressWarnings("all") NoArgsConstructor2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsConstructor2() { super(); this.x = 0; this.y = 0D; @@ -95,4 +95,4 @@ this.f = 0F; this.s = null; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ConstructorsConfiguration.java b/test/transform/resource/after-ecj/ConstructorsConfiguration.java index 2e88a59fa1..81508b9108 100644 --- a/test/transform/resource/after-ecj/ConstructorsConfiguration.java +++ b/test/transform/resource/after-ecj/ConstructorsConfiguration.java @@ -1,6 +1,6 @@ @lombok.AllArgsConstructor class ConstructorsConfiguration { int x; - public @java.lang.SuppressWarnings("all") ConstructorsConfiguration(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsConfiguration(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java b/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java index 545ab04d0c..25092e5b1e 100644 --- a/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java +++ b/test/transform/resource/after-ecj/ConstructorsInAnonymousClass.java @@ -7,7 +7,7 @@ public class ConstructorsInAnonymousClass { @AllArgsConstructor @RequiredArgsConstructor @NoArgsConstructor class Inner { private String string; private @NonNull String string2; - public @java.lang.SuppressWarnings("all") Inner(final String string, final @NonNull String string2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner(final String string, final @NonNull String string2) { super(); if ((string2 == null)) { @@ -16,7 +16,7 @@ public class ConstructorsInAnonymousClass { this.string = string; this.string2 = string2; } - public @java.lang.SuppressWarnings("all") Inner(final @NonNull String string2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner(final @NonNull String string2) { super(); if ((string2 == null)) { @@ -24,7 +24,7 @@ public class ConstructorsInAnonymousClass { } this.string2 = string2; } - public @java.lang.SuppressWarnings("all") Inner() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner() { super(); } } diff --git a/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java b/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java index 3491239ffc..b6a95e053b 100644 --- a/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java +++ b/test/transform/resource/after-ecj/ConstructorsTypeAnnos.java @@ -7,7 +7,7 @@ } @lombok.AllArgsConstructor class ConstructorsTypeAnnos { @TA @TB List foo; - public @java.lang.SuppressWarnings("all") ConstructorsTypeAnnos(final @TA List foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsTypeAnnos(final @TA List foo) { super(); this.foo = foo; } diff --git a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java index 552c5c2da7..27208c53b4 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java +++ b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java @@ -3,7 +3,7 @@ int pUpper; int _huh; int __huh2; - public @java.lang.SuppressWarnings("all") ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { super(); this.plower = plower; this.pUpper = upper; @@ -16,7 +16,7 @@ @lombok.NonNull Integer pUpper; @lombok.NonNull Integer _huh; final @lombok.NonNull Integer __huh2; - public @java.lang.SuppressWarnings("all") ConstructorsWithAccessorsNonNull(final @lombok.NonNull Integer plower, final @lombok.NonNull Integer upper, final @lombok.NonNull Integer huh, final @lombok.NonNull Integer _huh2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithAccessorsNonNull(final @lombok.NonNull Integer plower, final @lombok.NonNull Integer upper, final @lombok.NonNull Integer huh, final @lombok.NonNull Integer _huh2) { super(); if ((plower == null)) { @@ -39,4 +39,4 @@ this._huh = huh; this.__huh2 = _huh2; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java index 1fcd97e332..c47141b0c9 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java +++ b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java @@ -3,17 +3,17 @@ import lombok.Value; import lombok.Builder; final @NoArgsConstructor(force = true) @AllArgsConstructor @Builder @Value class ConstructorsWithBuilderDefaults { - public static @java.lang.SuppressWarnings("all") class ConstructorsWithBuilderDefaultsBuilder { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") int y; - @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorsWithBuilderDefaultsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int y; + @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaultsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final int x) { this.x$value = x; x$set = true; return this; @@ -21,35 +21,35 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder y(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder y(final int y) { this.y = y; return this; } - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults build() { int x$value = this.x$value; if ((! this.x$set)) x$value = ConstructorsWithBuilderDefaults.$default$x(); return new ConstructorsWithBuilderDefaults(x$value, this.y); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ")"); } } private final @Builder.Default int x; private final int y; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - public static @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") int getY() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ConstructorsWithBuilderDefaults))) @@ -61,22 +61,22 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); result = ((result * PRIME) + this.getY()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ConstructorsWithBuilderDefaults(x=" + this.getX()) + ", y=") + this.getY()) + ")"); } - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults() { super(); this.y = 0; this.x = ConstructorsWithBuilderDefaults.$default$x(); } - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults(final int x, final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults(final int x, final int y) { super(); this.x = x; this.y = y; diff --git a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java index 4d6e70794e..7581bd4688 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java +++ b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java @@ -2,19 +2,19 @@ import lombok.Value; import lombok.Builder; final @Builder @Value class ConstructorsWithBuilderDefaults { - public static @java.lang.SuppressWarnings("all") class ConstructorsWithBuilderDefaultsBuilder { - private @java.lang.SuppressWarnings("all") java.util.List z$value; - private @java.lang.SuppressWarnings("all") boolean z$set; - private @java.lang.SuppressWarnings("all") T x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") T q; - @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorsWithBuilderDefaultsBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.List z$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean z$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated T x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated T q; + @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaultsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder z(final java.util.List z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder z(final java.util.List z) { this.z$value = z; z$set = true; return this; @@ -22,7 +22,7 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final T x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final T x) { this.x$value = x; x$set = true; return this; @@ -30,11 +30,11 @@ /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder q(final T q) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder q(final T q) { this.q = q; return this; } - public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults build() { java.util.List z$value = this.z$value; if ((! this.z$set)) z$value = ConstructorsWithBuilderDefaults.$default$z(); @@ -43,38 +43,38 @@ x$value = ConstructorsWithBuilderDefaults.$default$x(); return new ConstructorsWithBuilderDefaults(z$value, x$value, this.q); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(z$value=" + this.z$value) + ", x$value=") + this.x$value) + ", q=") + this.q) + ")"); } } private final @Builder.Default java.util.List z; private final @Builder.Default T x; private final T q; - private static @java.lang.SuppressWarnings("all") java.util.List $default$z() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated java.util.List $default$z() { return new java.util.ArrayList(); } - private static @java.lang.SuppressWarnings("all") T $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated T $default$x() { return null; } - @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults(final java.util.List z, final T x, final T q) { + @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults(final java.util.List z, final T x, final T q) { super(); this.z = z; this.x = x; this.q = q; } - public static @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(); } - public @java.lang.SuppressWarnings("all") java.util.List getZ() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.util.List getZ() { return this.z; } - public @java.lang.SuppressWarnings("all") T getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated T getX() { return this.x; } - public @java.lang.SuppressWarnings("all") T getQ() { + public @java.lang.SuppressWarnings("all") @lombok.Generated T getQ() { return this.q; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ConstructorsWithBuilderDefaults))) @@ -94,7 +94,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $z = this.getZ(); @@ -105,10 +105,10 @@ result = ((result * PRIME) + (($q == null) ? 43 : $q.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("ConstructorsWithBuilderDefaults(z=" + this.getZ()) + ", x=") + this.getX()) + ", q=") + this.getQ()) + ")"); } - private @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults() { + private @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithBuilderDefaults() { super(); this.q = null; this.z = ConstructorsWithBuilderDefaults.$default$z(); diff --git a/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java b/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java index 16a4ee929f..6c9b8b8197 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java +++ b/test/transform/resource/after-ecj/ConstructorsWithSuperBuilderDefaults.java @@ -3,17 +3,17 @@ import lombok.experimental.SuperBuilder; import lombok.Builder; @NoArgsConstructor @AllArgsConstructor @SuperBuilder class ConstructorsWithSuperBuilderDefaults { - public static abstract @java.lang.SuppressWarnings("all") class ConstructorsWithSuperBuilderDefaultsBuilder> { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") int y; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorsWithSuperBuilderDefaultsBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int y; public ConstructorsWithSuperBuilderDefaultsBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B x(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B x(final int x) { this.x$value = x; x$set = true; return self(); @@ -21,33 +21,33 @@ public ConstructorsWithSuperBuilderDefaultsBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B y(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B y(final int y) { this.y = y; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ConstructorsWithSuperBuilderDefaultsBuilderImpl extends ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ConstructorsWithSuperBuilderDefaultsBuilderImpl extends ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder { private ConstructorsWithSuperBuilderDefaultsBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults build() { return new ConstructorsWithSuperBuilderDefaults(this); } } @Builder.Default int x; int y; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - protected @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults(final ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults(final ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder b) { super(); if (b.x$set) this.x = b.x$value; @@ -55,16 +55,16 @@ private ConstructorsWithSuperBuilderDefaultsBuilderImpl() { this.x = ConstructorsWithSuperBuilderDefaults.$default$x(); this.y = b.y; } - public static @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder builder() { return new ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilderImpl(); } - public @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults() { super(); this.x = ConstructorsWithSuperBuilderDefaults.$default$x(); } - public @java.lang.SuppressWarnings("all") ConstructorsWithSuperBuilderDefaults(final int x, final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorsWithSuperBuilderDefaults(final int x, final int y) { super(); this.x = x; this.y = y; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/DataConfiguration.java b/test/transform/resource/after-ecj/DataConfiguration.java index 25f7620e0e..7b09545399 100644 --- a/test/transform/resource/after-ecj/DataConfiguration.java +++ b/test/transform/resource/after-ecj/DataConfiguration.java @@ -1,9 +1,9 @@ @lombok.Data class DataConfiguration { final int x; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataConfiguration))) @@ -15,23 +15,23 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataConfiguration); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("DataConfiguration(x=" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") DataConfiguration(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated DataConfiguration(final int x) { super(); this.x = x; } - private @java.lang.SuppressWarnings("all") DataConfiguration() { + private @java.lang.SuppressWarnings("all") @lombok.Generated DataConfiguration() { super(); this.x = 0; } diff --git a/test/transform/resource/after-ecj/DataExtended.java b/test/transform/resource/after-ecj/DataExtended.java index 3250421fc2..d5ec1e492d 100644 --- a/test/transform/resource/after-ecj/DataExtended.java +++ b/test/transform/resource/after-ecj/DataExtended.java @@ -1,12 +1,12 @@ @lombok.Data @lombok.ToString(doNotUseGetters = true) class DataExtended { int x; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataExtended))) @@ -18,19 +18,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataExtended); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.SuppressWarnings("all") DataExtended() { + public @java.lang.SuppressWarnings("all") @lombok.Generated DataExtended() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("DataExtended(x=" + this.x) + ")"); } } diff --git a/test/transform/resource/after-ecj/DataIgnore.java b/test/transform/resource/after-ecj/DataIgnore.java index d3ac8aa3bd..8c20c1e462 100644 --- a/test/transform/resource/after-ecj/DataIgnore.java +++ b/test/transform/resource/after-ecj/DataIgnore.java @@ -1,10 +1,10 @@ @lombok.Data class DataIgnore { final int x; String $name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataIgnore))) @@ -16,19 +16,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataIgnore); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("DataIgnore(x=" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") DataIgnore(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated DataIgnore(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/DataInAnonymousClass.java b/test/transform/resource/after-ecj/DataInAnonymousClass.java index c6e22f8029..5a6786478c 100644 --- a/test/transform/resource/after-ecj/DataInAnonymousClass.java +++ b/test/transform/resource/after-ecj/DataInAnonymousClass.java @@ -3,13 +3,13 @@ public class DataInAnonymousClass { Object annonymous = new Object() { @Data class Inner { private String string; - public @java.lang.SuppressWarnings("all") String getString() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getString() { return this.string; } - public @java.lang.SuppressWarnings("all") void setString(final String string) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setString(final String string) { this.string = string; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Inner))) @@ -23,20 +23,20 @@ public class DataInAnonymousClass { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Inner); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $string = this.getString(); result = ((result * PRIME) + (($string == null) ? 43 : $string.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Inner(string=" + this.getString()) + ")"); } - public @java.lang.SuppressWarnings("all") Inner() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner() { super(); } } diff --git a/test/transform/resource/after-ecj/DataOnEnum.java b/test/transform/resource/after-ecj/DataOnEnum.java index 31eb12ec92..2529543f54 100644 --- a/test/transform/resource/after-ecj/DataOnEnum.java +++ b/test/transform/resource/after-ecj/DataOnEnum.java @@ -3,13 +3,13 @@ private final String someField; () { } - public @java.lang.SuppressWarnings("all") String getSomeField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getSomeField() { return this.someField; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("DataOnEnum." + this.name()) + "(someField=") + this.getSomeField()) + ")"); } - private @java.lang.SuppressWarnings("all") DataOnEnum(final String someField) { + private @java.lang.SuppressWarnings("all") @lombok.Generated DataOnEnum(final String someField) { super(); this.someField = someField; } diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java index ae986676d9..ebb935fbb3 100644 --- a/test/transform/resource/after-ecj/DataOnLocalClass.java +++ b/test/transform/resource/after-ecj/DataOnLocalClass.java @@ -7,16 +7,16 @@ public static void main(String[] args) { @Data class Local { final int x; String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local))) @@ -32,10 +32,10 @@ public static void main(String[] args) { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -43,10 +43,10 @@ public static void main(String[] args) { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Local(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Local(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Local(final int x) { super(); this.x = x; } @@ -58,17 +58,17 @@ class DataOnLocalClass2 { @Data class Local { @Data class InnerLocal { @lombok.NonNull String name; - public @lombok.NonNull @java.lang.SuppressWarnings("all") String getName() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") void setName(final @lombok.NonNull String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setName(final @lombok.NonNull String name) { if ((name == null)) { throw new java.lang.NullPointerException("name is marked non-null but is null"); } this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local.InnerLocal))) @@ -82,20 +82,20 @@ class DataOnLocalClass2 { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local.InnerLocal); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $name = this.getName(); result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Local.InnerLocal(name=" + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") InnerLocal(final @lombok.NonNull String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated InnerLocal(final @lombok.NonNull String name) { super(); if ((name == null)) { @@ -105,10 +105,10 @@ class DataOnLocalClass2 { } } final int x; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local))) @@ -120,19 +120,19 @@ class DataOnLocalClass2 { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Local(x=" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") Local(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Local(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java index d9119388e6..295d814cbc 100644 --- a/test/transform/resource/after-ecj/DataPlain.java +++ b/test/transform/resource/after-ecj/DataPlain.java @@ -2,16 +2,16 @@ @lombok.Data class Data1 { final int x; String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data1))) @@ -27,10 +27,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -38,10 +38,10 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Data1(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Data1(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data1(final int x) { super(); this.x = x; } @@ -49,16 +49,16 @@ @Data class Data2 { final int x; String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data2))) @@ -74,10 +74,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -85,10 +85,10 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Data2(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Data2(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data2(final int x) { super(); this.x = x; } @@ -96,16 +96,16 @@ final @Data class Data3 { final int x; String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data3))) @@ -119,7 +119,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -127,10 +127,10 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Data3(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Data3(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data3(final int x) { super(); this.x = x; } @@ -140,16 +140,16 @@ Data4() { super(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Data4(x=" + this.getX()) + ")"); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data4))) @@ -163,10 +163,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data4); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = super.hashCode(); result = ((result * PRIME) + this.getX()); @@ -174,7 +174,7 @@ } } @Data class Data5 { - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data5))) @@ -184,36 +184,36 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data5); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "Data5()"; } - public @java.lang.SuppressWarnings("all") Data5() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data5() { super(); } } final @Data class Data6 { - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data6))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "Data6()"; } - public @java.lang.SuppressWarnings("all") Data6() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data6() { super(); } } diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java index fa291eca29..49ac3ef0fe 100644 --- a/test/transform/resource/after-ecj/DataWithGetter.java +++ b/test/transform/resource/after-ecj/DataWithGetter.java @@ -2,13 +2,13 @@ private int x; private int y; private final String z; - public @java.lang.SuppressWarnings("all") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.SuppressWarnings("all") void setY(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setY(final int y) { this.y = y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataWithGetter))) @@ -26,10 +26,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataWithGetter); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -38,20 +38,20 @@ result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("DataWithGetter(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")"); } - public @java.lang.SuppressWarnings("all") DataWithGetter(final String z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated DataWithGetter(final String z) { super(); this.z = z; } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") int getY() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } - public @java.lang.SuppressWarnings("all") String getZ() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getZ() { return this.z; } } diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java index 4545dc464f..cd17ac0b37 100644 --- a/test/transform/resource/after-ecj/DataWithGetterNone.java +++ b/test/transform/resource/after-ecj/DataWithGetterNone.java @@ -2,13 +2,13 @@ private int x; private int y; private final String z; - public @java.lang.SuppressWarnings("all") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.SuppressWarnings("all") void setY(final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setY(final int y) { this.y = y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataWithGetterNone))) @@ -26,10 +26,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataWithGetterNone); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -38,10 +38,10 @@ result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("DataWithGetterNone(x=" + this.x) + ", y=") + this.y) + ", z=") + this.z) + ")"); } - public @java.lang.SuppressWarnings("all") DataWithGetterNone(final String z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated DataWithGetterNone(final String z) { super(); this.z = z; } diff --git a/test/transform/resource/after-ecj/DataWithOverrideEqualsAndHashCode.java b/test/transform/resource/after-ecj/DataWithOverrideEqualsAndHashCode.java index 2149321f63..fe88844d64 100644 --- a/test/transform/resource/after-ecj/DataWithOverrideEqualsAndHashCode.java +++ b/test/transform/resource/after-ecj/DataWithOverrideEqualsAndHashCode.java @@ -12,10 +12,10 @@ public int hashCode() { public boolean equals(Object other) { return false; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "DataWithOverrideEqualsAndHashCode.Data2()"; } - public @java.lang.SuppressWarnings("all") Data2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Data2() { super(); } } diff --git a/test/transform/resource/after-ecj/EqualsAndHashCode.java b/test/transform/resource/after-ecj/EqualsAndHashCode.java index 10c2c7da7a..7bb342d0ea 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCode.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCode.java @@ -7,7 +7,7 @@ EqualsAndHashCode() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode))) @@ -31,10 +31,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -56,7 +56,7 @@ EqualsAndHashCode2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode2))) @@ -74,7 +74,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -91,7 +91,7 @@ EqualsAndHashCode3() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode3))) @@ -101,10 +101,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -113,7 +113,7 @@ EqualsAndHashCode4() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode4))) @@ -125,10 +125,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode4); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = super.hashCode(); return result; } diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeAnnotated.java b/test/transform/resource/after-ecj/EqualsAndHashCodeAnnotated.java index 4e377fb47f..da8f352cd6 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeAnnotated.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeAnnotated.java @@ -11,7 +11,7 @@ EqualsAndHashCodeAnnotated() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeAnnotated))) @@ -35,10 +35,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeAnnotated); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.primitive); @@ -50,4 +50,4 @@ result = ((result * PRIME) + java.util.Arrays.deepHashCode(this.moreObjectValues)); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeAutoExclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeAutoExclude.java index 7e6e171b5e..3be7047c5e 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeAutoExclude.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeAutoExclude.java @@ -5,7 +5,7 @@ EqualsAndHashCodeAutoExclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeAutoExclude))) @@ -17,10 +17,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeAutoExclude); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -34,7 +34,7 @@ EqualsAndHashCodeAutoExclude2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeAutoExclude2))) @@ -54,10 +54,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeAutoExclude2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeCache.java b/test/transform/resource/after-ecj/EqualsAndHashCodeCache.java index 7094b63622..4596294090 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeCache.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeCache.java @@ -1,5 +1,5 @@ @lombok.EqualsAndHashCode(cacheStrategy = lombok.EqualsAndHashCode.CacheStrategy.LAZY) class EqualsAndHashCode { - private transient @java.lang.SuppressWarnings("all") int $hashCodeCache; + private transient @java.lang.SuppressWarnings("all") @lombok.Generated int $hashCodeCache; int x; boolean[] y; Object[] z; @@ -8,7 +8,7 @@ EqualsAndHashCode() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode))) @@ -32,11 +32,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { - if ((this.$hashCodeCache != 0)) + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { + if ((this.$hashCodeCache != 0)) return this.$hashCodeCache; final int PRIME = 59; int result = 1; @@ -54,7 +54,7 @@ } } final @lombok.EqualsAndHashCode(cacheStrategy = lombok.EqualsAndHashCode.CacheStrategy.LAZY) class EqualsAndHashCode2 { - private transient @java.lang.SuppressWarnings("all") int $hashCodeCache; + private transient @java.lang.SuppressWarnings("all") @lombok.Generated int $hashCodeCache; int x; long y; float f; @@ -63,7 +63,7 @@ EqualsAndHashCode2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode2))) @@ -81,8 +81,8 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { - if ((this.$hashCodeCache != 0)) + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { + if ((this.$hashCodeCache != 0)) return this.$hashCodeCache; final int PRIME = 59; int result = 1; @@ -100,11 +100,11 @@ } } final @lombok.EqualsAndHashCode(callSuper = false,cacheStrategy = lombok.EqualsAndHashCode.CacheStrategy.LAZY) class EqualsAndHashCode3 extends EqualsAndHashCode { - private transient @java.lang.SuppressWarnings("all") int $hashCodeCache; + private transient @java.lang.SuppressWarnings("all") @lombok.Generated int $hashCodeCache; EqualsAndHashCode3() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode3))) @@ -114,11 +114,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { - if ((this.$hashCodeCache != 0)) + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { + if ((this.$hashCodeCache != 0)) return this.$hashCodeCache; int result = 1; if ((result == 0)) @@ -128,11 +128,11 @@ } } @lombok.EqualsAndHashCode(callSuper = true,cacheStrategy = lombok.EqualsAndHashCode.CacheStrategy.LAZY) class EqualsAndHashCode4 extends EqualsAndHashCode { - private transient @java.lang.SuppressWarnings("all") int $hashCodeCache; + private transient @java.lang.SuppressWarnings("all") @lombok.Generated int $hashCodeCache; EqualsAndHashCode4() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode4))) @@ -144,11 +144,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode4); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { - if ((this.$hashCodeCache != 0)) + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { + if ((this.$hashCodeCache != 0)) return this.$hashCodeCache; int result = super.hashCode(); if ((result == 0)) @@ -158,11 +158,11 @@ } } final @lombok.EqualsAndHashCode(callSuper = true,cacheStrategy = lombok.EqualsAndHashCode.CacheStrategy.LAZY) class EqualsAndHashCode5 extends EqualsAndHashCode { - private transient @java.lang.SuppressWarnings("all") int $hashCodeCache; + private transient @java.lang.SuppressWarnings("all") @lombok.Generated int $hashCodeCache; EqualsAndHashCode5() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode5))) @@ -174,11 +174,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode5); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { - if ((this.$hashCodeCache != 0)) + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { + if ((this.$hashCodeCache != 0)) return this.$hashCodeCache; int result = super.hashCode(); if ((result == 0)) diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java index 4a265d9c1d..e7fb1e2ade 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java @@ -2,7 +2,7 @@ EqualsAndHashCodeConfigKeys1Parent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys1Parent))) @@ -12,10 +12,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys1Parent); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -25,7 +25,7 @@ EqualsAndHashCodeConfigKeys1() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys1))) @@ -37,13 +37,13 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java index 1257de325b..498527dd25 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java @@ -2,7 +2,7 @@ EqualsAndHashCodeConfigKeys2Object() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys2Object))) @@ -12,10 +12,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys2Object); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -24,7 +24,7 @@ EqualsAndHashCodeConfigKeys2Parent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys2Parent))) @@ -34,10 +34,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys2Parent); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -47,7 +47,7 @@ EqualsAndHashCodeConfigKeys2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys2))) @@ -61,13 +61,13 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = super.hashCode(); result = ((result * PRIME) + this.x); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeEmpty.java b/test/transform/resource/after-ecj/EqualsAndHashCodeEmpty.java index 5b7dd62454..0b96f9eeef 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeEmpty.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeEmpty.java @@ -2,7 +2,7 @@ EqualsAndHashCodeEmpty() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeEmpty))) @@ -12,10 +12,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeEmpty); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -24,7 +24,7 @@ EqualsAndHashCodeEmptyWithSuper() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeEmptyWithSuper))) @@ -36,11 +36,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeEmptyWithSuper); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = super.hashCode(); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java index 96b54039f7..b10a44b575 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java @@ -3,7 +3,7 @@ EqualsAndHashCodeExplicitInclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeExplicitInclude))) @@ -13,11 +13,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeExplicitInclude); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java b/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java index e66850bb60..75ff733e59 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeInAnonymousClass.java @@ -6,7 +6,7 @@ public class EqualsAndHashCodeInAnonymousClass { Inner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Inner))) @@ -20,10 +20,10 @@ public class EqualsAndHashCodeInAnonymousClass { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Inner); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $string = this.string; diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java b/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java index 3f0cfc806d..fac3800bdc 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeNestedShadow.java @@ -6,7 +6,7 @@ class Bar { public Foo() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeNestedShadow.Bar.Foo))) @@ -16,10 +16,10 @@ public Foo() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeNestedShadow.Bar.Foo); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -33,7 +33,7 @@ class Baz { public Foo() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeNestedShadow.Baz.Foo))) @@ -43,10 +43,10 @@ public Foo() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeNestedShadow.Baz.Foo); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } @@ -55,4 +55,4 @@ public Foo() { super(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java b/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java index 7fbe6d24db..1f221fcdec 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeNewStyle.java @@ -15,7 +15,7 @@ public EqualsAndHashCodeNewStyle() { @EqualsAndHashCode.Include(replaces = "g") long i() { return 0; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeNewStyle))) @@ -35,10 +35,10 @@ public EqualsAndHashCodeNewStyle() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeNewStyle); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.b); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java index 8e93963ad3..2527211758 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java @@ -4,7 +4,7 @@ EqualsAndHashCodeOf() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeOf))) @@ -14,7 +14,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -27,7 +27,7 @@ EqualsAndHashCodeExclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeExclude))) @@ -37,7 +37,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java b/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java index ef221261d4..a4ebaf0a89 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java @@ -6,7 +6,7 @@ public EqualsAndHashCodeRank() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeRank))) @@ -22,10 +22,10 @@ public EqualsAndHashCodeRank() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeRank); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.a); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java index cc0d6544ac..c1a8197b14 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java @@ -24,7 +24,7 @@ public boolean equals(Object other) { private boolean canEqual(Object other) { return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithExistingMethods3))) @@ -38,10 +38,10 @@ private boolean canEqual(Object other) { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = super.hashCode(); result = ((result * PRIME) + this.x); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java index 164d0f15dc..8f94f3fc6e 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInners.java @@ -4,7 +4,7 @@ public class EqualsAndHashCodeWithGenericsOnInners { Inner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithGenericsOnInners.Inner))) @@ -16,10 +16,10 @@ public class EqualsAndHashCodeWithGenericsOnInners { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithGenericsOnInners.Inner); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java index 8c849502bf..4dbbb0b46a 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java @@ -4,7 +4,7 @@ public interface EqualsAndHashCodeWithGenericsOnInnersInInterfaces { Inner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner))) @@ -16,10 +16,10 @@ public interface EqualsAndHashCodeWithGenericsOnInnersInInterfaces { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -27,4 +27,3 @@ public interface EqualsAndHashCodeWithGenericsOnInnersInInterfaces { } } } - diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java index 0cd170b48f..829cfa1eba 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java @@ -3,7 +3,7 @@ EqualsAndHashCodeWithNonNullByDefault() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @javax.annotation.Nullable java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final @javax.annotation.Nullable java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithNonNullByDefault))) @@ -13,11 +13,11 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final @javax.annotation.Nullable java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final @javax.annotation.Nullable java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithNonNullByDefault); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java index d8af4c7707..14d4a9378d 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java @@ -1,6 +1,5 @@ @interface Nullable { } - @lombok.EqualsAndHashCode() class EqualsAndHashCodeWithOnParam { int x; boolean[] y; @@ -10,7 +9,7 @@ EqualsAndHashCodeWithOnParam() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @Nullable java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final @Nullable java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithOnParam))) @@ -34,10 +33,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final @Nullable java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final @Nullable java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithOnParam); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -49,4 +48,4 @@ result = ((result * PRIME) + (($b == null) ? 43 : $b.hashCode())); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java index 781faccbb2..86d25108f8 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java @@ -5,10 +5,10 @@ public int hashCode() { return 42; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("EqualsAndHashCodeWithSomeExistingMethods(x=" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithSomeExistingMethods() { + public @java.lang.SuppressWarnings("all") @lombok.Generated EqualsAndHashCodeWithSomeExistingMethods() { super(); } } @@ -17,7 +17,7 @@ public int hashCode() { protected boolean canEqual(Object other) { return false; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithSomeExistingMethods2))) @@ -29,16 +29,16 @@ protected boolean canEqual(Object other) { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("EqualsAndHashCodeWithSomeExistingMethods2(x=" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithSomeExistingMethods2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated EqualsAndHashCodeWithSomeExistingMethods2() { super(); } } @@ -50,16 +50,16 @@ public int hashCode() { public boolean equals(Object other) { return false; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("EqualsAndHashCodeWithAllExistingMethods(x=" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithAllExistingMethods() { + public @java.lang.SuppressWarnings("all") @lombok.Generated EqualsAndHashCodeWithAllExistingMethods() { super(); } } @Data @Getter(AccessLevel.NONE) @Setter(lombok.AccessLevel.NONE) class EqualsAndHashCodeWithNoExistingMethods { int x; - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithNoExistingMethods))) @@ -71,19 +71,19 @@ public boolean equals(Object other) { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithNoExistingMethods); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("EqualsAndHashCodeWithNoExistingMethods(x=" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithNoExistingMethods() { + public @java.lang.SuppressWarnings("all") @lombok.Generated EqualsAndHashCodeWithNoExistingMethods() { super(); } } diff --git a/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java b/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java index 02def41a55..530b10470b 100644 --- a/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java +++ b/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java @@ -1,6 +1,6 @@ @lombok.RequiredArgsConstructor class FieldDefaultsViaConfigAndRequiredArgsConstructor { final int x; - public @java.lang.SuppressWarnings("all") FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/FieldNameConstantsBasic.java b/test/transform/resource/after-ecj/FieldNameConstantsBasic.java index 5b58e7d7fa..fad50a6a84 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsBasic.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsBasic.java @@ -1,12 +1,12 @@ import lombok.experimental.FieldNameConstants; import lombok.AccessLevel; public @FieldNameConstants(level = AccessLevel.PACKAGE) class FieldNameConstantsBasic { - static final @java.lang.SuppressWarnings("all") class Fields { + static final @java.lang.SuppressWarnings("all") @lombok.Generated class Fields { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; public static final java.lang.String butPrintMePlease = "butPrintMePlease"; () { } - private @java.lang.SuppressWarnings("all") Fields() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Fields() { super(); } } @@ -20,4 +20,4 @@ public FieldNameConstantsBasic() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java b/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java index 7eb9736489..9e7dcc0538 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsConfigKeys.java @@ -1,9 +1,9 @@ public @lombok.experimental.FieldNameConstants class FieldNameConstantsConfigKeys { - public static final @java.lang.SuppressWarnings("all") class Foobar { + public static final @java.lang.SuppressWarnings("all") @lombok.Generated class Foobar { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; () { } - private @java.lang.SuppressWarnings("all") Foobar() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Foobar() { super(); } } @@ -11,4 +11,4 @@ public FieldNameConstantsConfigKeys() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/FieldNameConstantsEnum.java b/test/transform/resource/after-ecj/FieldNameConstantsEnum.java index 053a6e7ae3..c994b2c72e 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsEnum.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsEnum.java @@ -1,11 +1,11 @@ import lombok.experimental.FieldNameConstants; import lombok.AccessLevel; public @FieldNameConstants(onlyExplicitlyIncluded = true,asEnum = true,innerTypeName = "TypeTest") class FieldNameConstantsEnum { - public @java.lang.SuppressWarnings("all") enum TypeTest { + public @java.lang.SuppressWarnings("all") @lombok.Generated enum TypeTest { iAmADvdPlayer(), $dontSkipMe(), alsoDontSkipMe(), - private @java.lang.SuppressWarnings("all") TypeTest() { + private @java.lang.SuppressWarnings("all") @lombok.Generated TypeTest() { super(); } () { @@ -20,4 +20,4 @@ public FieldNameConstantsEnum() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/FieldNameConstantsHandrolled.java b/test/transform/resource/after-ecj/FieldNameConstantsHandrolled.java index 6762fdd8db..776d2a4e04 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsHandrolled.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsHandrolled.java @@ -7,7 +7,7 @@ public enum TypeTest { thirdField(), () { } - private @java.lang.SuppressWarnings("all") TypeTest() { + private @java.lang.SuppressWarnings("all") @lombok.Generated TypeTest() { super(); } } @@ -28,7 +28,7 @@ public enum TypeTest { public String foo() { return name(); } - private @java.lang.SuppressWarnings("all") TypeTest() { + private @java.lang.SuppressWarnings("all") @lombok.Generated TypeTest() { super(); } } @@ -46,7 +46,7 @@ static class Fields { public static final int alsoAField = 5; () { } - private @java.lang.SuppressWarnings("all") Fields() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Fields() { super(); } } diff --git a/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java b/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java index cec19f3bf1..8eca05e39d 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java @@ -2,12 +2,12 @@ import lombok.experimental.FieldNameConstants; import lombok.AccessLevel; public @FieldNameConstants(level = AccessLevel.PACKAGE) record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, int andMe, String butPrintMePlease) { - static final @java.lang.SuppressWarnings("all") class Fields { + static final @java.lang.SuppressWarnings("all") @lombok.Generated class Fields { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; public static final java.lang.String butPrintMePlease = "butPrintMePlease"; () { } - private @java.lang.SuppressWarnings("all") Fields() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Fields() { super(); } } diff --git a/test/transform/resource/after-ecj/FieldNameConstantsUppercased.java b/test/transform/resource/after-ecj/FieldNameConstantsUppercased.java index a858b91f27..a3a64b50a4 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsUppercased.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsUppercased.java @@ -1,12 +1,12 @@ import lombok.experimental.FieldNameConstants; import lombok.AccessLevel; public @FieldNameConstants(level = AccessLevel.PACKAGE) class FieldNameConstantsUppercased { - static final @java.lang.SuppressWarnings("all") class Fields { + static final @java.lang.SuppressWarnings("all") @lombok.Generated class Fields { public static final java.lang.String I_AM_A_DVD_PLAYER = "iAmADvdPlayer"; public static final java.lang.String BUT_PRINT_ME_PLEASE = "butPrintMePlease"; () { } - private @java.lang.SuppressWarnings("all") Fields() { + private @java.lang.SuppressWarnings("all") @lombok.Generated Fields() { super(); } } @@ -20,4 +20,4 @@ public FieldNameConstantsUppercased() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java b/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java index 9cd996d51b..2151e8f3f6 100644 --- a/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java +++ b/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java @@ -3,7 +3,7 @@ class GenerateSuppressFBWarnings { GenerateSuppressFBWarnings() { super(); } - public @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") int getY() { + public @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") @lombok.Generated int getY() { return this.y; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GeneratedJavaxJakarta.java b/test/transform/resource/after-ecj/GeneratedJavaxJakarta.java index 184df939bc..90536ac6ef 100644 --- a/test/transform/resource/after-ecj/GeneratedJavaxJakarta.java +++ b/test/transform/resource/after-ecj/GeneratedJavaxJakarta.java @@ -3,7 +3,7 @@ class GeneratedJavaxJakarta { GeneratedJavaxJakarta() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @jakarta.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @jakarta.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/GeneratedJavaxOff.java b/test/transform/resource/after-ecj/GeneratedJavaxOffLombokOff.java similarity index 64% rename from test/transform/resource/after-ecj/GeneratedJavaxOff.java rename to test/transform/resource/after-ecj/GeneratedJavaxOffLombokOff.java index 481e0ba937..42fbaaac5a 100644 --- a/test/transform/resource/after-ecj/GeneratedJavaxOff.java +++ b/test/transform/resource/after-ecj/GeneratedJavaxOffLombokOff.java @@ -1,6 +1,6 @@ -class GeneratedJavaxOff { +class GeneratedJavaxOffLombokOff { @lombok.Getter int x; - GeneratedJavaxOff() { + GeneratedJavaxOffLombokOff() { super(); } public @java.lang.SuppressWarnings("all") int getX() { diff --git a/test/transform/resource/after-ecj/GeneratedOff.java b/test/transform/resource/after-ecj/GeneratedOff.java index 2644e42cff..1fc8ddf1d3 100644 --- a/test/transform/resource/after-ecj/GeneratedOff.java +++ b/test/transform/resource/after-ecj/GeneratedOff.java @@ -3,7 +3,7 @@ class GeneratedOff { GeneratedOff() { super(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/GeneratedOffJavaxOn.java b/test/transform/resource/after-ecj/GeneratedOffJavaxOn.java index c21b53795b..79c7e9d291 100644 --- a/test/transform/resource/after-ecj/GeneratedOffJavaxOn.java +++ b/test/transform/resource/after-ecj/GeneratedOffJavaxOn.java @@ -3,7 +3,7 @@ class GeneratedOffJavaxOn { GeneratedOffJavaxOn() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/GeneratedOn.java b/test/transform/resource/after-ecj/GeneratedOn.java index 9d72333407..b543cc138f 100644 --- a/test/transform/resource/after-ecj/GeneratedOn.java +++ b/test/transform/resource/after-ecj/GeneratedOn.java @@ -3,7 +3,7 @@ class GeneratedOn { GeneratedOn() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/GetterAccessLevel.java b/test/transform/resource/after-ecj/GetterAccessLevel.java index 14edfb5693..85ad5d5bcb 100644 --- a/test/transform/resource/after-ecj/GetterAccessLevel.java +++ b/test/transform/resource/after-ecj/GetterAccessLevel.java @@ -13,31 +13,31 @@ class GetterAccessLevel { GetterAccessLevel() { super(); } - private @java.lang.SuppressWarnings("all") boolean isPrivate() { + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPrivate() { return this.isPrivate; } - @java.lang.SuppressWarnings("all") boolean isPackage() { + @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPackage() { return this.isPackage; } - protected @java.lang.SuppressWarnings("all") boolean isProtected() { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean isProtected() { return this.isProtected; } - public @java.lang.SuppressWarnings("all") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPublic() { return this.isPublic; } - private @java.lang.SuppressWarnings("all") String getPrivateString() { + private @java.lang.SuppressWarnings("all") @lombok.Generated String getPrivateString() { return this.privateString; } - @java.lang.SuppressWarnings("all") String getPackageString() { + @java.lang.SuppressWarnings("all") @lombok.Generated String getPackageString() { return this.packageString; } - protected @java.lang.SuppressWarnings("all") String getProtectedString() { + protected @java.lang.SuppressWarnings("all") @lombok.Generated String getProtectedString() { return this.protectedString; } - public @java.lang.SuppressWarnings("all") String getPublicString() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getPublicString() { return this.publicString; } - public @java.lang.SuppressWarnings("all") String getValue() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getValue() { return this.value; } } diff --git a/test/transform/resource/after-ecj/GetterAlreadyExists.java b/test/transform/resource/after-ecj/GetterAlreadyExists.java index 04f5b81e90..8bc5011105 100644 --- a/test/transform/resource/after-ecj/GetterAlreadyExists.java +++ b/test/transform/resource/after-ecj/GetterAlreadyExists.java @@ -6,7 +6,7 @@ class Getter1 { boolean hasFoo() { return true; } - public @java.lang.SuppressWarnings("all") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isFoo() { return this.foo; } } @@ -36,7 +36,7 @@ class Getter4 { String hasFoo() { return null; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -48,7 +48,7 @@ class Getter5 { String isFoo() { return null; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -69,7 +69,7 @@ class Getter7 { boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -81,7 +81,7 @@ class Getter8 { boolean isFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -102,7 +102,7 @@ class Getter10 { static boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isFoo() { return this.foo; } } @@ -132,7 +132,7 @@ class Getter13 { static boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -144,7 +144,7 @@ class Getter14 { static boolean isFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -165,7 +165,7 @@ class Getter16 { static String hasFoo() { return ""; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } @@ -177,7 +177,7 @@ class Getter17 { static String isFoo() { return ""; } - public @java.lang.SuppressWarnings("all") String getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterBoolean.java b/test/transform/resource/after-ecj/GetterBoolean.java index a7dc2e2fec..afc8912945 100644 --- a/test/transform/resource/after-ecj/GetterBoolean.java +++ b/test/transform/resource/after-ecj/GetterBoolean.java @@ -5,13 +5,13 @@ class Getter { Getter() { super(); } - public @java.lang.SuppressWarnings("all") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isFoo() { return this.foo; } - public @java.lang.SuppressWarnings("all") boolean isBar() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isBar() { return this.isBar; } - public @java.lang.SuppressWarnings("all") boolean isHasBaz() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isHasBaz() { return this.hasBaz; } } @@ -23,7 +23,7 @@ class MoreGetter { boolean hasFoo() { return true; } - public @java.lang.SuppressWarnings("all") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterDeprecated.java b/test/transform/resource/after-ecj/GetterDeprecated.java index 087a60b89b..c00b875115 100644 --- a/test/transform/resource/after-ecj/GetterDeprecated.java +++ b/test/transform/resource/after-ecj/GetterDeprecated.java @@ -5,13 +5,13 @@ class GetterDeprecated { GetterDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") int getAnnotation() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated int getAnnotation() { return this.annotation; } /** * @deprecated */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") int getJavadoc() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated int getJavadoc() { return this.javadoc; } } diff --git a/test/transform/resource/after-ecj/GetterEnum.java b/test/transform/resource/after-ecj/GetterEnum.java index fd70ce9ed8..ce18806087 100644 --- a/test/transform/resource/after-ecj/GetterEnum.java +++ b/test/transform/resource/after-ecj/GetterEnum.java @@ -7,13 +7,13 @@ private final @Getter String name; () { } - public @java.lang.SuppressWarnings("all") int getId() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getId() { return this.id; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - private @java.lang.SuppressWarnings("all") GetterEnum(final int id, final String name) { + private @java.lang.SuppressWarnings("all") @lombok.Generated GetterEnum(final int id, final String name) { super(); this.id = id; this.name = name; diff --git a/test/transform/resource/after-ecj/GetterInAnonymousClass.java b/test/transform/resource/after-ecj/GetterInAnonymousClass.java index 30e6338dcb..be04d505fd 100644 --- a/test/transform/resource/after-ecj/GetterInAnonymousClass.java +++ b/test/transform/resource/after-ecj/GetterInAnonymousClass.java @@ -6,7 +6,7 @@ public class GetterInAnonymousClass { Inner() { super(); } - public @java.lang.SuppressWarnings("all") String getString() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getString() { return this.string; } } diff --git a/test/transform/resource/after-ecj/GetterLazy.java b/test/transform/resource/after-ecj/GetterLazy.java index 7627ab1688..f7b94c7af8 100644 --- a/test/transform/resource/after-ecj/GetterLazy.java +++ b/test/transform/resource/after-ecj/GetterLazy.java @@ -8,7 +8,7 @@ static class ValueType { GetterLazy() { super(); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) ValueType getFieldName() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated ValueType getFieldName() { java.lang.Object $value = this.fieldName.get(); if (($value == null)) { diff --git a/test/transform/resource/after-ecj/GetterLazyArguments.java b/test/transform/resource/after-ecj/GetterLazyArguments.java index bb51c4fc1f..792592428b 100644 --- a/test/transform/resource/after-ecj/GetterLazyArguments.java +++ b/test/transform/resource/after-ecj/GetterLazyArguments.java @@ -17,7 +17,7 @@ static String stringInt(String arg1, Integer arg2) { static String stringRunnable(String arg1, Runnable arg2) { return null; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField1() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField1() { java.lang.Object $value = this.field1.get(); if (($value == null)) { @@ -34,7 +34,7 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field1) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField2() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField2() { java.lang.Object $value = this.field2.get(); if (($value == null)) { @@ -51,7 +51,7 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field2) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField3() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField3() { java.lang.Object $value = this.field3.get(); if (($value == null)) { @@ -68,7 +68,7 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field3) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField4() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField4() { java.lang.Object $value = this.field4.get(); if (($value == null)) { @@ -86,7 +86,7 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field4) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField5() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField5() { java.lang.Object $value = this.field5.get(); if (($value == null)) { @@ -104,7 +104,7 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field5) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getField6() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getField6() { java.lang.Object $value = this.field6.get(); if (($value == null)) { @@ -121,4 +121,4 @@ static String stringRunnable(String arg1, Runnable arg2) { } return (String) (($value == this.field6) ? null : $value); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterLazyBoolean.java b/test/transform/resource/after-ecj/GetterLazyBoolean.java index 40ecb856de..6f1bc0247f 100644 --- a/test/transform/resource/after-ecj/GetterLazyBoolean.java +++ b/test/transform/resource/after-ecj/GetterLazyBoolean.java @@ -7,7 +7,7 @@ private static boolean calculateBoolean() { return true; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) boolean isBooleanValue() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated boolean isBooleanValue() { java.lang.Object $value = this.booleanValue.get(); if (($value == null)) { @@ -24,7 +24,7 @@ private static boolean calculateBoolean() { } return (java.lang.Boolean) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) boolean isOtherBooleanValue() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated boolean isOtherBooleanValue() { java.lang.Object $value = this.otherBooleanValue.get(); if (($value == null)) { @@ -41,7 +41,7 @@ private static boolean calculateBoolean() { } return (java.lang.Boolean) $value; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterLazyBoolean))) @@ -53,16 +53,16 @@ private static boolean calculateBoolean() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterLazyBoolean); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + (this.isBooleanValue() ? 79 : 97)); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("GetterLazyBoolean(booleanValue=" + this.isBooleanValue()) + ")"); } } diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java index f4f4ed37bd..bf43b77584 100644 --- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java +++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java @@ -4,7 +4,7 @@ GetterLazyEahcToString() { super(); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getValue() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getValue() { java.lang.Object $value = this.value.get(); if (($value == null)) { @@ -21,10 +21,10 @@ } return (String) (($value == this.value) ? null : $value); } - public @java.lang.SuppressWarnings("all") String getValue2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getValue2() { return this.value2; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterLazyEahcToString))) @@ -42,10 +42,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterLazyEahcToString); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $value = this.getValue(); @@ -54,7 +54,7 @@ result = ((result * PRIME) + (($value2 == null) ? 43 : $value2.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("GetterLazyEahcToString(value=" + this.getValue()) + ", value2=") + this.value2) + ")"); } } diff --git a/test/transform/resource/after-ecj/GetterLazyGenerics.java b/test/transform/resource/after-ecj/GetterLazyGenerics.java index 3a2a06c1ae..41674de399 100644 --- a/test/transform/resource/after-ecj/GetterLazyGenerics.java +++ b/test/transform/resource/after-ecj/GetterLazyGenerics.java @@ -7,7 +7,7 @@ class GetterLazyGenerics { public static E getAny() { return null; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) E getField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated E getField() { java.lang.Object $value = this.field.get(); if (($value == null)) { @@ -24,7 +24,7 @@ public static E getAny() { } return (E) (($value == this.field) ? null : $value); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) long getField2() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated long getField2() { java.lang.Object $value = this.field2.get(); if (($value == null)) { @@ -41,4 +41,4 @@ public static E getAny() { } return (java.lang.Long) $value; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java b/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java index dadd8e71ec..f56a9dd2a7 100644 --- a/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java +++ b/test/transform/resource/after-ecj/GetterLazyInAnonymousClass.java @@ -6,7 +6,7 @@ class Inner { Inner() { super(); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) String getString() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated String getString() { java.lang.Object $value = this.string.get(); if (($value == null)) { diff --git a/test/transform/resource/after-ecj/GetterLazyInvalid.java b/test/transform/resource/after-ecj/GetterLazyInvalid.java index da89c333ee..227331c72d 100644 --- a/test/transform/resource/after-ecj/GetterLazyInvalid.java +++ b/test/transform/resource/after-ecj/GetterLazyInvalid.java @@ -27,7 +27,7 @@ class GetterLazyInvalidNone { GetterLazyInvalidClass() { super(); } - public @java.lang.SuppressWarnings("all") String getFieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getFieldName() { return this.fieldName; } } diff --git a/test/transform/resource/after-ecj/GetterLazyNative.java b/test/transform/resource/after-ecj/GetterLazyNative.java index c2769c5123..32946ee036 100644 --- a/test/transform/resource/after-ecj/GetterLazyNative.java +++ b/test/transform/resource/after-ecj/GetterLazyNative.java @@ -11,7 +11,7 @@ class GetterLazyNative { GetterLazyNative() { super(); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) boolean isBooleanField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated boolean isBooleanField() { java.lang.Object $value = this.booleanField.get(); if (($value == null)) { @@ -28,7 +28,7 @@ class GetterLazyNative { } return (java.lang.Boolean) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) byte getByteField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated byte getByteField() { java.lang.Object $value = this.byteField.get(); if (($value == null)) { @@ -45,7 +45,7 @@ class GetterLazyNative { } return (java.lang.Byte) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) short getShortField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated short getShortField() { java.lang.Object $value = this.shortField.get(); if (($value == null)) { @@ -62,7 +62,7 @@ class GetterLazyNative { } return (java.lang.Short) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) int getIntField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated int getIntField() { java.lang.Object $value = this.intField.get(); if (($value == null)) { @@ -79,7 +79,7 @@ class GetterLazyNative { } return (java.lang.Integer) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) long getLongField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated long getLongField() { java.lang.Object $value = this.longField.get(); if (($value == null)) { @@ -96,7 +96,7 @@ class GetterLazyNative { } return (java.lang.Long) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) float getFloatField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated float getFloatField() { java.lang.Object $value = this.floatField.get(); if (($value == null)) { @@ -113,7 +113,7 @@ class GetterLazyNative { } return (java.lang.Float) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) double getDoubleField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated double getDoubleField() { java.lang.Object $value = this.doubleField.get(); if (($value == null)) { @@ -130,7 +130,7 @@ class GetterLazyNative { } return (java.lang.Double) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) char getCharField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated char getCharField() { java.lang.Object $value = this.charField.get(); if (($value == null)) { @@ -147,7 +147,7 @@ class GetterLazyNative { } return (java.lang.Character) $value; } - public @java.lang.SuppressWarnings({"all", "unchecked"}) int[] getIntArrayField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated int[] getIntArrayField() { java.lang.Object $value = this.intArrayField.get(); if (($value == null)) { diff --git a/test/transform/resource/after-ecj/GetterLazyTransient.java b/test/transform/resource/after-ecj/GetterLazyTransient.java index b97fe53315..3db9c8d4ad 100644 --- a/test/transform/resource/after-ecj/GetterLazyTransient.java +++ b/test/transform/resource/after-ecj/GetterLazyTransient.java @@ -5,7 +5,7 @@ class GetterLazyTransient { GetterLazyTransient() { super(); } - public @java.lang.SuppressWarnings({"all", "unchecked"}) int getNonTransientField() { + public @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated int getNonTransientField() { java.lang.Object $value = this.nonTransientField.get(); if (($value == null)) { @@ -22,7 +22,7 @@ class GetterLazyTransient { } return (java.lang.Integer) $value; } - public @java.lang.SuppressWarnings("all") int getNonLazyTransientField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getNonLazyTransientField() { return this.nonLazyTransientField; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterNone.java b/test/transform/resource/after-ecj/GetterNone.java index f08726d093..801f3cd2bf 100644 --- a/test/transform/resource/after-ecj/GetterNone.java +++ b/test/transform/resource/after-ecj/GetterNone.java @@ -6,7 +6,7 @@ GetterNone() { super(); } - public @java.lang.SuppressWarnings("all") int getI() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/GetterOnClass.java b/test/transform/resource/after-ecj/GetterOnClass.java index 7668c9d326..6f1cad0f07 100644 --- a/test/transform/resource/after-ecj/GetterOnClass.java +++ b/test/transform/resource/after-ecj/GetterOnClass.java @@ -4,7 +4,7 @@ GetterOnClass1() { super(); } - public @java.lang.SuppressWarnings("all") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPublic() { return this.isPublic; } } @@ -15,10 +15,10 @@ GetterOnClass2() { super(); } - @java.lang.SuppressWarnings("all") boolean isPackage() { + @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPackage() { return this.isPackage; } - protected @java.lang.SuppressWarnings("all") boolean isProtected() { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean isProtected() { return this.isProtected; } } @@ -28,7 +28,7 @@ GetterOnClass3() { super(); } - @java.lang.SuppressWarnings("all") boolean isPackage() { + @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPackage() { return this.isPackage; } } @@ -38,7 +38,7 @@ GetterOnClass4() { super(); } - private @java.lang.SuppressWarnings("all") boolean isPrivate() { + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPrivate() { return this.isPrivate; } } @@ -48,7 +48,7 @@ GetterOnClass5() { super(); } - public @java.lang.SuppressWarnings("all") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @lombok.Generated boolean isPublic() { return this.isPublic; } } @@ -58,10 +58,10 @@ GetterOnClass6() { super(); } - public @java.lang.SuppressWarnings("all") String getCouldBeNull() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getCouldBeNull() { return this.couldBeNull; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") String getNonNull() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated String getNonNull() { return this.nonNull; } } diff --git a/test/transform/resource/after-ecj/GetterOnMethod.java b/test/transform/resource/after-ecj/GetterOnMethod.java index a21f628c8d..456b68a5ac 100644 --- a/test/transform/resource/after-ecj/GetterOnMethod.java +++ b/test/transform/resource/after-ecj/GetterOnMethod.java @@ -7,13 +7,13 @@ class GetterOnMethod { GetterOnMethod() { super(); } - public @Deprecated @java.lang.SuppressWarnings("all") int getI() { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") int getJ() { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @lombok.Generated int getJ() { return this.j; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") int getK() { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @lombok.Generated int getK() { return this.k; } } diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java index bfaa5dd4a8..e2b9db3369 100644 --- a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java +++ b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java @@ -12,28 +12,28 @@ class GetterOnMethodErrors2 { GetterOnMethodErrors2() { super(); } - public @java.lang.SuppressWarnings("all") int getBad1() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getBad1() { return this.bad1; } - public @java.lang.SuppressWarnings("all") int getBad2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getBad2() { return this.bad2; } - public @java.lang.SuppressWarnings("all") int getBad3() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getBad3() { return this.bad3; } - public @java.lang.SuppressWarnings("all") int getBad4() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getBad4() { return this.bad4; } - public @java.lang.SuppressWarnings("all") int getGood1() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getGood1() { return this.good1; } - public @java.lang.SuppressWarnings("all") int getGood2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getGood2() { return this.good2; } - public @Deprecated @java.lang.SuppressWarnings("all") int getGood3() { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated int getGood3() { return this.good3; } - public @Deprecated @Test @java.lang.SuppressWarnings("all") int getGood4() { + public @Deprecated @Test @java.lang.SuppressWarnings("all") @lombok.Generated int getGood4() { return this.good4; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterOnMethodOnType.java b/test/transform/resource/after-ecj/GetterOnMethodOnType.java index 2b39abf254..f1a2a10843 100644 --- a/test/transform/resource/after-ecj/GetterOnMethodOnType.java +++ b/test/transform/resource/after-ecj/GetterOnMethodOnType.java @@ -4,10 +4,10 @@ GetterOnMethodOnType() { super(); } - public @Deprecated @java.lang.SuppressWarnings("all") int getTest() { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated int getTest() { return this.test; } - public @Deprecated @java.lang.SuppressWarnings("all") String getName() { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterOnStatic.java b/test/transform/resource/after-ecj/GetterOnStatic.java index ee90b89763..441266f4b3 100644 --- a/test/transform/resource/after-ecj/GetterOnStatic.java +++ b/test/transform/resource/after-ecj/GetterOnStatic.java @@ -6,10 +6,10 @@ class Getter { Getter() { super(); } - public static @java.lang.SuppressWarnings("all") boolean isFoo() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated boolean isFoo() { return Getter.foo; } - public static @java.lang.SuppressWarnings("all") int getBar() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated int getBar() { return Getter.bar; } } diff --git a/test/transform/resource/after-ecj/GetterPlain.java b/test/transform/resource/after-ecj/GetterPlain.java index 10f0f9d75b..2d18ac7e75 100644 --- a/test/transform/resource/after-ecj/GetterPlain.java +++ b/test/transform/resource/after-ecj/GetterPlain.java @@ -5,10 +5,10 @@ class GetterPlain { GetterPlain() { super(); } - public @java.lang.SuppressWarnings("all") int getI() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } - public @java.lang.SuppressWarnings("all") int getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterSetterJavadoc.java b/test/transform/resource/after-ecj/GetterSetterJavadoc.java index c3308c51be..03ac4075ff 100644 --- a/test/transform/resource/after-ecj/GetterSetterJavadoc.java +++ b/test/transform/resource/after-ecj/GetterSetterJavadoc.java @@ -5,7 +5,7 @@ * * @return Sky is blue1 */ - public @java.lang.SuppressWarnings("all") int getFieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getFieldName() { return this.fieldName; } /** @@ -13,10 +13,10 @@ * * @param fieldName Hello, World1 */ - public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterSetterJavadoc1))) @@ -28,19 +28,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterSetterJavadoc1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getFieldName()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("GetterSetterJavadoc1(fieldName=" + this.getFieldName()) + ")"); } - public @java.lang.SuppressWarnings("all") GetterSetterJavadoc1() { + public @java.lang.SuppressWarnings("all") @lombok.Generated GetterSetterJavadoc1() { super(); } } @@ -54,7 +54,7 @@ class GetterSetterJavadoc2 { * * @return Sky is blue2 */ - public @java.lang.SuppressWarnings("all") int getFieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getFieldName() { return this.fieldName; } /** @@ -62,7 +62,7 @@ class GetterSetterJavadoc2 { * * @param fieldName Hello, World2 */ - public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } } @@ -75,14 +75,14 @@ class GetterSetterJavadoc3 { * Getter section * @return Sky is blue3 */ - public @java.lang.SuppressWarnings("all") int getFieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getFieldName() { return this.fieldName; } /** * Setter section * @param fieldName Hello, World3 */ - public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } } @@ -96,7 +96,7 @@ class GetterSetterJavadoc3 { * * @return Sky is blue4 */ - public @java.lang.SuppressWarnings("all") int fieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int fieldName() { return this.fieldName; } /** @@ -105,7 +105,7 @@ class GetterSetterJavadoc3 { * @param fieldName Hello, World4 * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") GetterSetterJavadoc4 fieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated GetterSetterJavadoc4 fieldName(final int fieldName) { this.fieldName = fieldName; return this; } @@ -119,7 +119,7 @@ class GetterSetterJavadoc3 { * Getter section * @return Sky is blue5 */ - public @java.lang.SuppressWarnings("all") int fieldName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int fieldName() { return this.fieldName; } /** @@ -127,8 +127,8 @@ class GetterSetterJavadoc3 { * @param fieldName Hello, World5 * @return Sky is blue5 */ - public @java.lang.SuppressWarnings("all") GetterSetterJavadoc5 fieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @lombok.Generated GetterSetterJavadoc5 fieldName(final int fieldName) { this.fieldName = fieldName; return this; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/GetterTypeAnnos.java b/test/transform/resource/after-ecj/GetterTypeAnnos.java index 9ffc7f1cd4..59deba6362 100644 --- a/test/transform/resource/after-ecj/GetterTypeAnnos.java +++ b/test/transform/resource/after-ecj/GetterTypeAnnos.java @@ -11,7 +11,7 @@ class GetterTypeAnnos { GetterTypeAnnos() { super(); } - public @TA @java.lang.SuppressWarnings("all") List getFoo() { + public @TA @java.lang.SuppressWarnings("all") @lombok.Generated List getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterWithDollar.java b/test/transform/resource/after-ecj/GetterWithDollar.java index f4bc799cb5..1f07a8cfed 100644 --- a/test/transform/resource/after-ecj/GetterWithDollar.java +++ b/test/transform/resource/after-ecj/GetterWithDollar.java @@ -3,7 +3,7 @@ class GetterWithDollar1 { GetterWithDollar1() { super(); } - public @java.lang.SuppressWarnings("all") int get$i() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int get$i() { return this.$i; } } @@ -13,10 +13,10 @@ class GetterWithDollar2 { GetterWithDollar2() { super(); } - public @java.lang.SuppressWarnings("all") int get$i() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int get$i() { return this.$i; } - public @java.lang.SuppressWarnings("all") int getI() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java index 745529a0d9..a016e411ac 100644 --- a/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-ecj/GetterWithJavaBeansSpecCapitalization.java @@ -4,10 +4,10 @@ class GetterWithJavaBeansSpecCapitalization { GetterWithJavaBeansSpecCapitalization() { super(); } - public @java.lang.SuppressWarnings("all") int getA() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getA() { return this.a; } - public @java.lang.SuppressWarnings("all") int getaField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getaField() { return this.aField; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java b/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java index 393fe42a83..97a1dad874 100644 --- a/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java +++ b/test/transform/resource/after-ecj/I2335_BuilderMultipleObtainVia.java @@ -1,29 +1,29 @@ import lombok.Builder; public @Builder class I2335_BuilderMultipleObtainVia { - public static @java.lang.SuppressWarnings("all") class I2335_BuilderMultipleObtainViaBuilder { - private @java.lang.SuppressWarnings("all") String theString; - private @java.lang.SuppressWarnings("all") Long theLong; - @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainViaBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class I2335_BuilderMultipleObtainViaBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String theString; + private @java.lang.SuppressWarnings("all") @lombok.Generated Long theLong; + @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainViaBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theString(final String theString) { + public @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theString(final String theString) { this.theString = theString; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theLong(final Long theLong) { + public @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theLong(final Long theLong) { this.theLong = theLong; return this; } - public @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainVia build() { return new I2335_BuilderMultipleObtainVia(this.theString, this.theLong); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder(theString=" + this.theString) + ", theLong=") + this.theLong) + ")"); } } @@ -46,10 +46,10 @@ public void setTheString(String theString) { public void setTheLong(Long theLong) { this.theLong = theLong; } - public static @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder builder() { return new I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder(); } - public @java.lang.SuppressWarnings("all") I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder toBuilder() { final String theString = this.getTheString(); final Long theLong = this.getTheLong(); return new I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder().theString(theString).theLong(theLong); diff --git a/test/transform/resource/after-ecj/InnerClass.java b/test/transform/resource/after-ecj/InnerClass.java index 3200422599..43da8956a3 100644 --- a/test/transform/resource/after-ecj/InnerClass.java +++ b/test/transform/resource/after-ecj/InnerClass.java @@ -1,7 +1,7 @@ class A { @lombok.AllArgsConstructor class B { String s; - public @java.lang.SuppressWarnings("all") B(final String s) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B(final String s) { super(); this.s = s; } @@ -20,10 +20,10 @@ A.B test(String s) { } }; } - public @java.lang.SuppressWarnings("all") A getA() { + public @java.lang.SuppressWarnings("all") @lombok.Generated A getA() { return this.a; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof C.D))) @@ -35,17 +35,17 @@ A.B test(String s) { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $a = this.getA(); result = ((result * PRIME) + (($a == null) ? 43 : $a.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("C.D(a=" + this.getA()) + ")"); } - public @java.lang.SuppressWarnings("all") D(final A a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated D(final A a) { super(); this.a = a; } diff --git a/test/transform/resource/after-ecj/JacksonBuilderSingular.java b/test/transform/resource/after-ecj/JacksonBuilderSingular.java index 50f6a797be..309a09accf 100644 --- a/test/transform/resource/after-ecj/JacksonBuilderSingular.java +++ b/test/transform/resource/after-ecj/JacksonBuilderSingular.java @@ -8,16 +8,16 @@ import lombok.Singular; import lombok.extern.jackson.Jacksonized; public @Jacksonized @Builder @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonBuilderSingular.JacksonBuilderSingularBuilder.class) class JacksonBuilderSingular { - public static @java.lang.SuppressWarnings("all") @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonBuilderSingularBuilder { - private @java.lang.SuppressWarnings("all") java.util.ArrayList any$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList any$value; - private @java.lang.SuppressWarnings("all") java.util.ArrayList values; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableMap.Builder guavaAny; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder guavaValues; - @java.lang.SuppressWarnings("all") JacksonBuilderSingularBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonBuilderSingularBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList any$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList any$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList values; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableMap.Builder guavaAny; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder guavaValues; + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingularBuilder() { super(); } - public @JsonAnySetter @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final String anyKey, final Object anyValue) { + public @JsonAnySetter @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final String anyKey, final Object anyValue) { if ((this.any$key == null)) { this.any$key = new java.util.ArrayList(); @@ -27,7 +27,7 @@ this.any$value.add(anyValue); return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final java.util.Map any) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final java.util.Map any) { if ((any == null)) { throw new java.lang.NullPointerException("any cannot be null"); @@ -44,7 +44,7 @@ } return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder clearAny() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder clearAny() { if ((this.any$key != null)) { this.any$key.clear(); @@ -52,13 +52,13 @@ } return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder value(final String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder value(final String value) { if ((this.values == null)) this.values = new java.util.ArrayList(); this.values.add(value); return this; } - public @JsonProperty("v_a_l_u_e_s") @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder values(final java.util.Collection values) { + public @JsonProperty("v_a_l_u_e_s") @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder values(final java.util.Collection values) { if ((values == null)) { throw new java.lang.NullPointerException("values cannot be null"); @@ -68,18 +68,18 @@ this.values.addAll(values); return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder clearValues() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder clearValues() { if ((this.values != null)) this.values.clear(); return this; } - public @JsonAnySetter @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final String key, final Object value) { + public @JsonAnySetter @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final String key, final Object value) { if ((this.guavaAny == null)) this.guavaAny = com.google.common.collect.ImmutableMap.builder(); this.guavaAny.put(key, value); return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final java.util.Map guavaAny) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final java.util.Map guavaAny) { if ((guavaAny == null)) { throw new java.lang.NullPointerException("guavaAny cannot be null"); @@ -89,17 +89,17 @@ this.guavaAny.putAll(guavaAny); return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaAny() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaAny() { this.guavaAny = null; return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValue(final String guavaValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValue(final String guavaValue) { if ((this.guavaValues == null)) this.guavaValues = com.google.common.collect.ImmutableList.builder(); this.guavaValues.add(guavaValue); return this; } - public @JsonProperty("guava_v_a_l_u_e_s") @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValues(final java.lang.Iterable guavaValues) { + public @JsonProperty("guava_v_a_l_u_e_s") @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValues(final java.lang.Iterable guavaValues) { if ((guavaValues == null)) { throw new java.lang.NullPointerException("guavaValues cannot be null"); @@ -109,11 +109,11 @@ this.guavaValues.addAll(guavaValues); return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaValues() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaValues() { this.guavaValues = null; return this; } - public @java.lang.SuppressWarnings("all") JacksonBuilderSingular build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular build() { java.util.Map any; switch (((this.any$key == null) ? 0 : this.any$key.size())) { case 0 : @@ -143,7 +143,7 @@ com.google.common.collect.ImmutableList guavaValues = ((this.guavaValues == null) ? com.google.common.collect.ImmutableList.of() : this.guavaValues.build()); return new JacksonBuilderSingular(any, values, guavaAny, guavaValues); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((("JacksonBuilderSingular.JacksonBuilderSingularBuilder(any$key=" + this.any$key) + ", any$value=") + this.any$value) + ", values=") + this.values) + ", guavaAny=") + this.guavaAny) + ", guavaValues=") + this.guavaValues) + ")"); } } @@ -151,14 +151,14 @@ private @JsonProperty("v_a_l_u_e_s") @Singular List values; private @JsonAnySetter @Singular("guavaAny") ImmutableMap guavaAny; private @JsonProperty("guava_v_a_l_u_e_s") @Singular ImmutableList guavaValues; - @java.lang.SuppressWarnings("all") JacksonBuilderSingular(final Map any, final List values, final ImmutableMap guavaAny, final ImmutableList guavaValues) { + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular(final Map any, final List values, final ImmutableMap guavaAny, final ImmutableList guavaValues) { super(); this.any = any; this.values = values; this.guavaAny = guavaAny; this.guavaValues = guavaValues; } - public static @java.lang.SuppressWarnings("all") JacksonBuilderSingular.JacksonBuilderSingularBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonBuilderSingular.JacksonBuilderSingularBuilder builder() { return new JacksonBuilderSingular.JacksonBuilderSingularBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/JacksonJsonProperty.java b/test/transform/resource/after-ecj/JacksonJsonProperty.java index c6d3d29002..50f236bf77 100644 --- a/test/transform/resource/after-ecj/JacksonJsonProperty.java +++ b/test/transform/resource/after-ecj/JacksonJsonProperty.java @@ -4,34 +4,34 @@ import lombok.Builder; import lombok.Setter; public @Builder class JacksonJsonProperty { - public static @java.lang.SuppressWarnings("all") class JacksonJsonPropertyBuilder { - private @java.lang.SuppressWarnings("all") String kebabCaseProp; - @java.lang.SuppressWarnings("all") JacksonJsonPropertyBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class JacksonJsonPropertyBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String kebabCaseProp; + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonJsonPropertyBuilder() { super(); } /** * @return {@code this}. */ - public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") JacksonJsonProperty.JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { + public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") @lombok.Generated JacksonJsonProperty.JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; return this; } - public @java.lang.SuppressWarnings("all") JacksonJsonProperty build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonJsonProperty build() { return new JacksonJsonProperty(this.kebabCaseProp); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("JacksonJsonProperty.JacksonJsonPropertyBuilder(kebabCaseProp=" + this.kebabCaseProp) + ")"); } } public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @Setter String kebabCaseProp; - @java.lang.SuppressWarnings("all") JacksonJsonProperty(final String kebabCaseProp) { + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonJsonProperty(final String kebabCaseProp) { super(); this.kebabCaseProp = kebabCaseProp; } - public static @java.lang.SuppressWarnings("all") JacksonJsonProperty.JacksonJsonPropertyBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonJsonProperty.JacksonJsonPropertyBuilder builder() { return new JacksonJsonProperty.JacksonJsonPropertyBuilder(); } - public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") void setKebabCaseProp(final String kebabCaseProp) { + public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") @lombok.Generated void setKebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java b/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java index 6b95a6a2f2..fc2d095fc1 100644 --- a/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java +++ b/test/transform/resource/after-ecj/JacksonizedBuilderComplex.java @@ -2,46 +2,46 @@ import lombok.Builder; import lombok.extern.jackson.Jacksonized; @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedBuilderComplex.TestVoidName.class) class JacksonizedBuilderComplex { - public static @java.lang.SuppressWarnings("all") @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "with",buildMethodName = "execute") class TestVoidName { - private @java.lang.SuppressWarnings("all") T number; - private @java.lang.SuppressWarnings("all") int arg2; - private @java.lang.SuppressWarnings("all") String arg3; - private @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex selfRef; - @java.lang.SuppressWarnings("all") TestVoidName() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "with",buildMethodName = "execute") class TestVoidName { + private @java.lang.SuppressWarnings("all") @lombok.Generated T number; + private @java.lang.SuppressWarnings("all") @lombok.Generated int arg2; + private @java.lang.SuppressWarnings("all") @lombok.Generated String arg3; + private @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex selfRef; + @java.lang.SuppressWarnings("all") @lombok.Generated TestVoidName() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName withNumber(final T number) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex.TestVoidName withNumber(final T number) { this.number = number; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName withArg2(final int arg2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex.TestVoidName withArg2(final int arg2) { this.arg2 = arg2; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName withArg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex.TestVoidName withArg3(final String arg3) { this.arg3 = arg3; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName withSelfRef(final JacksonizedBuilderComplex selfRef) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex.TestVoidName withSelfRef(final JacksonizedBuilderComplex selfRef) { this.selfRef = selfRef; return this; } - public @java.lang.SuppressWarnings("all") void execute() { + public @java.lang.SuppressWarnings("all") @lombok.Generated void execute() { JacksonizedBuilderComplex.testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("JacksonizedBuilderComplex.TestVoidName(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")"); } } @@ -50,7 +50,7 @@ } private static @Jacksonized @Builder(buildMethodName = "execute",setterPrefix = "with") void testVoidWithGenerics(T number, int arg2, String arg3, JacksonizedBuilderComplex selfRef) { } - public static @java.lang.SuppressWarnings("all") JacksonizedBuilderComplex.TestVoidName builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderComplex.TestVoidName builder() { return new JacksonizedBuilderComplex.TestVoidName(); } } diff --git a/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java b/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java index 87910d4770..cc23c03a5f 100644 --- a/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java +++ b/test/transform/resource/after-ecj/JacksonizedBuilderSimple.java @@ -1,31 +1,30 @@ import java.util.List; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @lombok.extern.jackson.Jacksonized @JsonIgnoreProperties(ignoreUnknown = true) @lombok.Builder(access = lombok.AccessLevel.PROTECTED) @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder.class) class JacksonizedBuilderSimple { - protected static @java.lang.SuppressWarnings("all") @JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonizedBuilderSimpleBuilder { - private @java.lang.SuppressWarnings("all") int yes; - private @java.lang.SuppressWarnings("all") List also; - @java.lang.SuppressWarnings("all") JacksonizedBuilderSimpleBuilder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated @JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonizedBuilderSimpleBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int yes; + private @java.lang.SuppressWarnings("all") @lombok.Generated List also; + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimpleBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder yes(final int yes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder also(final List also) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder also(final List also) { this.also = also; return this; } - public @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimple build() { return new JacksonizedBuilderSimple(this.yes, this.also); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder(yes=" + this.yes) + ", also=") + this.also) + ")"); } } @@ -33,12 +32,12 @@ private final int yes; private List also; private int $butNotMe; - @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple(final int yes, final List also) { + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimple(final int yes, final List also) { super(); this.yes = yes; this.also = also; } - protected static @java.lang.SuppressWarnings("all") JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder builder() { + protected static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder builder() { return new JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder(); } } diff --git a/test/transform/resource/after-ecj/JacksonizedOnRecord.java b/test/transform/resource/after-ecj/JacksonizedOnRecord.java index 3a27e2602f..c837ce98bf 100644 --- a/test/transform/resource/after-ecj/JacksonizedOnRecord.java +++ b/test/transform/resource/after-ecj/JacksonizedOnRecord.java @@ -4,26 +4,26 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; public @lombok.extern.jackson.Jacksonized @lombok.Builder @JsonIgnoreProperties @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedOnRecord.JacksonizedOnRecordBuilder.class) record JacksonizedOnRecord(String string, List values) { - public static @java.lang.SuppressWarnings("all") @JsonIgnoreProperties @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonizedOnRecordBuilder { - private @java.lang.SuppressWarnings("all") String string; - private @java.lang.SuppressWarnings("all") java.util.ArrayList values; - @java.lang.SuppressWarnings("all") JacksonizedOnRecordBuilder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated @JsonIgnoreProperties @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class JacksonizedOnRecordBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String string; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList values; + @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecordBuilder() { super(); } /** * @return {@code this}. */ - public @JsonProperty("test") @java.lang.SuppressWarnings("all") JacksonizedOnRecord.JacksonizedOnRecordBuilder string(final @Nullable String string) { + public @JsonProperty("test") @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord.JacksonizedOnRecordBuilder string(final @Nullable String string) { this.string = string; return this; } - public @JsonAnySetter @java.lang.SuppressWarnings("all") JacksonizedOnRecord.JacksonizedOnRecordBuilder value(final String value) { + public @JsonAnySetter @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord.JacksonizedOnRecordBuilder value(final String value) { if ((this.values == null)) this.values = new java.util.ArrayList(); this.values.add(value); return this; } - public @java.lang.SuppressWarnings("all") JacksonizedOnRecord.JacksonizedOnRecordBuilder values(final java.util.Collection values) { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord.JacksonizedOnRecordBuilder values(final java.util.Collection values) { if ((values == null)) { throw new java.lang.NullPointerException("values cannot be null"); @@ -33,12 +33,12 @@ this.values.addAll(values); return this; } - public @java.lang.SuppressWarnings("all") JacksonizedOnRecord.JacksonizedOnRecordBuilder clearValues() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord.JacksonizedOnRecordBuilder clearValues() { if ((this.values != null)) this.values.clear(); return this; } - public @java.lang.SuppressWarnings("all") JacksonizedOnRecord build() { + public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord build() { java.util.List values; switch (((this.values == null) ? 0 : this.values.size())) { case 0 : @@ -52,13 +52,13 @@ } return new JacksonizedOnRecord(this.string, values); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("JacksonizedOnRecord.JacksonizedOnRecordBuilder(string=" + this.string) + ", values=") + this.values) + ")"); } } /* Implicit */ private final String string; /* Implicit */ private final List values; - public static @java.lang.SuppressWarnings("all") JacksonizedOnRecord.JacksonizedOnRecordBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedOnRecord.JacksonizedOnRecordBuilder builder() { return new JacksonizedOnRecord.JacksonizedOnRecordBuilder(); } } diff --git a/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java b/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java index 348d91a20a..2d6d7f0b61 100644 --- a/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java +++ b/test/transform/resource/after-ecj/JacksonizedSuperBuilderSimple.java @@ -1,40 +1,40 @@ public class JacksonizedSuperBuilderSimple { public static @lombok.extern.jackson.Jacksonized @lombok.experimental.SuperBuilder @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl.class) class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final int field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final int field1) { this.field1 = field1; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("JacksonizedSuperBuilderSimple.Parent.ParentBuilder(field1=" + this.field1) + ")"); } } - static final @java.lang.SuppressWarnings("all") @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class ParentBuilderImpl extends JacksonizedSuperBuilderSimple.Parent.ParentBuilder { + static final @java.lang.SuppressWarnings("all") @lombok.Generated @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "",buildMethodName = "build") class ParentBuilderImpl extends JacksonizedSuperBuilderSimple.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderSimple.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderSimple.Parent build() { return new JacksonizedSuperBuilderSimple.Parent(this); } } int field1; - protected @java.lang.SuppressWarnings("all") Parent(final JacksonizedSuperBuilderSimple.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final JacksonizedSuperBuilderSimple.Parent.ParentBuilder b) { super(); this.field1 = b.field1; } - public static @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderSimple.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderSimple.Parent.ParentBuilder builder() { return new JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl(); } } @@ -44,4 +44,4 @@ public JacksonizedSuperBuilderSimple() { public static void test() { Parent x = Parent.builder().field1(5).build(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java b/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java index a72da70b2c..b991dbf6e3 100644 --- a/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java +++ b/test/transform/resource/after-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java @@ -1,39 +1,39 @@ public @lombok.extern.jackson.Jacksonized @lombok.experimental.SuperBuilder @com.fasterxml.jackson.databind.annotation.JsonDeserialize class JacksonizedSuperBuilderWithJsonDeserialize { - public static abstract @java.lang.SuppressWarnings("all") class JacksonizedSuperBuilderWithJsonDeserializeBuilder> { - private @java.lang.SuppressWarnings("all") int field1; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class JacksonizedSuperBuilderWithJsonDeserializeBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public JacksonizedSuperBuilderWithJsonDeserializeBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final int field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final int field1) { this.field1 = field1; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder(field1=" + this.field1) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl extends JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl extends JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder { private JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderWithJsonDeserialize build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderWithJsonDeserialize build() { return new JacksonizedSuperBuilderWithJsonDeserialize(this); } } int field1; - protected @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderWithJsonDeserialize(final JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderWithJsonDeserialize(final JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder b) { super(); this.field1 = b.field1; } - public static @java.lang.SuppressWarnings("all") JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder builder() { return new JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/JavadocMultiline.java b/test/transform/resource/after-ecj/JavadocMultiline.java index bf05897580..0341783084 100644 --- a/test/transform/resource/after-ecj/JavadocMultiline.java +++ b/test/transform/resource/after-ecj/JavadocMultiline.java @@ -10,13 +10,13 @@ * @return A list of booleans to set for this object. This is a Javadoc return that is long * enough to wrap to multiple lines. */ - public @java.lang.SuppressWarnings("all") java.util.List getBooleans() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.util.List getBooleans() { return this.booleans; } /** * This is a list of booleans. */ - public @java.lang.SuppressWarnings("all") java.util.List getBooleans2() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.util.List getBooleans2() { return this.booleans2; } /** @@ -25,7 +25,7 @@ * @param booleans A list of booleans to set for this object. This is a Javadoc param that is * long enough to wrap to multiple lines. */ - public @java.lang.SuppressWarnings("all") void setBooleans(final java.util.List booleans) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setBooleans(final java.util.List booleans) { this.booleans = booleans; } /** @@ -34,7 +34,7 @@ * @param booleans A list of booleans to set for this object. This is a Javadoc param that is * long enough to wrap to multiple lines. */ - public @java.lang.SuppressWarnings("all") void setBooleans2(final java.util.List booleans2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setBooleans2(final java.util.List booleans2) { this.booleans2 = booleans2; } } diff --git a/test/transform/resource/after-ecj/MultiFieldGetter.java b/test/transform/resource/after-ecj/MultiFieldGetter.java index 151c61c852..727710f30a 100644 --- a/test/transform/resource/after-ecj/MultiFieldGetter.java +++ b/test/transform/resource/after-ecj/MultiFieldGetter.java @@ -6,10 +6,10 @@ class MultiFieldGetter { MultiFieldGetter() { super(); } - protected @java.lang.SuppressWarnings("all") int getX() { + protected @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - protected @java.lang.SuppressWarnings("all") int getY() { + protected @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } } @@ -19,10 +19,10 @@ class MultiFieldGetter { MultiFieldGetter2() { super(); } - @java.lang.SuppressWarnings("all") int getX() { + @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - @java.lang.SuppressWarnings("all") int getY() { + @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } } diff --git a/test/transform/resource/after-ecj/NoArgsConstructorForce.java b/test/transform/resource/after-ecj/NoArgsConstructorForce.java index 59713673e3..4dccf3ee63 100644 --- a/test/transform/resource/after-ecj/NoArgsConstructorForce.java +++ b/test/transform/resource/after-ecj/NoArgsConstructorForce.java @@ -4,10 +4,10 @@ private final Object[] o; private final java.util.List[] fullQualifiedList; private final String alreadyInitialized = "yes"; - public @java.lang.SuppressWarnings("all") NoArgsConstructorForce() { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsConstructorForce() { super(); this.i = null; this.o = null; this.fullQualifiedList = null; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java b/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java index a2bfe3bde1..272018c162 100644 --- a/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java +++ b/test/transform/resource/after-ecj/NoPrivateNoArgsConstructor.java @@ -1,10 +1,10 @@ public class NoPrivateNoArgsConstructor { public static @lombok.Data class NoPrivateNoArgsConstructorData { private final int i; - public @java.lang.SuppressWarnings("all") int getI() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData))) @@ -16,29 +16,29 @@ public class NoPrivateNoArgsConstructor { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getI()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData(i=" + this.getI()) + ")"); } - public @java.lang.SuppressWarnings("all") NoPrivateNoArgsConstructorData(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoPrivateNoArgsConstructorData(final int i) { super(); this.i = i; } } public static final @lombok.Value class NoPrivateNoArgsConstructorValue { private final int i; - public @java.lang.SuppressWarnings("all") int getI() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue))) @@ -48,16 +48,16 @@ public class NoPrivateNoArgsConstructor { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getI()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue(i=" + this.getI()) + ")"); } - public @java.lang.SuppressWarnings("all") NoPrivateNoArgsConstructorValue(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NoPrivateNoArgsConstructorValue(final int i) { super(); this.i = i; } @@ -65,4 +65,4 @@ public class NoPrivateNoArgsConstructor { public NoPrivateNoArgsConstructor() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java b/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java index 6f351854e3..88ce76fe1f 100644 --- a/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java +++ b/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java @@ -10,7 +10,7 @@ public NonNullExistingConstructorOnRecord(@NonNull String b) { throw new java.lang.NullPointerException("b is marked non-null but is null"); } } - public @java.lang.SuppressWarnings("all") NonNullExistingConstructorOnRecord(@NonNull String a, @NonNull String b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NonNullExistingConstructorOnRecord(@NonNull String a, @NonNull String b) { super(); if ((a == null)) { diff --git a/test/transform/resource/after-ecj/NonNullOnRecordSimple.java b/test/transform/resource/after-ecj/NonNullOnRecordSimple.java index ee1510ea41..8a3002275a 100644 --- a/test/transform/resource/after-ecj/NonNullOnRecordSimple.java +++ b/test/transform/resource/after-ecj/NonNullOnRecordSimple.java @@ -3,7 +3,7 @@ public record NonNullOnRecordSimple(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - public @java.lang.SuppressWarnings("all") NonNullOnRecordSimple(@NonNull String a, @NonNull String b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NonNullOnRecordSimple(@NonNull String a, @NonNull String b) { super(); if ((a == null)) { diff --git a/test/transform/resource/after-ecj/NonNullOnRecordTypeUse.java b/test/transform/resource/after-ecj/NonNullOnRecordTypeUse.java index 4f040c2e78..ae2b344f0d 100644 --- a/test/transform/resource/after-ecj/NonNullOnRecordTypeUse.java +++ b/test/transform/resource/after-ecj/NonNullOnRecordTypeUse.java @@ -4,7 +4,7 @@ public record NonNullOnRecordTypeUse(int a, int b, int c) { /* Implicit */ private final int[] a; /* Implicit */ private final int @NonNull [] b; /* Implicit */ private final int[] @NonNull [] c; - public @java.lang.SuppressWarnings("all") NonNullOnRecordTypeUse(@NonNull int[] a, int @NonNull [] b, int[] @NonNull [] c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NonNullOnRecordTypeUse(@NonNull int[] a, int @NonNull [] b, int[] @NonNull [] c) { super(); if ((a == null)) { diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java index bf43cb7f17..d3308c482c 100644 --- a/test/transform/resource/after-ecj/NonNullPlain.java +++ b/test/transform/resource/after-ecj/NonNullPlain.java @@ -5,7 +5,7 @@ @lombok.NonNull int i; @lombok.NonNull String s; @NotNull Object o; - public @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) { super(); if ((s == null)) { @@ -14,26 +14,26 @@ this.i = i; this.s = s; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") int getI() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated int getI() { return this.i; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") String getS() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated String getS() { return this.s; } - public @java.lang.SuppressWarnings("all") Object getO() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Object getO() { return this.o; } - public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setI(final @lombok.NonNull int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") void setS(final @lombok.NonNull String s) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setS(final @lombok.NonNull String s) { if ((s == null)) { throw new java.lang.NullPointerException("s is marked non-null but is null"); } this.s = s; } - public @java.lang.SuppressWarnings("all") void setO(final Object o) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setO(final Object o) { this.o = o; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NonNullWithAlternateException.java b/test/transform/resource/after-ecj/NonNullWithAlternateException.java index 9a2a4e3d0d..1cae6b344d 100644 --- a/test/transform/resource/after-ecj/NonNullWithAlternateException.java +++ b/test/transform/resource/after-ecj/NonNullWithAlternateException.java @@ -10,11 +10,11 @@ public void testMethod(@lombok.NonNull String arg) { } System.out.println(arg); } - public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final @lombok.NonNull String test) { if ((test == null)) { throw new java.lang.IllegalArgumentException("test is marked non-null but is null"); } this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NonNullWithAssertion.java b/test/transform/resource/after-ecj/NonNullWithAssertion.java index d6f2b0f16c..3892c08b18 100644 --- a/test/transform/resource/after-ecj/NonNullWithAssertion.java +++ b/test/transform/resource/after-ecj/NonNullWithAssertion.java @@ -11,8 +11,8 @@ public void testMethodWithIf(@lombok.NonNull String arg) { if ((arg == null)) throw new NullPointerException("Oops"); } - public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final @lombok.NonNull String test) { assert (test != null): "test is marked non-null but is null"; this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NonNullWithGuava.java b/test/transform/resource/after-ecj/NonNullWithGuava.java index c7f5a7fe21..78e66b5625 100644 --- a/test/transform/resource/after-ecj/NonNullWithGuava.java +++ b/test/transform/resource/after-ecj/NonNullWithGuava.java @@ -29,7 +29,7 @@ public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { com.google.common.base.Preconditions.checkNotNull(arg, "arg is marked non-null but is null"); test = checkNotNull(test); } - public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final @lombok.NonNull String test) { com.google.common.base.Preconditions.checkNotNull(test, "test is marked non-null but is null"); this.test = test; } diff --git a/test/transform/resource/after-ecj/NonNullWithJdk.java b/test/transform/resource/after-ecj/NonNullWithJdk.java index 7d52226049..85877cbb89 100644 --- a/test/transform/resource/after-ecj/NonNullWithJdk.java +++ b/test/transform/resource/after-ecj/NonNullWithJdk.java @@ -30,7 +30,7 @@ public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { java.util.Objects.requireNonNull(arg, "arg is marked non-null but is null"); test = requireNonNull(test); } - public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final @lombok.NonNull String test) { java.util.Objects.requireNonNull(test, "test is marked non-null but is null"); this.test = test; } diff --git a/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java b/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java index f4a1c9922a..62984573f8 100644 --- a/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-ecj/NullAnnotatedCheckerFrameworkSuperBuilder.java @@ -2,19 +2,19 @@ import lombok.Singular; class NullAnnotatedCheckerFrameworkSuperBuilder { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int x$value; - private @java.lang.SuppressWarnings("all") boolean x$set; - private @java.lang.SuppressWarnings("all") int y; - private @java.lang.SuppressWarnings("all") int z; - private @java.lang.SuppressWarnings("all") java.util.ArrayList names; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int x$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean x$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int y; + private @java.lang.SuppressWarnings("all") @lombok.Generated int z; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList names; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B x(final int x) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B x(final int x) { this.x$value = x; x$set = true; return self(); @@ -22,24 +22,24 @@ public ParentBuilder() { /** * @return {@code this}. */ - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B y(final int y) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B y(final int y) { this.y = y; return self(); } /** * @return {@code this}. */ - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B z(final int z) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B z(final int z) { this.z = z; return self(); } - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B name(final String name) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B name(final String name) { if ((this.names == null)) this.names = new java.util.ArrayList(); this.names.add(name); return self(); } - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B names(final java.util. @org.checkerframework.checker.nullness.qual.NonNull Collection names) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B names(final java.util. @org.checkerframework.checker.nullness.qual.NonNull Collection names) { if ((names == null)) { throw new java.lang.NullPointerException("names cannot be null"); @@ -49,25 +49,25 @@ public ParentBuilder() { this.names.addAll(names); return self(); } - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B clearNames() { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B clearNames() { if ((this.names != null)) this.names.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return (((((((("NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ", z=") + this.z) + ", names=") + this.names) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull Parent build() { return new NullAnnotatedCheckerFrameworkSuperBuilder.Parent(this); } } @@ -75,10 +75,10 @@ private ParentBuilderImpl() { int y; int z; @Singular List names; - private static @java.lang.SuppressWarnings("all") int $default$x() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - protected @java.lang.SuppressWarnings("all") Parent(final NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { super(); if (b.x$set) this.x = b.x$value; @@ -99,22 +99,22 @@ private ParentBuilderImpl() { } this.names = names; } - public static @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.nullness.qual.NonNull ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.Parent. @org.checkerframework.checker.nullness.qual.NonNull ParentBuilder builder() { return new NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class ZChild extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ZChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") int a$value; - private @java.lang.SuppressWarnings("all") boolean a$set; - private @java.lang.SuppressWarnings("all") int b; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ZChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated int a$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean a$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated int b; public ZChildBuilder() { super(); } /** * @return {@code this}. */ - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B a(final int a) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B a(final int a) { this.a$value = a; a$set = true; return self(); @@ -122,33 +122,33 @@ public ZChildBuilder() { /** * @return {@code this}. */ - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") B b(final int b) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated B b(final int b) { this.b = b; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return (((((("NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder(super=" + super.toString()) + ", a$value=") + this.a$value) + ", b=") + this.b) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ZChildBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ZChildBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { private ZChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull ZChild build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull ZChild build() { return new NullAnnotatedCheckerFrameworkSuperBuilder.ZChild(this); } } @lombok.Builder.Default int a; int b; - private static @java.lang.SuppressWarnings("all") int $default$a() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$a() { return 1; } - protected @java.lang.SuppressWarnings("all") ZChild(final NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated ZChild(final NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { super(b); if (b.a$set) this.a = b.a$value; @@ -156,11 +156,11 @@ private ZChildBuilderImpl() { this.a = NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.$default$a(); this.b = b.b; } - public static @java.lang.SuppressWarnings("all") NullAnnotatedCheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.nullness.qual.NonNull ZChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated NullAnnotatedCheckerFrameworkSuperBuilder.ZChild. @org.checkerframework.checker.nullness.qual.NonNull ZChildBuilder builder() { return new NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl(); } } NullAnnotatedCheckerFrameworkSuperBuilder() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/NullLibrary1.java b/test/transform/resource/after-ecj/NullLibrary1.java index 5856f3b423..76940da1aa 100644 --- a/test/transform/resource/after-ecj/NullLibrary1.java +++ b/test/transform/resource/after-ecj/NullLibrary1.java @@ -3,10 +3,10 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @org.eclipse.jdt.annotation.NonNull @java.lang.SuppressWarnings("all") NullLibrary1 withFoo(final String foo) { + public @org.eclipse.jdt.annotation.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary1 withFoo(final String foo) { return ((this.foo == foo) ? this : new NullLibrary1(foo)); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.@org.eclipse.jdt.annotation.Nullable Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.@org.eclipse.jdt.annotation.Nullable Object o) { if ((o == this)) return true; if ((! (o instanceof NullLibrary1))) @@ -20,20 +20,20 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.@org.eclipse.jdt.annotation.Nullable Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.@org.eclipse.jdt.annotation.Nullable Object other) { return (other instanceof NullLibrary1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $foo = this.foo; result = ((result * PRIME) + (($foo == null) ? 43 : $foo.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.@org.eclipse.jdt.annotation.NonNull String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.@org.eclipse.jdt.annotation.NonNull String toString() { return (("NullLibrary1(foo=" + this.foo) + ")"); } - public @java.lang.SuppressWarnings("all") NullLibrary1(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary1(final String foo) { super(); this.foo = foo; } diff --git a/test/transform/resource/after-ecj/NullLibrary2.java b/test/transform/resource/after-ecj/NullLibrary2.java index e6a0723c49..7178d5dc93 100644 --- a/test/transform/resource/after-ecj/NullLibrary2.java +++ b/test/transform/resource/after-ecj/NullLibrary2.java @@ -3,10 +3,10 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") NullLibrary2 withFoo(final String foo) { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary2 withFoo(final String foo) { return ((this.foo == foo) ? this : new NullLibrary2(foo)); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @org.springframework.lang.Nullable java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final @org.springframework.lang.Nullable java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof NullLibrary2))) @@ -20,20 +20,20 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final @org.springframework.lang.Nullable java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final @org.springframework.lang.Nullable java.lang.Object other) { return (other instanceof NullLibrary2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $foo = this.foo; result = ((result * PRIME) + (($foo == null) ? 43 : $foo.hashCode())); return result; } - public @java.lang.Override @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("NullLibrary2(foo=" + this.foo) + ")"); } - public @java.lang.SuppressWarnings("all") NullLibrary2(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary2(final String foo) { super(); this.foo = foo; } diff --git a/test/transform/resource/after-ecj/NullLibrary3.java b/test/transform/resource/after-ecj/NullLibrary3.java index 6b6df80269..bd8d2630f9 100644 --- a/test/transform/resource/after-ecj/NullLibrary3.java +++ b/test/transform/resource/after-ecj/NullLibrary3.java @@ -3,14 +3,14 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @jakarta.annotation.Nonnull @java.lang.SuppressWarnings("all") NullLibrary3 withFoo(final @jakarta.annotation.Nonnull String foo) { + public @jakarta.annotation.Nonnull @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary3 withFoo(final @jakarta.annotation.Nonnull String foo) { if ((foo == null)) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); } return ((this.foo == foo) ? this : new NullLibrary3(foo)); } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @jakarta.annotation.Nullable java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final @jakarta.annotation.Nullable java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof NullLibrary3))) @@ -24,20 +24,20 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final @jakarta.annotation.Nullable java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final @jakarta.annotation.Nullable java.lang.Object other) { return (other instanceof NullLibrary3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $foo = this.foo; result = ((result * PRIME) + (($foo == null) ? 43 : $foo.hashCode())); return result; } - public @java.lang.Override @jakarta.annotation.Nonnull @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @jakarta.annotation.Nonnull @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("NullLibrary3(foo=" + this.foo) + ")"); } - public @java.lang.SuppressWarnings("all") NullLibrary3(final @jakarta.annotation.Nonnull String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated NullLibrary3(final @jakarta.annotation.Nonnull String foo) { super(); if ((foo == null)) { @@ -45,4 +45,4 @@ } this.foo = foo; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/OnXJava7StyleOn8.java b/test/transform/resource/after-ecj/OnXJava7StyleOn8.java index f6d1c84568..a2538abd27 100644 --- a/test/transform/resource/after-ecj/OnXJava7StyleOn8.java +++ b/test/transform/resource/after-ecj/OnXJava7StyleOn8.java @@ -20,31 +20,31 @@ public class OnXJava7StyleOn8 { public OnXJava7StyleOn8() { super(); } - public @Foo @java.lang.SuppressWarnings("all") String getA() { + public @Foo @java.lang.SuppressWarnings("all") @lombok.Generated String getA() { return this.a; } - public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) { + public @Foo() @java.lang.SuppressWarnings("all") @lombok.Generated void setB(final String b) { this.b = b; } - public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setC(final @Foo("a") String c) { this.c = c; } - public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setD(final @Bar(stuff = "b") String d) { this.d = d; } - public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() { + public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @lombok.Generated String getE() { return this.e; } - public @Array @java.lang.SuppressWarnings("all") String getF() { + public @Array @java.lang.SuppressWarnings("all") @lombok.Generated String getF() { return this.f; } - public @Array() @java.lang.SuppressWarnings("all") String getG() { + public @Array() @java.lang.SuppressWarnings("all") @lombok.Generated String getG() { return this.g; } - public @Array({}) @java.lang.SuppressWarnings("all") String getH() { + public @Array({}) @java.lang.SuppressWarnings("all") @lombok.Generated String getH() { return this.h; } - public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") String getI() { + public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") @lombok.Generated String getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/OnXJava8Style.java b/test/transform/resource/after-ecj/OnXJava8Style.java index 540f614b54..804718e17d 100644 --- a/test/transform/resource/after-ecj/OnXJava8Style.java +++ b/test/transform/resource/after-ecj/OnXJava8Style.java @@ -20,31 +20,31 @@ public class OnXJava8Style { public OnXJava8Style() { super(); } - public @Foo @java.lang.SuppressWarnings("all") String getA() { + public @Foo @java.lang.SuppressWarnings("all") @lombok.Generated String getA() { return this.a; } - public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) { + public @Foo() @java.lang.SuppressWarnings("all") @lombok.Generated void setB(final String b) { this.b = b; } - public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setC(final @Foo("a") String c) { this.c = c; } - public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setD(final @Bar(stuff = "b") String d) { this.d = d; } - public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() { + public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @lombok.Generated String getE() { return this.e; } - public @Array @java.lang.SuppressWarnings("all") String getF() { + public @Array @java.lang.SuppressWarnings("all") @lombok.Generated String getF() { return this.f; } - public @Array() @java.lang.SuppressWarnings("all") String getG() { + public @Array() @java.lang.SuppressWarnings("all") @lombok.Generated String getG() { return this.g; } - public @Array({}) @java.lang.SuppressWarnings("all") String getH() { + public @Array({}) @java.lang.SuppressWarnings("all") @lombok.Generated String getH() { return this.h; } - public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") String getI() { + public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") @lombok.Generated String getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java b/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java index f0927bf8a5..41f45dbfdd 100644 --- a/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java +++ b/test/transform/resource/after-ecj/PrivateNoArgsConstructor.java @@ -6,10 +6,10 @@ private Base() { } public static @lombok.Data class PrivateNoArgsConstructorNotOnExtends extends Base { private final int a; - public @java.lang.SuppressWarnings("all") int getA() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getA() { return this.a; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends))) @@ -23,29 +23,29 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = super.hashCode(); result = ((result * PRIME) + this.getA()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends(a=" + this.getA()) + ")"); } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorNotOnExtends(final int a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorNotOnExtends(final int a) { super(); this.a = a; } } public static @lombok.Data class PrivateNoArgsConstructorOnExtendsObject extends Object { private final int b; - public @java.lang.SuppressWarnings("all") int getB() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getB() { return this.b; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject))) @@ -57,37 +57,37 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getB()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject(b=" + this.getB()) + ")"); } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorOnExtendsObject(final int b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorOnExtendsObject(final int b) { super(); this.b = b; } - private @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorOnExtendsObject() { + private @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorOnExtendsObject() { super(); this.b = 0; } } public static @lombok.NoArgsConstructor(force = true) @lombok.Data @lombok.RequiredArgsConstructor class PrivateNoArgsConstructorExplicitBefore { private final int c; - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitBefore() { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorExplicitBefore() { super(); this.c = 0; } - public @java.lang.SuppressWarnings("all") int getC() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getC() { return this.c; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore))) @@ -99,29 +99,29 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getC()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore(c=" + this.getC()) + ")"); } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitBefore(final int c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorExplicitBefore(final int c) { super(); this.c = c; } } public static @lombok.Data @lombok.NoArgsConstructor(force = true) @lombok.RequiredArgsConstructor class PrivateNoArgsConstructorExplicitAfter { private final int d; - public @java.lang.SuppressWarnings("all") int getD() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getD() { return this.d; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter))) @@ -133,33 +133,33 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getD()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter(d=" + this.getD()) + ")"); } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitAfter() { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorExplicitAfter() { super(); this.d = 0; } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitAfter(final int d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorExplicitAfter(final int d) { super(); this.d = d; } } public static @lombok.Data @lombok.NoArgsConstructor(access = lombok.AccessLevel.NONE) @lombok.RequiredArgsConstructor class PrivateNoArgsConstructorExplicitNone { private final int e; - public @java.lang.SuppressWarnings("all") int getE() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getE() { return this.e; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone))) @@ -171,25 +171,25 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getE()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone(e=" + this.getE()) + ")"); } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorExplicitNone(final int e) { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorExplicitNone(final int e) { super(); this.e = e; } } public static @lombok.Data class PrivateNoArgsConstructorNoFields { - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields))) @@ -199,17 +199,17 @@ private Base() { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields()"; } - public @java.lang.SuppressWarnings("all") PrivateNoArgsConstructorNoFields() { + public @java.lang.SuppressWarnings("all") @lombok.Generated PrivateNoArgsConstructorNoFields() { super(); } } diff --git a/test/transform/resource/after-ecj/SetterAccessLevel.java b/test/transform/resource/after-ecj/SetterAccessLevel.java index 4c1a0b971a..76edc69cfd 100644 --- a/test/transform/resource/after-ecj/SetterAccessLevel.java +++ b/test/transform/resource/after-ecj/SetterAccessLevel.java @@ -8,19 +8,19 @@ class SetterAccessLevel { SetterAccessLevel() { super(); } - private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @lombok.Generated void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } - @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } - protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated void setProtected(final boolean isProtected) { this.isProtected = isProtected; } - public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } - public @java.lang.SuppressWarnings("all") void setValue(final boolean value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setValue(final boolean value) { this.value = value; } } diff --git a/test/transform/resource/after-ecj/SetterAlreadyExists.java b/test/transform/resource/after-ecj/SetterAlreadyExists.java index 91b011b6c0..f106d34546 100644 --- a/test/transform/resource/after-ecj/SetterAlreadyExists.java +++ b/test/transform/resource/after-ecj/SetterAlreadyExists.java @@ -37,7 +37,7 @@ class Setter5 { } void setFoo() { } - public @java.lang.SuppressWarnings("all") void setFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final String foo) { this.foo = foo; } } @@ -48,7 +48,7 @@ class Setter6 { } void setFoo(String foo, int x) { } - public @java.lang.SuppressWarnings("all") void setFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final String foo) { this.foo = foo; } } diff --git a/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java b/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java index c95b7bab1d..bb0b3782a0 100644 --- a/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java +++ b/test/transform/resource/after-ecj/SetterAndWithMethodJavadoc.java @@ -11,7 +11,7 @@ class SetterAndWithMethodJavadoc { * Some value. * @param the new value */ - public @java.lang.SuppressWarnings("all") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setI(final int i) { this.i = i; } /** @@ -19,14 +19,14 @@ class SetterAndWithMethodJavadoc { * @param the new value * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") SetterAndWithMethodJavadoc withI(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated SetterAndWithMethodJavadoc withI(final int i) { return ((this.i == i) ? this : new SetterAndWithMethodJavadoc(i, this.j)); } /** * Set some other value. * @param the new other value */ - public @java.lang.SuppressWarnings("all") void setJ(final int j) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setJ(final int j) { this.j = j; } /** @@ -34,7 +34,7 @@ class SetterAndWithMethodJavadoc { * @param the other new other value * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") SetterAndWithMethodJavadoc withJ(final int j) { + public @java.lang.SuppressWarnings("all") @lombok.Generated SetterAndWithMethodJavadoc withJ(final int j) { return ((this.j == j) ? this : new SetterAndWithMethodJavadoc(this.i, j)); } } diff --git a/test/transform/resource/after-ecj/SetterDeprecated.java b/test/transform/resource/after-ecj/SetterDeprecated.java index cc0895661a..9442b3f187 100644 --- a/test/transform/resource/after-ecj/SetterDeprecated.java +++ b/test/transform/resource/after-ecj/SetterDeprecated.java @@ -5,13 +5,13 @@ class SetterDeprecated { SetterDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setAnnotation(final int annotation) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void setAnnotation(final int annotation) { this.annotation = annotation; } /** * @deprecated */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJavadoc(final int javadoc) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void setJavadoc(final int javadoc) { this.javadoc = javadoc; } } diff --git a/test/transform/resource/after-ecj/SetterInAnonymousClass.java b/test/transform/resource/after-ecj/SetterInAnonymousClass.java index fc0bf2d83b..a96fd84e4f 100644 --- a/test/transform/resource/after-ecj/SetterInAnonymousClass.java +++ b/test/transform/resource/after-ecj/SetterInAnonymousClass.java @@ -6,7 +6,7 @@ public class SetterInAnonymousClass { Inner() { super(); } - public @java.lang.SuppressWarnings("all") void setString(final String string) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setString(final String string) { this.string = string; } } diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java index 9ed77bd44c..80dd5e9cff 100644 --- a/test/transform/resource/after-ecj/SetterOnClass.java +++ b/test/transform/resource/after-ecj/SetterOnClass.java @@ -4,7 +4,7 @@ SetterOnClass1() { super(); } - public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } } @@ -15,10 +15,10 @@ SetterOnClass2() { super(); } - @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } - protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated void setProtected(final boolean isProtected) { this.isProtected = isProtected; } } @@ -28,7 +28,7 @@ SetterOnClass3() { super(); } - @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } } @@ -38,7 +38,7 @@ SetterOnClass4() { super(); } - private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @lombok.Generated void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } } @@ -48,7 +48,7 @@ SetterOnClass5() { super(); } - public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } } @@ -58,10 +58,10 @@ SetterOnClass6() { super(); } - public @java.lang.SuppressWarnings("all") void setCouldBeNull(final String couldBeNull) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setCouldBeNull(final String couldBeNull) { this.couldBeNull = couldBeNull; } - public @java.lang.SuppressWarnings("all") void setNonNull(final @lombok.NonNull String nonNull) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setNonNull(final @lombok.NonNull String nonNull) { if ((nonNull == null)) { throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); diff --git a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java index d4ea9f5de6..be25685908 100644 --- a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java +++ b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java @@ -7,13 +7,13 @@ class SetterOnMethodOnParam { SetterOnMethodOnParam() { super(); } - public @Deprecated @java.lang.SuppressWarnings("all") void setI(final int i) { + public @Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") void setJ(final @Test int j) { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @lombok.Generated void setJ(final @Test int j) { this.j = j; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") void setK(final @Test int k) { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @lombok.Generated void setK(final @Test int k) { this.k = k; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SetterOnStatic.java b/test/transform/resource/after-ecj/SetterOnStatic.java index 8a5abdd8e1..91d34a8d73 100644 --- a/test/transform/resource/after-ecj/SetterOnStatic.java +++ b/test/transform/resource/after-ecj/SetterOnStatic.java @@ -6,10 +6,10 @@ class Setter { Setter() { super(); } - public static @java.lang.SuppressWarnings("all") void setFoo(final boolean foo) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final boolean foo) { Setter.foo = foo; } - public static @java.lang.SuppressWarnings("all") void setBar(final int bar) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated void setBar(final int bar) { Setter.bar = bar; } } diff --git a/test/transform/resource/after-ecj/SetterPlain.java b/test/transform/resource/after-ecj/SetterPlain.java index a4b4029515..3991852f8d 100644 --- a/test/transform/resource/after-ecj/SetterPlain.java +++ b/test/transform/resource/after-ecj/SetterPlain.java @@ -5,10 +5,10 @@ class SetterPlain { SetterPlain() { super(); } - public @java.lang.SuppressWarnings("all") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") void setFoo(final int foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final int foo) { this.foo = foo; } } diff --git a/test/transform/resource/after-ecj/SetterTypeAnnos.java b/test/transform/resource/after-ecj/SetterTypeAnnos.java index 860694eae6..f07b7243d6 100644 --- a/test/transform/resource/after-ecj/SetterTypeAnnos.java +++ b/test/transform/resource/after-ecj/SetterTypeAnnos.java @@ -11,7 +11,7 @@ class SetterTypeAnnos { SetterTypeAnnos() { super(); } - public @java.lang.SuppressWarnings("all") void setFoo(final @TA List foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setFoo(final @TA List foo) { this.foo = foo; } } diff --git a/test/transform/resource/after-ecj/SetterWithDollar.java b/test/transform/resource/after-ecj/SetterWithDollar.java index c5bc14f11d..64f8f0ad90 100644 --- a/test/transform/resource/after-ecj/SetterWithDollar.java +++ b/test/transform/resource/after-ecj/SetterWithDollar.java @@ -3,7 +3,7 @@ class SetterWithDollar1 { SetterWithDollar1() { super(); } - public @java.lang.SuppressWarnings("all") void set$i(final int $i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void set$i(final int $i) { this.$i = $i; } } @@ -13,10 +13,10 @@ class SetterWithDollar2 { SetterWithDollar2() { super(); } - public @java.lang.SuppressWarnings("all") void set$i(final int $i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void set$i(final int $i) { this.$i = $i; } - public @java.lang.SuppressWarnings("all") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setI(final int i) { this.i = i; } } diff --git a/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java index 4e99890a85..2d38d914cd 100644 --- a/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-ecj/SetterWithJavaBeansSpecCapitalization.java @@ -4,10 +4,10 @@ class SetterWithJavaBeansSpecCapitalization { SetterWithJavaBeansSpecCapitalization() { super(); } - public @java.lang.SuppressWarnings("all") void setA(final int a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setA(final int a) { this.a = a; } - public @java.lang.SuppressWarnings("all") void setaField(final int aField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setaField(final int aField) { this.aField = aField; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SimpleTypeResolution.java b/test/transform/resource/after-ecj/SimpleTypeResolution.java index d8321ca49b..c072f3ed5b 100644 --- a/test/transform/resource/after-ecj/SimpleTypeResolution.java +++ b/test/transform/resource/after-ecj/SimpleTypeResolution.java @@ -9,7 +9,7 @@ class SimpleTypeResolutionSuccess { SimpleTypeResolutionSuccess() { super(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/SkipSuppressWarnings.java b/test/transform/resource/after-ecj/SkipSuppressWarnings.java index 76b79fe2ad..d9b638a4fe 100644 --- a/test/transform/resource/after-ecj/SkipSuppressWarnings.java +++ b/test/transform/resource/after-ecj/SkipSuppressWarnings.java @@ -4,10 +4,10 @@ class SkipSuppressWarnings { SkipSuppressWarnings() { super(); } - public String getField() { + public @lombok.Generated String getField() { return this.field; } - public @java.lang.SuppressWarnings({"unchecked"}) String getField2() { + public @java.lang.SuppressWarnings({"unchecked"}) @lombok.Generated String getField2() { java.lang.Object $value = this.field2.get(); if (($value == null)) { @@ -24,4 +24,4 @@ public String getField() { } return (String) (($value == this.field2) ? null : $value); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/StandardExceptions.java b/test/transform/resource/after-ecj/StandardExceptions.java index a26a16f790..b5e0f85801 100644 --- a/test/transform/resource/after-ecj/StandardExceptions.java +++ b/test/transform/resource/after-ecj/StandardExceptions.java @@ -1,16 +1,16 @@ import lombok.AccessLevel; import lombok.experimental.StandardException; @StandardException class EmptyException extends Exception { - public @java.lang.SuppressWarnings("all") EmptyException() { + public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException() { this(null, null); } - public @java.lang.SuppressWarnings("all") EmptyException(final java.lang.String message) { + public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException(final java.lang.String message) { this(message, null); } - public @java.lang.SuppressWarnings("all") EmptyException(final java.lang.Throwable cause) { + public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException(final java.lang.Throwable cause) { this(((cause != null) ? cause.getMessage() : null), cause); } - public @java.lang.SuppressWarnings("all") EmptyException(final java.lang.String message, final java.lang.Throwable cause) { + public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException(final java.lang.String message, final java.lang.Throwable cause) { super(message); if ((cause != null)) super.initCause(cause); @@ -20,15 +20,15 @@ public NoArgsException() { super(); } - protected @java.lang.SuppressWarnings("all") NoArgsException(final java.lang.String message) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsException(final java.lang.String message) { this(message, null); } - protected @java.lang.SuppressWarnings("all") NoArgsException(final java.lang.Throwable cause) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsException(final java.lang.Throwable cause) { this(((cause != null) ? cause.getMessage() : null), cause); } - protected @java.lang.SuppressWarnings("all") NoArgsException(final java.lang.String message, final java.lang.Throwable cause) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsException(final java.lang.String message, final java.lang.Throwable cause) { super(message); if ((cause != null)) super.initCause(cause); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/StaticConstructor.java b/test/transform/resource/after-ecj/StaticConstructor.java index 93308faa78..d639753209 100644 --- a/test/transform/resource/after-ecj/StaticConstructor.java +++ b/test/transform/resource/after-ecj/StaticConstructor.java @@ -1,11 +1,11 @@ import lombok.AllArgsConstructor; public @AllArgsConstructor(staticName = "of") class StaticConstructor { String name; - private @java.lang.SuppressWarnings("all") StaticConstructor(final String name) { + private @java.lang.SuppressWarnings("all") @lombok.Generated StaticConstructor(final String name) { super(); this.name = name; } - public static @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") StaticConstructor of(final String name) { + public static @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated StaticConstructor of(final String name) { return new StaticConstructor(name); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderAbstract.java b/test/transform/resource/after-ecj/SuperBuilderAbstract.java index c5d97c4502..1370ed55ba 100644 --- a/test/transform/resource/after-ecj/SuperBuilderAbstract.java +++ b/test/transform/resource/after-ecj/SuperBuilderAbstract.java @@ -1,104 +1,104 @@ public class SuperBuilderAbstract { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int parentField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int parentField; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B parentField(final int parentField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B parentField(final int parentField) { this.parentField = parentField; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderAbstract.Parent.ParentBuilder(parentField=" + this.parentField) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderAbstract.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderAbstract.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstract.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstract.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.Parent build() { return new SuperBuilderAbstract.Parent(this); } } int parentField; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderAbstract.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderAbstract.Parent.ParentBuilder b) { super(); this.parentField = b.parentField; } - public static @java.lang.SuppressWarnings("all") SuperBuilderAbstract.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.Parent.ParentBuilder builder() { return new SuperBuilderAbstract.Parent.ParentBuilderImpl(); } } public static abstract @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double childField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double childField; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B childField(final double childField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B childField(final double childField) { this.childField = childField; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderAbstract.Child.ChildBuilder(super=" + super.toString()) + ", childField=") + this.childField) + ")"); } } double childField; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderAbstract.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderAbstract.Child.ChildBuilder b) { super(b); this.childField = b.childField; } } public static @lombok.experimental.SuperBuilder class GrandChild extends Child { - public static abstract @java.lang.SuppressWarnings("all") class GrandChildBuilder> extends Child.ChildBuilder { - private @java.lang.SuppressWarnings("all") String grandChildField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GrandChildBuilder> extends Child.ChildBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String grandChildField; public GrandChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B grandChildField(final String grandChildField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B grandChildField(final String grandChildField) { this.grandChildField = grandChildField; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderAbstract.GrandChild.GrandChildBuilder(super=" + super.toString()) + ", grandChildField=") + this.grandChildField) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class GrandChildBuilderImpl extends SuperBuilderAbstract.GrandChild.GrandChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class GrandChildBuilderImpl extends SuperBuilderAbstract.GrandChild.GrandChildBuilder { private GrandChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstract.GrandChild build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.GrandChild build() { return new SuperBuilderAbstract.GrandChild(this); } } String grandChildField; - protected @java.lang.SuppressWarnings("all") GrandChild(final SuperBuilderAbstract.GrandChild.GrandChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated GrandChild(final SuperBuilderAbstract.GrandChild.GrandChildBuilder b) { super(b); this.grandChildField = b.grandChildField; } - public static @java.lang.SuppressWarnings("all") SuperBuilderAbstract.GrandChild.GrandChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstract.GrandChild.GrandChildBuilder builder() { return new SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java index 0ed393e95d..7467c511d8 100644 --- a/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java @@ -1,133 +1,133 @@ public class SuperBuilderAbstractToBuilder { public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int parentField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int parentField; public ParentBuilder() { super(); } - protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { SuperBuilderAbstractToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Parent instance, final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Parent instance, final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { b.parentField(instance.parentField); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B parentField(final int parentField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B parentField(final int parentField) { this.parentField = parentField; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderAbstractToBuilder.Parent.ParentBuilder(parentField=" + this.parentField) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderAbstractToBuilder.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderAbstractToBuilder.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.Parent build() { return new SuperBuilderAbstractToBuilder.Parent(this); } } int parentField; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { super(); this.parentField = b.parentField; } - public @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.Parent.ParentBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl(); } } public static abstract @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double childField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double childField; public ChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderAbstractToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Child instance, final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Child instance, final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { b.childField(instance.childField); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B childField(final double childField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B childField(final double childField) { this.childField = childField; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderAbstractToBuilder.Child.ChildBuilder(super=" + super.toString()) + ", childField=") + this.childField) + ")"); } } double childField; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { super(b); this.childField = b.childField; } } public static @lombok.experimental.SuperBuilder(toBuilder = true) class GrandChild extends Child { - public static abstract @java.lang.SuppressWarnings("all") class GrandChildBuilder> extends Child.ChildBuilder { - private @java.lang.SuppressWarnings("all") String grandChildField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GrandChildBuilder> extends Child.ChildBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String grandChildField; public GrandChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.GrandChild instance, final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.GrandChild instance, final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { b.grandChildField(instance.grandChildField); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B grandChildField(final String grandChildField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B grandChildField(final String grandChildField) { this.grandChildField = grandChildField; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder(super=" + super.toString()) + ", grandChildField=") + this.grandChildField) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class GrandChildBuilderImpl extends SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class GrandChildBuilderImpl extends SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder { private GrandChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.GrandChild build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.GrandChild build() { return new SuperBuilderAbstractToBuilder.GrandChild(this); } } String grandChildField; - protected @java.lang.SuppressWarnings("all") GrandChild(final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated GrandChild(final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { super(b); this.grandChildField = b.grandChildField; } - public @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder toBuilder() { return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder builder() { return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderBasic.java b/test/transform/resource/after-ecj/SuperBuilderBasic.java index ad31a14b89..7cc0e350bc 100644 --- a/test/transform/resource/after-ecj/SuperBuilderBasic.java +++ b/test/transform/resource/after-ecj/SuperBuilderBasic.java @@ -1,26 +1,26 @@ import java.util.List; public class SuperBuilderBasic { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final int field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final int field1) { this.field1 = field1; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -30,31 +30,31 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderBasic.Parent.ParentBuilder(field1=" + this.field1) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderBasic.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderBasic.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasic.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasic.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Parent build() { return new SuperBuilderBasic.Parent(this); } } int field1; @lombok.Singular List items; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { super(); this.field1 = b.field1; java.util.List items; @@ -70,46 +70,46 @@ private ParentBuilderImpl() { } this.items = items; } - public static @java.lang.SuppressWarnings("all") SuperBuilderBasic.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Parent.ParentBuilder builder() { return new SuperBuilderBasic.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends SuperBuilderBasic.Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends SuperBuilderBasic.Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends SuperBuilderBasic.Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderBasic.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderBasic.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderBasic.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasic.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasic.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Child build() { return new SuperBuilderBasic.Child(this); } } double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderBasic.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderBasic.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public static @java.lang.SuppressWarnings("all") SuperBuilderBasic.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasic.Child.ChildBuilder builder() { return new SuperBuilderBasic.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java index f29dfd3768..2d9262db0c 100644 --- a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java @@ -1,20 +1,20 @@ import java.util.List; public class SuperBuilderBasicToBuilder { public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; - private @java.lang.SuppressWarnings("all") int obtainViaField; - private @java.lang.SuppressWarnings("all") int obtainViaMethod; - private @java.lang.SuppressWarnings("all") String obtainViaStaticMethod; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated int obtainViaField; + private @java.lang.SuppressWarnings("all") @lombok.Generated int obtainViaMethod; + private @java.lang.SuppressWarnings("all") @lombok.Generated String obtainViaStaticMethod; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } - protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { SuperBuilderBasicToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Parent instance, final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Parent instance, final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { b.field1(instance.field1); b.obtainViaField(instance.field1); b.obtainViaMethod(instance.method()); @@ -24,38 +24,38 @@ public ParentBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final int field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final int field1) { this.field1 = field1; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B obtainViaField(final int obtainViaField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B obtainViaField(final int obtainViaField) { this.obtainViaField = obtainViaField; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B obtainViaMethod(final int obtainViaMethod) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B obtainViaMethod(final int obtainViaMethod) { this.obtainViaMethod = obtainViaMethod; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B obtainViaStaticMethod(final String obtainViaStaticMethod) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B obtainViaStaticMethod(final String obtainViaStaticMethod) { this.obtainViaStaticMethod = obtainViaStaticMethod; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -65,25 +65,25 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((("SuperBuilderBasicToBuilder.Parent.ParentBuilder(field1=" + this.field1) + ", obtainViaField=") + this.obtainViaField) + ", obtainViaMethod=") + this.obtainViaMethod) + ", obtainViaStaticMethod=") + this.obtainViaStaticMethod) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderBasicToBuilder.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderBasicToBuilder.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Parent build() { return new SuperBuilderBasicToBuilder.Parent(this); } } @@ -98,7 +98,7 @@ private int method() { private static String staticMethod(Parent instance) { return "staticMethod"; } - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { super(); this.field1 = b.field1; this.obtainViaField = b.obtainViaField; @@ -117,60 +117,60 @@ private static String staticMethod(Parent instance) { } this.items = items; } - public @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Parent.ParentBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderBasicToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Child instance, final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Child instance, final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { b.field3(instance.field3); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderBasicToBuilder.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderBasicToBuilder.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderBasicToBuilder.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Child build() { return new SuperBuilderBasicToBuilder.Child(this); } } private double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Child.ChildBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Child.ChildBuilder toBuilder() { return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderBasicToBuilder.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderBasicToBuilder.Child.ChildBuilder builder() { return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomName.java b/test/transform/resource/after-ecj/SuperBuilderCustomName.java index fc834090de..528db4f319 100644 --- a/test/transform/resource/after-ecj/SuperBuilderCustomName.java +++ b/test/transform/resource/after-ecj/SuperBuilderCustomName.java @@ -1,40 +1,40 @@ import java.util.List; @lombok.experimental.SuperBuilder class SuperBuilderCustomName { - public static abstract @java.lang.SuppressWarnings("all") class SimpleTestBuilder, B extends SuperBuilderCustomName.SimpleTestBuilder> { - private @java.lang.SuppressWarnings("all") int field; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SimpleTestBuilder, B extends SuperBuilderCustomName.SimpleTestBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field; public SimpleTestBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field(final int field) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field(final int field) { this.field = field; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderCustomName.SimpleTestBuilder(field=" + this.field) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class SimpleTestBuilderImpl extends SuperBuilderCustomName.SimpleTestBuilder, SuperBuilderCustomName.SimpleTestBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class SimpleTestBuilderImpl extends SuperBuilderCustomName.SimpleTestBuilder, SuperBuilderCustomName.SimpleTestBuilderImpl> { private SimpleTestBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomName.SimpleTestBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomName.SimpleTestBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomName build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomName build() { return new SuperBuilderCustomName(this); } } private final int field; - protected @java.lang.SuppressWarnings("all") SuperBuilderCustomName(final SuperBuilderCustomName.SimpleTestBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomName(final SuperBuilderCustomName.SimpleTestBuilder b) { super(); this.field = b.field; } - public static @java.lang.SuppressWarnings("all") SuperBuilderCustomName.SimpleTestBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomName.SimpleTestBuilder builder() { return new SuperBuilderCustomName.SimpleTestBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomized.java b/test/transform/resource/after-ecj/SuperBuilderCustomized.java index e84ffe144c..2fd5562784 100644 --- a/test/transform/resource/after-ecj/SuperBuilderCustomized.java +++ b/test/transform/resource/after-ecj/SuperBuilderCustomized.java @@ -2,7 +2,7 @@ public class SuperBuilderCustomized { public static @lombok.experimental.SuperBuilder class Parent { public static abstract class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public ParentBuilder() { super(); } @@ -14,20 +14,20 @@ public B field1(int field1) { this.field1 = (field1 + 1); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderCustomized.Parent.ParentBuilder(field1=" + this.field1) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomized.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomized.Parent build() { return new SuperBuilderCustomized.Parent(this); } } @@ -51,25 +51,25 @@ private ChildBuilderImpl() { this.resetToDefault(); return new Child(this); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomized.Child.ChildBuilderImpl self() { return this; } } - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field2; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field2; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field2(final double field2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field2(final double field2) { this.field2 = field2; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderCustomized.Child.ChildBuilder(super=" + super.toString()) + ", field2=") + this.field2) + ")"); } } @@ -77,7 +77,7 @@ public ChildBuilder() { public static ChildBuilder builder() { return new ChildBuilderImpl().field2(10.0); } - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderCustomized.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderCustomized.Child.ChildBuilder b) { super(b); this.field2 = b.field2; } diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java b/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java index 142181ec6e..6337df34f8 100644 --- a/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java @@ -2,7 +2,7 @@ public class SuperBuilderCustomizedWithSetterPrefix { public static @lombok.experimental.SuperBuilder(setterPrefix = "set") class Parent { public static abstract class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; public ParentBuilder() { super(); } @@ -10,29 +10,29 @@ public B setField1(int field1) { this.field1 = (field1 + 1); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder(field1=" + this.field1) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomizedWithSetterPrefix.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomizedWithSetterPrefix.Parent build() { return new SuperBuilderCustomizedWithSetterPrefix.Parent(this); } } int field1; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder b) { super(); this.field1 = b.field1; } - public static @java.lang.SuppressWarnings("all") SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder builder() { return new SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderInitializer.java b/test/transform/resource/after-ecj/SuperBuilderInitializer.java index 9143be9431..ce63789960 100644 --- a/test/transform/resource/after-ecj/SuperBuilderInitializer.java +++ b/test/transform/resource/after-ecj/SuperBuilderInitializer.java @@ -1,32 +1,32 @@ import lombok.experimental.SuperBuilder; class SuperBuilderInitializer { public static @SuperBuilder class One { - public static abstract @java.lang.SuppressWarnings("all") class OneBuilder> { - private @java.lang.SuppressWarnings("all") String world; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class OneBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated String world; public OneBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B world(final String world) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B world(final String world) { this.world = world; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderInitializer.One.OneBuilder(world=" + this.world) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class OneBuilderImpl extends SuperBuilderInitializer.One.OneBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class OneBuilderImpl extends SuperBuilderInitializer.One.OneBuilder { private OneBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderInitializer.One.OneBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderInitializer.One.OneBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderInitializer.One build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderInitializer.One build() { return new SuperBuilderInitializer.One(this); } } @@ -40,11 +40,11 @@ private OneBuilderImpl() { } () { } - protected @java.lang.SuppressWarnings("all") One(final SuperBuilderInitializer.One.OneBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated One(final SuperBuilderInitializer.One.OneBuilder b) { super(); this.world = b.world; } - public static @java.lang.SuppressWarnings("all") SuperBuilderInitializer.One.OneBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderInitializer.One.OneBuilder builder() { return new SuperBuilderInitializer.One.OneBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderJavadoc.java b/test/transform/resource/after-ecj/SuperBuilderJavadoc.java index f06b6008dc..ab65e7bc10 100644 --- a/test/transform/resource/after-ecj/SuperBuilderJavadoc.java +++ b/test/transform/resource/after-ecj/SuperBuilderJavadoc.java @@ -1,10 +1,10 @@ import java.util.List; public abstract @lombok.experimental.SuperBuilder class SuperBuilderJavadoc { public static abstract class SuperBuilderJavadocBuilder> { - private @java.lang.SuppressWarnings("all") int basic; - private @java.lang.SuppressWarnings("all") int getsetwith; - private @java.lang.SuppressWarnings("all") int predef; - private @java.lang.SuppressWarnings("all") int predefWithJavadoc; + private @java.lang.SuppressWarnings("all") @lombok.Generated int basic; + private @java.lang.SuppressWarnings("all") @lombok.Generated int getsetwith; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predef; + private @java.lang.SuppressWarnings("all") @lombok.Generated int predefWithJavadoc; public SuperBuilderJavadocBuilder() { super(); } @@ -22,7 +22,7 @@ public B predefWithJavadoc(final int x) { * @param tag is moved to the setter. * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B basic(final int basic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B basic(final int basic) { this.basic = basic; return self(); } @@ -31,13 +31,13 @@ public B predefWithJavadoc(final int x) { * @param tag is moved to the setters and wither. * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B getsetwith(final int getsetwith) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B getsetwith(final int getsetwith) { this.getsetwith = getsetwith; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("SuperBuilderJavadoc.SuperBuilderJavadocBuilder(basic=" + this.basic) + ", getsetwith=") + this.getsetwith) + ", predef=") + this.predef) + ", predefWithJavadoc=") + this.predefWithJavadoc) + ")"); } } @@ -45,7 +45,7 @@ public B predefWithJavadoc(final int x) { private @lombok.Getter @lombok.Setter @lombok.experimental.Wither int getsetwith; private final int predef; private final int predefWithJavadoc; - protected @java.lang.SuppressWarnings("all") SuperBuilderJavadoc(final SuperBuilderJavadoc.SuperBuilderJavadocBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderJavadoc(final SuperBuilderJavadoc.SuperBuilderJavadocBuilder b) { super(); this.basic = b.basic; this.getsetwith = b.getsetwith; @@ -56,14 +56,14 @@ public B predefWithJavadoc(final int x) { * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @return tag is moved to the getter. */ - public @java.lang.SuppressWarnings("all") int getGetsetwith() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getGetsetwith() { return this.getsetwith; } /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @param tag is moved to the setters and wither. */ - public @java.lang.SuppressWarnings("all") void setGetsetwith(final int getsetwith) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setGetsetwith(final int getsetwith) { this.getsetwith = getsetwith; } /** @@ -71,5 +71,5 @@ public B predefWithJavadoc(final int x) { * @param tag is moved to the setters and wither. * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public abstract @java.lang.SuppressWarnings("all") SuperBuilderJavadoc withGetsetwith(final int getsetwith); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderJavadoc withGetsetwith(final int getsetwith); } diff --git a/test/transform/resource/after-ecj/SuperBuilderNameClashes.java b/test/transform/resource/after-ecj/SuperBuilderNameClashes.java index 7f8507cebb..5ef99a5623 100644 --- a/test/transform/resource/after-ecj/SuperBuilderNameClashes.java +++ b/test/transform/resource/after-ecj/SuperBuilderNameClashes.java @@ -1,59 +1,59 @@ public class SuperBuilderNameClashes { public static @lombok.experimental.SuperBuilder class GenericsClash { - public static abstract @java.lang.SuppressWarnings("all") class GenericsClashBuilder, B2 extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GenericsClashBuilder, B2 extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder> { public GenericsClashBuilder() { super(); } - protected abstract @java.lang.SuppressWarnings("all") B2 self(); - public abstract @java.lang.SuppressWarnings("all") C3 build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B2 self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C3 build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder()"; } } - private static final @java.lang.SuppressWarnings("all") class GenericsClashBuilderImpl extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder, SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class GenericsClashBuilderImpl extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder, SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl> { private GenericsClashBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.GenericsClash build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.GenericsClash build() { return new SuperBuilderNameClashes.GenericsClash(this); } } - protected @java.lang.SuppressWarnings("all") GenericsClash(final SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated GenericsClash(final SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder b) { super(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder builder() { return new SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class B { - public static abstract @java.lang.SuppressWarnings("all") class BBuilder> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class BBuilder> { public BBuilder() { super(); } - protected abstract @java.lang.SuppressWarnings("all") B2 self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B2 self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "SuperBuilderNameClashes.B.BBuilder()"; } } - private static final @java.lang.SuppressWarnings("all") class BBuilderImpl extends SuperBuilderNameClashes.B.BBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class BBuilderImpl extends SuperBuilderNameClashes.B.BBuilder { private BBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.B.BBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.B.BBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.B build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.B build() { return new SuperBuilderNameClashes.B(this); } } - protected @java.lang.SuppressWarnings("all") B(final SuperBuilderNameClashes.B.BBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B(final SuperBuilderNameClashes.B.BBuilder b) { super(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.B.BBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.B.BBuilder builder() { return new SuperBuilderNameClashes.B.BBuilderImpl(); } } @@ -63,41 +63,41 @@ public C2() { } } public static @lombok.experimental.SuperBuilder class C { - public static abstract @java.lang.SuppressWarnings("all") class CBuilder> { - private @java.lang.SuppressWarnings("all") C2 c2; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class CBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated C2 c2; public CBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B c2(final C2 c2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B c2(final C2 c2) { this.c2 = c2; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C3 build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C3 build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderNameClashes.C.CBuilder(c2=" + this.c2) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class CBuilderImpl extends SuperBuilderNameClashes.C.CBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class CBuilderImpl extends SuperBuilderNameClashes.C.CBuilder { private CBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.C.CBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.C.CBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.C build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.C build() { return new SuperBuilderNameClashes.C(this); } } C2 c2; - protected @java.lang.SuppressWarnings("all") C(final SuperBuilderNameClashes.C.CBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated C(final SuperBuilderNameClashes.C.CBuilder b) { super(); this.c2 = b.c2; } - public static @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.C.CBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.C.CBuilder builder() { return new SuperBuilderNameClashes.C.CBuilderImpl(); } } @@ -108,35 +108,35 @@ interface B4 { interface B3 { } public static @lombok.experimental.SuperBuilder class ExtendsClauseCollision extends B implements B2.B4, B3 { - public static abstract @java.lang.SuppressWarnings("all") class ExtendsClauseCollisionBuilder> extends B.BBuilder { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ExtendsClauseCollisionBuilder> extends B.BBuilder { public ExtendsClauseCollisionBuilder() { super(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B4 self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B4 self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder(super=" + super.toString()) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ExtendsClauseCollisionBuilderImpl extends SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ExtendsClauseCollisionBuilderImpl extends SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder { private ExtendsClauseCollisionBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.ExtendsClauseCollision build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.ExtendsClauseCollision build() { return new SuperBuilderNameClashes.ExtendsClauseCollision(this); } } - protected @java.lang.SuppressWarnings("all") ExtendsClauseCollision(final SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated ExtendsClauseCollision(final SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder b) { super(b); } - public static @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder builder() { return new SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl(); } } public SuperBuilderNameClashes() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java b/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java index 0c51d4ee1e..5a175532de 100644 --- a/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java +++ b/test/transform/resource/after-ecj/SuperBuilderNestedGenericTypes.java @@ -1,31 +1,31 @@ public class SuperBuilderNestedGenericTypes { public static abstract @lombok.experimental.SuperBuilder class Generic> { - public static abstract @java.lang.SuppressWarnings("all") class GenericBuilder, C extends SuperBuilderNestedGenericTypes.Generic, B extends SuperBuilderNestedGenericTypes.Generic.GenericBuilder> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class GenericBuilder, C extends SuperBuilderNestedGenericTypes.Generic, B extends SuperBuilderNestedGenericTypes.Generic.GenericBuilder> { public GenericBuilder() { super(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "SuperBuilderNestedGenericTypes.Generic.GenericBuilder()"; } } - protected @java.lang.SuppressWarnings("all") Generic(final SuperBuilderNestedGenericTypes.Generic.GenericBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Generic(final SuperBuilderNestedGenericTypes.Generic.GenericBuilder b) { super(); } } public static abstract @lombok.experimental.SuperBuilder class NestedGeneric> extends Generic>> { - public static abstract @java.lang.SuppressWarnings("all") class NestedGenericBuilder, C extends SuperBuilderNestedGenericTypes.NestedGeneric, B extends SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder> extends Generic.GenericBuilder>, C, B> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class NestedGenericBuilder, C extends SuperBuilderNestedGenericTypes.NestedGeneric, B extends SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder> extends Generic.GenericBuilder>, C, B> { public NestedGenericBuilder() { super(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder(super=" + super.toString()) + ")"); } } - protected @java.lang.SuppressWarnings("all") NestedGeneric(final SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated NestedGeneric(final SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder b) { super(b); } } @@ -34,4 +34,4 @@ public interface OtherGeneric { public SuperBuilderNestedGenericTypes() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java b/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java index 1915e765f6..6c03494ace 100644 --- a/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-ecj/SuperBuilderSingularAnnotatedTypes.java @@ -7,14 +7,14 @@ @Target(ElementType.TYPE_USE) @interface MyAnnotation { } @lombok.experimental.SuperBuilder class SuperBuilderSingularAnnotatedTypes { - public static abstract @java.lang.SuppressWarnings("all") class SuperBuilderSingularAnnotatedTypesBuilder> { - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> foos; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderSingularAnnotatedTypesBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> foos; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; public SuperBuilderSingularAnnotatedTypesBuilder() { super(); } - public @java.lang.SuppressWarnings("all") B foo(final @MyAnnotation @NonNull String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foo(final @MyAnnotation @NonNull String foo) { if ((foo == null)) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -24,7 +24,7 @@ public SuperBuilderSingularAnnotatedTypesBuilder() { this.foos.add(foo); return self(); } - public @java.lang.SuppressWarnings("all") B foos(final java.util.Collection foos) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foos(final java.util.Collection foos) { if ((foos == null)) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -34,12 +34,12 @@ public SuperBuilderSingularAnnotatedTypesBuilder() { this.foos.addAll(foos); return self(); } - public @java.lang.SuppressWarnings("all") B clearFoos() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearFoos() { if ((this.foos != null)) this.foos.clear(); return self(); } - public @java.lang.SuppressWarnings("all") B bar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B bar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) { if ((barKey == null)) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); @@ -57,7 +57,7 @@ public SuperBuilderSingularAnnotatedTypesBuilder() { this.bars$value.add(barValue); return self(); } - public @java.lang.SuppressWarnings("all") B bars(final java.util.Map bars) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B bars(final java.util.Map bars) { if ((bars == null)) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -74,7 +74,7 @@ public SuperBuilderSingularAnnotatedTypesBuilder() { } return self(); } - public @java.lang.SuppressWarnings("all") B clearBars() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearBars() { if ((this.bars$key != null)) { this.bars$key.clear(); @@ -82,26 +82,26 @@ public SuperBuilderSingularAnnotatedTypesBuilder() { } return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder(foos=" + this.foos) + ", bars$key=") + this.bars$key) + ", bars$value=") + this.bars$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class SuperBuilderSingularAnnotatedTypesBuilderImpl extends SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderSingularAnnotatedTypesBuilderImpl extends SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder { private SuperBuilderSingularAnnotatedTypesBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularAnnotatedTypes build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularAnnotatedTypes build() { return new SuperBuilderSingularAnnotatedTypes(this); } } private @Singular Set<@MyAnnotation @NonNull String> foos; private @Singular Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; - protected @java.lang.SuppressWarnings("all") SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder b) { super(); java.util.Set<@MyAnnotation @NonNull String> foos; switch (((b.foos == null) ? 0 : b.foos.size())) { @@ -133,7 +133,7 @@ private SuperBuilderSingularAnnotatedTypesBuilderImpl() { } this.bars = bars; } - public static @java.lang.SuppressWarnings("all") SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder builder() { return new SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java b/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java index da9d0c3b73..551fdc5d66 100644 --- a/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java +++ b/test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java @@ -1,20 +1,20 @@ import java.util.Set; @lombok.experimental.SuperBuilder class SuperBuilderSingularCustomized { public static abstract class SuperBuilderSingularCustomizedBuilder> { - private @java.lang.SuppressWarnings("all") java.util.ArrayList foos; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList foos; public SuperBuilderSingularCustomizedBuilder() { super(); } public B custom(final String value) { return self(); } - public @java.lang.SuppressWarnings("all") B foo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foo(final String foo) { if ((this.foos == null)) this.foos = new java.util.ArrayList(); this.foos.add(foo); return self(); } - public @java.lang.SuppressWarnings("all") B foos(final java.util.Collection foos) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foos(final java.util.Collection foos) { if ((foos == null)) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -24,30 +24,30 @@ public B custom(final String value) { this.foos.addAll(foos); return self(); } - public @java.lang.SuppressWarnings("all") B clearFoos() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearFoos() { if ((this.foos != null)) this.foos.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder(foos=" + this.foos) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class SuperBuilderSingularCustomizedBuilderImpl extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderSingularCustomizedBuilderImpl extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder { private SuperBuilderSingularCustomizedBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularCustomized build() { return new SuperBuilderSingularCustomized(this); } } private @lombok.Singular Set foos; - protected @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized(final SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularCustomized(final SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder b) { super(); java.util.Set foos; switch (((b.foos == null) ? 0 : b.foos.size())) { @@ -64,7 +64,7 @@ private SuperBuilderSingularCustomizedBuilderImpl() { } this.foos = foos; } - public static @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder builder() { return new SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java b/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java index 62146b9964..d007fa2246 100644 --- a/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java +++ b/test/transform/resource/after-ecj/SuperBuilderSingularToBuilderGuava.java @@ -1,32 +1,32 @@ public class SuperBuilderSingularToBuilderGuava { public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder cards; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder frogs; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder rawSet; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedSet.Builder passes; - private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableTable.Builder users; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder cards; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableList.Builder frogs; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSet.Builder rawSet; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableSortedSet.Builder passes; + private @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.collect.ImmutableTable.Builder users; public ParentBuilder() { super(); } - protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Parent instance, final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Parent instance, final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { b.cards(((instance.cards == null) ? com.google.common.collect.ImmutableList.of() : instance.cards)); b.frogs(((instance.frogs == null) ? com.google.common.collect.ImmutableList.of() : instance.frogs)); b.rawSet(((instance.rawSet == null) ? com.google.common.collect.ImmutableSet.of() : instance.rawSet)); b.passes(((instance.passes == null) ? com.google.common.collect.ImmutableSortedSet.of() : instance.passes)); b.users(((instance.users == null) ? com.google.common.collect.ImmutableTable.of() : instance.users)); } - public @java.lang.SuppressWarnings("all") B card(final T card) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B card(final T card) { if ((this.cards == null)) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return self(); } - public @java.lang.SuppressWarnings("all") B cards(final java.lang.Iterable cards) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B cards(final java.lang.Iterable cards) { if ((cards == null)) { throw new java.lang.NullPointerException("cards cannot be null"); @@ -36,17 +36,17 @@ public ParentBuilder() { this.cards.addAll(cards); return self(); } - public @java.lang.SuppressWarnings("all") B clearCards() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearCards() { this.cards = null; return self(); } - public @java.lang.SuppressWarnings("all") B frog(final Number frog) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B frog(final Number frog) { if ((this.frogs == null)) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return self(); } - public @java.lang.SuppressWarnings("all") B frogs(final java.lang.Iterable frogs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B frogs(final java.lang.Iterable frogs) { if ((frogs == null)) { throw new java.lang.NullPointerException("frogs cannot be null"); @@ -56,17 +56,17 @@ public ParentBuilder() { this.frogs.addAll(frogs); return self(); } - public @java.lang.SuppressWarnings("all") B clearFrogs() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearFrogs() { this.frogs = null; return self(); } - public @java.lang.SuppressWarnings("all") B rawSet(final java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B rawSet(final java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return self(); } - public @java.lang.SuppressWarnings("all") B rawSet(final java.lang.Iterable rawSet) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B rawSet(final java.lang.Iterable rawSet) { if ((rawSet == null)) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -76,17 +76,17 @@ public ParentBuilder() { this.rawSet.addAll(rawSet); return self(); } - public @java.lang.SuppressWarnings("all") B clearRawSet() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearRawSet() { this.rawSet = null; return self(); } - public @java.lang.SuppressWarnings("all") B pass(final String pass) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B pass(final String pass) { if ((this.passes == null)) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return self(); } - public @java.lang.SuppressWarnings("all") B passes(final java.lang.Iterable passes) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B passes(final java.lang.Iterable passes) { if ((passes == null)) { throw new java.lang.NullPointerException("passes cannot be null"); @@ -96,17 +96,17 @@ public ParentBuilder() { this.passes.addAll(passes); return self(); } - public @java.lang.SuppressWarnings("all") B clearPasses() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearPasses() { this.passes = null; return self(); } - public @java.lang.SuppressWarnings("all") B user(final Number rowKey, final Number columnKey, final String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B 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 self(); } - public @java.lang.SuppressWarnings("all") B users(final com.google.common.collect.Table users) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B users(final com.google.common.collect.Table users) { if ((users == null)) { throw new java.lang.NullPointerException("users cannot be null"); @@ -116,24 +116,24 @@ public ParentBuilder() { this.users.putAll(users); return self(); } - public @java.lang.SuppressWarnings("all") B clearUsers() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearUsers() { this.users = null; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((("SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ", users=") + this.users) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder, SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder, SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Parent build() { return new SuperBuilderSingularToBuilderGuava.Parent(this); } } @@ -142,7 +142,7 @@ private ParentBuilderImpl() { private @SuppressWarnings("all") @lombok.Singular("rawSet") com.google.common.collect.ImmutableSet rawSet; private @lombok.Singular com.google.common.collect.ImmutableSortedSet passes; private @lombok.Singular com.google.common.collect.ImmutableTable users; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { super(); com.google.common.collect.ImmutableList cards = ((b.cards == null) ? com.google.common.collect.ImmutableList.of() : b.cards.build()); this.cards = cards; @@ -155,60 +155,60 @@ private ParentBuilderImpl() { com.google.common.collect.ImmutableTable users = ((b.users == null) ? com.google.common.collect.ImmutableTable.of() : b.users.build()); this.users = users; } - public @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder toBuilder() { return new SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder builder() { return new SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder, B extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderSingularToBuilderGuava.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Child instance, final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Child instance, final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { b.field3(instance.field3); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderSingularToBuilderGuava.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder, SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder, SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl> { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Child build() { return new SuperBuilderSingularToBuilderGuava.Child(this); } } private double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Child.ChildBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Child.ChildBuilder toBuilder() { return new SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderSingularToBuilderGuava.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderSingularToBuilderGuava.Child.ChildBuilder builder() { return new SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl(); } } @@ -218,4 +218,4 @@ public SuperBuilderSingularToBuilderGuava() { public static void test() { Child x = Child.builder().card(1).build().toBuilder().build(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java b/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java index 9dea5ba0d6..27691d0b24 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithAnnotatedTypeParam.java @@ -9,80 +9,80 @@ public class SuperBuilderWithAnnotatedTypeParam { public @Documented @Target({ElementType.TYPE_USE, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface MyAnnotation { } public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") A field1; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final A field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { this.field1 = field1; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder(field1=" + this.field1) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder, SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder, SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Parent build() { return new SuperBuilderWithAnnotatedTypeParam.Parent(this); } } A field1; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder b) { super(); this.field1 = b.field1; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder builder() { return new SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent<@MyAnnotation String> { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder<@MyAnnotation String, C, B> { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder<@MyAnnotation String, C, B> { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Child build() { return new SuperBuilderWithAnnotatedTypeParam.Child(this); } } double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder builder() { return new SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java index 08acadfcff..d60c08ff49 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java @@ -1,63 +1,63 @@ class SuperBuilderWithCustomBuilderClassName { static @lombok.experimental.SuperBuilder class SuperClass { - public static abstract @java.lang.SuppressWarnings("all") class Builder> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class Builder> { public Builder() { super(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "SuperBuilderWithCustomBuilderClassName.SuperClass.Builder()"; } } - private static final @java.lang.SuppressWarnings("all") class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SuperClass.Builder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SuperClass.Builder { private BuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SuperClass build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SuperClass build() { return new SuperBuilderWithCustomBuilderClassName.SuperClass(this); } } - protected @java.lang.SuppressWarnings("all") SuperClass(final SuperBuilderWithCustomBuilderClassName.SuperClass.Builder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperClass(final SuperBuilderWithCustomBuilderClassName.SuperClass.Builder b) { super(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SuperClass.Builder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SuperClass.Builder builder() { return new SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl(); } } static @lombok.experimental.SuperBuilder class SubClass extends SuperClass { - public static abstract @java.lang.SuppressWarnings("all") class Builder> extends SuperClass.Builder { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class Builder> extends SuperClass.Builder { public Builder() { super(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithCustomBuilderClassName.SubClass.Builder(super=" + super.toString()) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SubClass.Builder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SubClass.Builder { private BuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SubClass build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SubClass build() { return new SuperBuilderWithCustomBuilderClassName.SubClass(this); } } - protected @java.lang.SuppressWarnings("all") SubClass(final SuperBuilderWithCustomBuilderClassName.SubClass.Builder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SubClass(final SuperBuilderWithCustomBuilderClassName.SubClass.Builder b) { super(b); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SubClass.Builder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderClassName.SubClass.Builder builder() { return new SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl(); } } SuperBuilderWithCustomBuilderClassName() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java index 7706e78849..bda0f840e4 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderMethod.java @@ -1,26 +1,26 @@ import java.util.List; public class SuperBuilderWithCustomBuilderMethod { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") A field1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final A field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { this.field1 = field1; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -30,77 +30,77 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder(field1=" + this.field1) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder, SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder, SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderMethod.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderMethod.Parent build() { return new SuperBuilderWithCustomBuilderMethod.Parent(this); } } A field1; @lombok.Singular List items; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder b) { super(); this.field1 = b.field1; java.util.List items; switch (((b.items == null) ? 0 : b.items.size())) { - case 0 : + case 0 : items = java.util.Collections.emptyList(); break; - case 1 : + case 1 : items = java.util.Collections.singletonList(b.items.get(0)); break; - default : + default : items = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.items)); } this.items = items; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder builder() { return new SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder, B extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder, SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder, SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl> { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderMethod.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithCustomBuilderMethod.Child build() { return new SuperBuilderWithCustomBuilderMethod.Child(this); } } @@ -108,7 +108,7 @@ private ChildBuilderImpl() { public static ChildBuilder builder() { return new ChildBuilderImpl().item("default item"); } - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java index b4edad5b84..73771675c4 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java @@ -1,18 +1,18 @@ import java.util.List; public class SuperBuilderWithDefaults { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithDefaults.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") long millis$value; - private @java.lang.SuppressWarnings("all") boolean millis$set; - private @java.lang.SuppressWarnings("all") N numberField$value; - private @java.lang.SuppressWarnings("all") boolean numberField$set; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithDefaults.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated long millis$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean millis$set; + private @java.lang.SuppressWarnings("all") @lombok.Generated N numberField$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean numberField$set; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B millis(final long millis) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B millis(final long millis) { this.millis$value = millis; millis$set = true; return self(); @@ -20,37 +20,37 @@ public ParentBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B numberField(final N numberField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B numberField(final N numberField) { this.numberField$value = numberField; numberField$set = true; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithDefaults.Parent.ParentBuilder(millis$value=" + this.millis$value) + ", numberField$value=") + this.numberField$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithDefaults.Parent.ParentBuilder, SuperBuilderWithDefaults.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithDefaults.Parent.ParentBuilder, SuperBuilderWithDefaults.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Parent build() { return new SuperBuilderWithDefaults.Parent(this); } } private @lombok.Builder.Default long millis; private @lombok.Builder.Default N numberField; - private static @java.lang.SuppressWarnings("all") long $default$millis() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated long $default$millis() { return System.currentTimeMillis(); } - private static @java.lang.SuppressWarnings("all") N $default$numberField() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated N $default$numberField() { return null; } - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder b) { super(); if (b.millis$set) this.millis = b.millis$value; @@ -61,54 +61,54 @@ private ParentBuilderImpl() { else this.numberField = SuperBuilderWithDefaults.Parent.$default$numberField(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Parent.ParentBuilder builder() { return new SuperBuilderWithDefaults.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double doubleField$value; - private @java.lang.SuppressWarnings("all") boolean doubleField$set; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double doubleField$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean doubleField$set; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B doubleField(final double doubleField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B doubleField(final double doubleField) { this.doubleField$value = doubleField; doubleField$set = true; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithDefaults.Child.ChildBuilder(super=" + super.toString()) + ", doubleField$value=") + this.doubleField$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithDefaults.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithDefaults.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Child build() { return new SuperBuilderWithDefaults.Child(this); } } private @lombok.Builder.Default double doubleField; - private static @java.lang.SuppressWarnings("all") double $default$doubleField() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated double $default$doubleField() { return Math.PI; } - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithDefaults.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithDefaults.Child.ChildBuilder b) { super(b); - if (b.doubleField$set) + if (b.doubleField$set) this.doubleField = b.doubleField$value; else this.doubleField = SuperBuilderWithDefaults.Child.$default$doubleField(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithDefaults.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaults.Child.ChildBuilder builder() { return new SuperBuilderWithDefaults.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java index d4744e9b3d..e5a7602e70 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaultsAndTargetTyping.java @@ -2,96 +2,96 @@ import lombok.Builder; public class SuperBuilderWithDefaultsAndTargetTyping { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") String foo$value; - private @java.lang.SuppressWarnings("all") boolean foo$set; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated String foo$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean foo$set; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B foo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foo(final String foo) { this.foo$value = foo; foo$set = true; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder(foo$value=" + this.foo$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Parent build() { return new SuperBuilderWithDefaultsAndTargetTyping.Parent(this); } } private @lombok.Builder.Default String foo; - private static @java.lang.SuppressWarnings("all") String $default$foo() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder b) { super(); if (b.foo$set) this.foo = b.foo$value; else this.foo = SuperBuilderWithDefaultsAndTargetTyping.Parent.$default$foo(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder builder() { return new SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") String foo$value; - private @java.lang.SuppressWarnings("all") boolean foo$set; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String foo$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean foo$set; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B foo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B foo(final String foo) { this.foo$value = foo; foo$set = true; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder(super=" + super.toString()) + ", foo$value=") + this.foo$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Child build() { return new SuperBuilderWithDefaultsAndTargetTyping.Child(this); } } private @lombok.Builder.Default String foo; - private static @java.lang.SuppressWarnings("all") String $default$foo() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder b) { super(b); if (b.foo$set) this.foo = b.foo$value; else this.foo = SuperBuilderWithDefaultsAndTargetTyping.Child.$default$foo(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder builder() { return new SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java b/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java index d42c3ca767..1d35434e07 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithExistingConstructor.java @@ -1,32 +1,32 @@ public @lombok.experimental.SuperBuilder class SuperBuilderWithExistingConstructor { - public static abstract @java.lang.SuppressWarnings("all") class SuperBuilderWithExistingConstructorBuilder> { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderWithExistingConstructorBuilder> { public SuperBuilderWithExistingConstructorBuilder() { super(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder()"; } } - private static final @java.lang.SuppressWarnings("all") class SuperBuilderWithExistingConstructorBuilderImpl extends SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderWithExistingConstructorBuilderImpl extends SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder { private SuperBuilderWithExistingConstructorBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstructor build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithExistingConstructor build() { return new SuperBuilderWithExistingConstructor(this); } } public SuperBuilderWithExistingConstructor() { super(); } - protected @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstructor(final SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithExistingConstructor(final SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder b) { super(); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder builder() { return new SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java index b8a4fab9d2..4c254905f5 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java @@ -1,26 +1,26 @@ import java.util.List; public class SuperBuilderWithGenerics { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithGenerics.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") A field1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenerics.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final A field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { this.field1 = field1; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -30,86 +30,86 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenerics.Parent.ParentBuilder(field1=" + this.field1) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithGenerics.Parent.ParentBuilder, SuperBuilderWithGenerics.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithGenerics.Parent.ParentBuilder, SuperBuilderWithGenerics.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Parent build() { return new SuperBuilderWithGenerics.Parent(this); } } A field1; @lombok.Singular List items; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder b) { super(); this.field1 = b.field1; java.util.List items; switch (((b.items == null) ? 0 : b.items.size())) { - case 0 : + case 0 : items = java.util.Collections.emptyList(); break; - case 1 : + case 1 : items = java.util.Collections.singletonList(b.items.get(0)); break; - default : + default : items = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.items)); } this.items = items; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder, B extends SuperBuilderWithGenerics.Child.ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithGenerics.Child.ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenerics.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithGenerics.Child.ChildBuilder, SuperBuilderWithGenerics.Child.ChildBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithGenerics.Child.ChildBuilder, SuperBuilderWithGenerics.Child.ChildBuilderImpl> { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Child build() { return new SuperBuilderWithGenerics.Child(this); } } double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithGenerics.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithGenerics.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics.Child.ChildBuilder builder() { return new SuperBuilderWithGenerics.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java index d42f9d199a..0a3f8c8413 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics2.java @@ -1,26 +1,26 @@ import java.util.List; public class SuperBuilderWithGenerics2 { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithGenerics2.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") A field1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenerics2.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final A field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { this.field1 = field1; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -30,86 +30,86 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenerics2.Parent.ParentBuilder(field1=" + this.field1) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithGenerics2.Parent.ParentBuilder, SuperBuilderWithGenerics2.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithGenerics2.Parent.ParentBuilder, SuperBuilderWithGenerics2.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Parent build() { return new SuperBuilderWithGenerics2.Parent(this); } } A field1; @lombok.Singular List items; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder b) { super(); this.field1 = b.field1; java.util.List items; switch (((b.items == null) ? 0 : b.items.size())) { - case 0 : + case 0 : items = java.util.Collections.emptyList(); break; - case 1 : + case 1 : items = java.util.Collections.singletonList(b.items.get(0)); break; - default : + default : items = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.items)); } this.items = items; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics2.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder(builderMethodName = "builder2") class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder, B extends SuperBuilderWithGenerics2.Child.ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") A field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithGenerics2.Child.ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final A field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final A field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenerics2.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithGenerics2.Child.ChildBuilder, SuperBuilderWithGenerics2.Child.ChildBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithGenerics2.Child.ChildBuilder, SuperBuilderWithGenerics2.Child.ChildBuilderImpl> { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Child build() { return new SuperBuilderWithGenerics2.Child(this); } } A field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithGenerics2.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithGenerics2.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics2.Child.ChildBuilder builder2() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics2.Child.ChildBuilder builder2() { return new SuperBuilderWithGenerics2.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java index 0b3698356e..0f3cf78867 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics3.java @@ -1,41 +1,41 @@ import java.util.List; public class SuperBuilderWithGenerics3 { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithGenerics3.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") String str; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenerics3.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated String str; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B str(final String str) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B str(final String str) { this.str = str; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithGenerics3.Parent.ParentBuilder(str=" + this.str) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithGenerics3.Parent.ParentBuilder, SuperBuilderWithGenerics3.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithGenerics3.Parent.ParentBuilder, SuperBuilderWithGenerics3.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Parent build() { return new SuperBuilderWithGenerics3.Parent(this); } } private final String str; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithGenerics3.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithGenerics3.Parent.ParentBuilder b) { super(); this.str = b.str; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics3.Parent.ParentBuilderImpl(); } } @@ -45,41 +45,41 @@ public SomeInnerStaticClass() { super(); } } - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenerics3.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithGenerics3.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithGenerics3.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Child build() { return new SuperBuilderWithGenerics3.Child(this); } } double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithGenerics3.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithGenerics3.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenerics3.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenerics3.Child.ChildBuilder builder() { return new SuperBuilderWithGenerics3.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java index e7d5dfae55..dba6c743b2 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java @@ -1,29 +1,29 @@ import java.util.Map; public class SuperBuilderWithGenericsAndToBuilder { public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder> { - private @java.lang.SuppressWarnings("all") A field1; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items$key; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items$value; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items$key; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items$value; public ParentBuilder() { super(); } - protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { b.field1(instance.field1); b.items(((instance.items == null) ? java.util.Collections.emptyMap() : instance.items)); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field1(final A field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { this.field1 = field1; return self(); } - public @java.lang.SuppressWarnings("all") B item(final Integer itemKey, final String itemValue) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final Integer itemKey, final String itemValue) { if ((this.items$key == null)) { this.items$key = new java.util.ArrayList(); @@ -33,7 +33,7 @@ public ParentBuilder() { this.items$value.add(itemValue); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Map items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Map items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -50,7 +50,7 @@ public ParentBuilder() { } return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items$key != null)) { this.items$key.clear(); @@ -58,37 +58,37 @@ public ParentBuilder() { } return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder(field1=" + this.field1) + ", items$key=") + this.items$key) + ", items$value=") + this.items$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder, SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder, SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl> { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Parent build() { return new SuperBuilderWithGenericsAndToBuilder.Parent(this); } } A field1; @lombok.Singular Map items; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { super(); this.field1 = b.field1; java.util.Map items; switch (((b.items$key == null) ? 0 : b.items$key.size())) { - case 0 : + case 0 : items = java.util.Collections.emptyMap(); break; - case 1 : + case 1 : items = java.util.Collections.singletonMap(b.items$key.get(0), b.items$value.get(0)); break; - default : + default : items = new java.util.LinkedHashMap(((b.items$key.size() < 0x40000000) ? ((1 + b.items$key.size()) + ((b.items$key.size() - 3) / 3)) : java.lang.Integer.MAX_VALUE)); for (int $i = 0;; ($i < b.items$key.size()); $i ++) items.put(b.items$key.get($i), b.items$value.get($i)); @@ -96,60 +96,60 @@ private ParentBuilderImpl() { } this.items = items; } - public @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Child instance, final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Child instance, final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { b.field3(instance.field3); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder, SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl> { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder, SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl> { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Child build() { return new SuperBuilderWithGenericsAndToBuilder.Child(this); } } double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder toBuilder() { return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder builder() { return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java index c71576499b..85410ccfc7 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java @@ -1,16 +1,16 @@ import java.util.List; public class SuperBuilderWithNonNull { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") String nonNullParentField$value; - private @java.lang.SuppressWarnings("all") boolean nonNullParentField$set; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated String nonNullParentField$value; + private @java.lang.SuppressWarnings("all") @lombok.Generated boolean nonNullParentField$set; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B nonNullParentField(final @lombok.NonNull String nonNullParentField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B nonNullParentField(final @lombok.NonNull String nonNullParentField) { if ((nonNullParentField == null)) { throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); @@ -19,28 +19,28 @@ public ParentBuilder() { nonNullParentField$set = true; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithNonNull.Parent.ParentBuilder(nonNullParentField$value=" + this.nonNullParentField$value) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithNonNull.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithNonNull.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Parent build() { return new SuperBuilderWithNonNull.Parent(this); } } final @lombok.NonNull @lombok.Builder.Default String nonNullParentField; - private static @java.lang.SuppressWarnings("all") String $default$nonNullParentField() { + private static @java.lang.SuppressWarnings("all") @lombok.Generated String $default$nonNullParentField() { return "default"; } - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithNonNull.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithNonNull.Parent.ParentBuilder b) { super(); if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField$value; @@ -51,20 +51,20 @@ private ParentBuilderImpl() { throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); } } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Parent.ParentBuilder builder() { return new SuperBuilderWithNonNull.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") String nonNullChildField; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String nonNullChildField; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B nonNullChildField(final @lombok.NonNull String nonNullChildField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B nonNullChildField(final @lombok.NonNull String nonNullChildField) { if ((nonNullChildField == null)) { throw new java.lang.NullPointerException("nonNullChildField is marked non-null but is null"); @@ -72,25 +72,25 @@ public ChildBuilder() { this.nonNullChildField = nonNullChildField; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithNonNull.Child.ChildBuilder(super=" + super.toString()) + ", nonNullChildField=") + this.nonNullChildField) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithNonNull.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithNonNull.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Child build() { return new SuperBuilderWithNonNull.Child(this); } } @lombok.NonNull String nonNullChildField; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithNonNull.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithNonNull.Child.ChildBuilder b) { super(b); this.nonNullChildField = b.nonNullChildField; if ((nonNullChildField == null)) @@ -98,7 +98,7 @@ private ChildBuilderImpl() { throw new java.lang.NullPointerException("nonNullChildField is marked non-null but is null"); } } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithNonNull.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithNonNull.Child.ChildBuilder builder() { return new SuperBuilderWithNonNull.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java b/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java index 1c5e25c2d9..3d2dffb45c 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithOverloadedGeneratedMethods.java @@ -1,79 +1,79 @@ public class SuperBuilderWithOverloadedGeneratedMethods { public static @lombok.experimental.SuperBuilder class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int self; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int self; public ParentBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B self(final int self) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B self(final int self) { this.self = self; return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder(self=" + this.self) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Parent build() { return new SuperBuilderWithOverloadedGeneratedMethods.Parent(this); } } int self; - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder b) { super(); this.self = b.self; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder builder() { return new SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double build; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double build; public ChildBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B build(final double build) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B build(final double build) { this.build = build; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder(super=" + super.toString()) + ", build=") + this.build) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Child build() { return new SuperBuilderWithOverloadedGeneratedMethods.Child(this); } } double build; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder b) { super(b); this.build = b.build; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder builder() { return new SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java b/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java index ec035ba1fb..ef266001b3 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithPrefixes.java @@ -1,32 +1,32 @@ @lombok.experimental.SuperBuilder class SuperBuilderWithPrefixes { - public static abstract @java.lang.SuppressWarnings("all") class SuperBuilderWithPrefixesBuilder> { - private @java.lang.SuppressWarnings("all") int field; - private @java.lang.SuppressWarnings("all") int otherField; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderWithPrefixesBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field; + private @java.lang.SuppressWarnings("all") @lombok.Generated int otherField; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public SuperBuilderWithPrefixesBuilder() { super(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B field(final int field) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B field(final int field) { this.field = field; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B otherField(final int otherField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B otherField(final int otherField) { this.otherField = otherField; return self(); } - public @java.lang.SuppressWarnings("all") B item(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B item(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B items(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B items(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -36,32 +36,32 @@ public SuperBuilderWithPrefixesBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder(field=" + this.field) + ", otherField=") + this.otherField) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class SuperBuilderWithPrefixesBuilderImpl extends SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class SuperBuilderWithPrefixesBuilderImpl extends SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder { private SuperBuilderWithPrefixesBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithPrefixes build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithPrefixes build() { return new SuperBuilderWithPrefixes(this); } } int mField; int xOtherField; @lombok.Singular java.util.List mItems; - protected @java.lang.SuppressWarnings("all") SuperBuilderWithPrefixes(final SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithPrefixes(final SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder b) { super(); this.mField = b.field; this.xOtherField = b.otherField; @@ -78,7 +78,7 @@ private SuperBuilderWithPrefixesBuilderImpl() { } this.mItems = items; } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder builder() { return new SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java index 9f13b7acbf..3742c8a452 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java @@ -1,20 +1,20 @@ import java.util.List; public class SuperBuilderWithSetterPrefix { public static @lombok.experimental.SuperBuilder(toBuilder = true,setterPrefix = "with") class Parent { - public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") int field1; - private @java.lang.SuppressWarnings("all") int obtainViaField; - private @java.lang.SuppressWarnings("all") int obtainViaMethod; - private @java.lang.SuppressWarnings("all") String obtainViaStaticMethod; - private @java.lang.SuppressWarnings("all") java.util.ArrayList items; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated int field1; + private @java.lang.SuppressWarnings("all") @lombok.Generated int obtainViaField; + private @java.lang.SuppressWarnings("all") @lombok.Generated int obtainViaMethod; + private @java.lang.SuppressWarnings("all") @lombok.Generated String obtainViaStaticMethod; + private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList items; public ParentBuilder() { super(); } - protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { SuperBuilderWithSetterPrefix.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Parent instance, final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Parent instance, final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { b.withField1(instance.field1); b.withObtainViaField(instance.field1); b.withObtainViaMethod(instance.method()); @@ -24,38 +24,38 @@ public ParentBuilder() { /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B withField1(final int field1) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withField1(final int field1) { this.field1 = field1; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B withObtainViaField(final int obtainViaField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withObtainViaField(final int obtainViaField) { this.obtainViaField = obtainViaField; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B withObtainViaMethod(final int obtainViaMethod) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withObtainViaMethod(final int obtainViaMethod) { this.obtainViaMethod = obtainViaMethod; return self(); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B withObtainViaStaticMethod(final String obtainViaStaticMethod) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withObtainViaStaticMethod(final String obtainViaStaticMethod) { this.obtainViaStaticMethod = obtainViaStaticMethod; return self(); } - public @java.lang.SuppressWarnings("all") B withItem(final String item) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withItem(final String item) { if ((this.items == null)) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - public @java.lang.SuppressWarnings("all") B withItems(final java.util.Collection items) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B withItems(final java.util.Collection items) { if ((items == null)) { throw new java.lang.NullPointerException("items cannot be null"); @@ -65,25 +65,25 @@ public ParentBuilder() { this.items.addAll(items); return self(); } - public @java.lang.SuppressWarnings("all") B clearItems() { + public @java.lang.SuppressWarnings("all") @lombok.Generated B clearItems() { if ((this.items != null)) this.items.clear(); return self(); } - protected abstract @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((("SuperBuilderWithSetterPrefix.Parent.ParentBuilder(field1=" + this.field1) + ", obtainViaField=") + this.obtainViaField) + ", obtainViaMethod=") + this.obtainViaMethod) + ", obtainViaStaticMethod=") + this.obtainViaStaticMethod) + ", items=") + this.items) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderWithSetterPrefix.Parent.ParentBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithSetterPrefix.Parent.ParentBuilder { private ParentBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Parent build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Parent build() { return new SuperBuilderWithSetterPrefix.Parent(this); } } @@ -98,7 +98,7 @@ private int method() { private static String staticMethod(Parent instance) { return "staticMethod"; } - protected @java.lang.SuppressWarnings("all") Parent(final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { super(); this.field1 = b.field1; this.obtainViaField = b.obtainViaField; @@ -117,60 +117,60 @@ private static String staticMethod(Parent instance) { } this.items = items; } - public @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Parent.ParentBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Parent.ParentBuilder toBuilder() { return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Parent.ParentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Parent.ParentBuilder builder() { return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl(); } } public static @lombok.experimental.SuperBuilder(toBuilder = true,setterPrefix = "set") class Child extends Parent { - public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double field3; + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; public ChildBuilder() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderWithSetterPrefix.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Child instance, final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { + private static @java.lang.SuppressWarnings("all") @lombok.Generated void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Child instance, final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { b.setField3(instance.field3); } /** * @return {@code this}. */ - public @java.lang.SuppressWarnings("all") B setField3(final double field3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated B setField3(final double field3) { this.field3 = field3; return self(); } - protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); - public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("SuperBuilderWithSetterPrefix.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); } } - private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends SuperBuilderWithSetterPrefix.Child.ChildBuilder { + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithSetterPrefix.Child.ChildBuilder { private ChildBuilderImpl() { super(); } - protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl self() { + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl self() { return this; } - public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Child build() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Child build() { return new SuperBuilderWithSetterPrefix.Child(this); } } private double field3; - protected @java.lang.SuppressWarnings("all") Child(final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } - public @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Child.ChildBuilder toBuilder() { + public @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Child.ChildBuilder toBuilder() { return new SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl().$fillValuesFrom(this); } - public static @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Child.ChildBuilder builder() { + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithSetterPrefix.Child.ChildBuilder builder() { return new SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl(); } } diff --git a/test/transform/resource/after-ecj/ToStringArray.java b/test/transform/resource/after-ecj/ToStringArray.java index e6e69c851c..0903ee43a5 100644 --- a/test/transform/resource/after-ecj/ToStringArray.java +++ b/test/transform/resource/after-ecj/ToStringArray.java @@ -6,7 +6,7 @@ public ToStringArray() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ToStringArray(primitiveArray=" + java.util.Arrays.toString(this.primitiveArray)) + ", objectArray=") + java.util.Arrays.deepToString(this.objectArray)) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringArrayTypeAnnotations.java b/test/transform/resource/after-ecj/ToStringArrayTypeAnnotations.java index ef3ed4c1aa..4050c12b4d 100644 --- a/test/transform/resource/after-ecj/ToStringArrayTypeAnnotations.java +++ b/test/transform/resource/after-ecj/ToStringArrayTypeAnnotations.java @@ -10,7 +10,7 @@ public ToStringArrayTypeAnnotations() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((("ToStringArrayTypeAnnotations(primitiveArray1=" + java.util.Arrays.toString(this.primitiveArray1)) + ", primitiveArray2=") + java.util.Arrays.toString(this.primitiveArray2)) + ", objectArray1=") + java.util.Arrays.deepToString(this.objectArray1)) + ", objectArray2=") + java.util.Arrays.deepToString(this.objectArray2)) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringAutoExclude.java b/test/transform/resource/after-ecj/ToStringAutoExclude.java index c25b5bfd96..a4c8ee795f 100644 --- a/test/transform/resource/after-ecj/ToStringAutoExclude.java +++ b/test/transform/resource/after-ecj/ToStringAutoExclude.java @@ -5,7 +5,7 @@ ToStringAutoExclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ToStringAutoExclude(x=" + this.x) + ", b=") + this.b) + ")"); } } @@ -16,7 +16,7 @@ ToStringAutoExclude2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("ToStringAutoExclude2(x=" + this.x) + ", $a=") + this.$a) + ", b=") + this.b) + ")"); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ToStringAutoSuper.java b/test/transform/resource/after-ecj/ToStringAutoSuper.java index fb468ddc08..d9b6651652 100644 --- a/test/transform/resource/after-ecj/ToStringAutoSuper.java +++ b/test/transform/resource/after-ecj/ToStringAutoSuper.java @@ -2,7 +2,7 @@ ToStringAutoSuperWithNoParent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "ToStringAutoSuperWithNoParent()"; } } @@ -10,7 +10,7 @@ ToStringAutoSuperWithParent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringAutoSuperWithParent(super=" + super.toString()) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringConfiguration.java b/test/transform/resource/after-ecj/ToStringConfiguration.java index 8bb99146ff..e81c925ccf 100644 --- a/test/transform/resource/after-ecj/ToStringConfiguration.java +++ b/test/transform/resource/after-ecj/ToStringConfiguration.java @@ -5,10 +5,10 @@ ToStringConfiguration() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration(" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } @@ -17,7 +17,7 @@ ToStringConfiguration2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration2(x=" + this.x) + ")"); } } @@ -26,10 +26,10 @@ ToStringConfiguration3() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration3(" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ToStringEnum.java b/test/transform/resource/after-ecj/ToStringEnum.java index d4ab5a93a4..1b9a745424 100644 --- a/test/transform/resource/after-ecj/ToStringEnum.java +++ b/test/transform/resource/after-ecj/ToStringEnum.java @@ -6,7 +6,7 @@ ToStringEnum1() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return ("ToStringEnum1." + this.name()); } } @@ -19,7 +19,7 @@ ToStringEnum2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("ToStringEnum2." + this.name()) + "(x=") + this.x) + ", name=") + this.name) + ")"); } } @@ -31,11 +31,11 @@ class ToStringEnum3 { MemberEnum() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return ("ToStringEnum3.MemberEnum." + this.name()); } } ToStringEnum3() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ToStringExplicitInclude.java b/test/transform/resource/after-ecj/ToStringExplicitInclude.java index adb3109e16..53a4c00a43 100644 --- a/test/transform/resource/after-ecj/ToStringExplicitInclude.java +++ b/test/transform/resource/after-ecj/ToStringExplicitInclude.java @@ -3,7 +3,7 @@ ToStringExplicitInclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "ToStringExplicitInclude()"; } } diff --git a/test/transform/resource/after-ecj/ToStringExplicitIncludeConf.java b/test/transform/resource/after-ecj/ToStringExplicitIncludeConf.java index a2b801c6bc..94f145feae 100644 --- a/test/transform/resource/after-ecj/ToStringExplicitIncludeConf.java +++ b/test/transform/resource/after-ecj/ToStringExplicitIncludeConf.java @@ -4,7 +4,7 @@ ToStringExplicitIncludeConf() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringExplicitIncludeConf(y=" + this.y) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringInAnonymousClass.java b/test/transform/resource/after-ecj/ToStringInAnonymousClass.java index 02ad2a88fe..20e7fbfeeb 100644 --- a/test/transform/resource/after-ecj/ToStringInAnonymousClass.java +++ b/test/transform/resource/after-ecj/ToStringInAnonymousClass.java @@ -6,7 +6,7 @@ public class ToStringInAnonymousClass { Inner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Inner(string=" + this.string) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringInner.java b/test/transform/resource/after-ecj/ToStringInner.java index a862482326..c3b5f13077 100644 --- a/test/transform/resource/after-ecj/ToStringInner.java +++ b/test/transform/resource/after-ecj/ToStringInner.java @@ -5,7 +5,7 @@ ToStringInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringInner(y=" + this.y) + ")"); } } @@ -14,7 +14,7 @@ ToStringStaticInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")"); } } @@ -24,7 +24,7 @@ class ToStringMiddle { ToStringMoreInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")"); } } @@ -37,7 +37,7 @@ class ToStringMiddle { ToStringOuter() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringNewStyle.java b/test/transform/resource/after-ecj/ToStringNewStyle.java index cdc6f5bcca..03e8279de0 100644 --- a/test/transform/resource/after-ecj/ToStringNewStyle.java +++ b/test/transform/resource/after-ecj/ToStringNewStyle.java @@ -14,7 +14,7 @@ public ToStringNewStyle() { @ToString.Include int f() { return 0; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((((((((((("ToStringNewStyle(a=" + this.b) + ", c=") + this.c) + ", e=") + this.d) + ", f=") + this.f()) + ", g=") + this.g) + ", i=") + this.i) + ", h=") + this.h) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringPlain.java b/test/transform/resource/after-ecj/ToStringPlain.java index 7c9b47f59d..fd9f0d4f94 100644 --- a/test/transform/resource/after-ecj/ToStringPlain.java +++ b/test/transform/resource/after-ecj/ToStringPlain.java @@ -5,7 +5,7 @@ ToString1() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ToString1(x=" + this.x) + ", name=") + this.name) + ")"); } } @@ -15,7 +15,7 @@ ToString2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ToString2(x=" + this.x) + ", name=") + this.name) + ")"); } } diff --git a/test/transform/resource/after-ecj/Tolerate.java b/test/transform/resource/after-ecj/Tolerate.java index fa3f862459..30969918ad 100644 --- a/test/transform/resource/after-ecj/Tolerate.java +++ b/test/transform/resource/after-ecj/Tolerate.java @@ -7,10 +7,10 @@ public @lombok.experimental.Tolerate void setPattern(String pattern) { setPattern(Pattern.compile(pattern)); } - public @java.lang.SuppressWarnings("all") void setPattern(final Pattern pattern) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setPattern(final Pattern pattern) { this.pattern = pattern; } - public @java.lang.SuppressWarnings("all") Pattern getPattern() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Pattern getPattern() { return this.pattern; } } @@ -22,16 +22,16 @@ public Tolerate2 withPattern(String nameGlob, String extensionGlob) { return withPattern(((nameGlob.replace("*", ".*") + "\\.") + extensionGlob.replace("*", ".*"))); } - public @java.lang.SuppressWarnings("all") Pattern getPattern() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Pattern getPattern() { return this.pattern; } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") Tolerate2 withPattern(final Pattern pattern) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Tolerate2 withPattern(final Pattern pattern) { return ((this.pattern == pattern) ? this : new Tolerate2(pattern)); } - public @java.lang.SuppressWarnings("all") Tolerate2(final Pattern pattern) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Tolerate2(final Pattern pattern) { super(); this.pattern = pattern; } diff --git a/test/transform/resource/after-ecj/TypeUseAnnotations.java b/test/transform/resource/after-ecj/TypeUseAnnotations.java index 7041b59efd..20f8a2c030 100644 --- a/test/transform/resource/after-ecj/TypeUseAnnotations.java +++ b/test/transform/resource/after-ecj/TypeUseAnnotations.java @@ -15,10 +15,10 @@ class Inner { TypeUseAnnotations() { super(); } - public @java.lang.SuppressWarnings("all") List<@TA(x = 5) String> getFoo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated List<@TA(x = 5) String> getFoo() { return this.foo; } - public @java.lang.SuppressWarnings("all") List getBar() { + public @java.lang.SuppressWarnings("all") @lombok.Generated List getBar() { return this.bar; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/UtilityClass.java b/test/transform/resource/after-ecj/UtilityClass.java index 1db3d5402a..db83c53c97 100644 --- a/test/transform/resource/after-ecj/UtilityClass.java +++ b/test/transform/resource/after-ecj/UtilityClass.java @@ -19,7 +19,7 @@ static void someMethod() { new InnerClass(); new InnerStaticClass(); } - private @java.lang.SuppressWarnings("all") UtilityClass() { + private @java.lang.SuppressWarnings("all") @lombok.Generated UtilityClass() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -30,7 +30,7 @@ static class InnerInner { static int member; () { } - private @java.lang.SuppressWarnings("all") InnerInnerInner() { + private @java.lang.SuppressWarnings("all") @lombok.Generated InnerInnerInner() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -44,7 +44,7 @@ enum UtilityInsideEnum { static int member; () { } - private @java.lang.SuppressWarnings("all") InsideEnum() { + private @java.lang.SuppressWarnings("all") @lombok.Generated InsideEnum() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -62,7 +62,7 @@ interface UtilityInsideInterface { static int member; () { } - private @java.lang.SuppressWarnings("all") InsideInterface() { + private @java.lang.SuppressWarnings("all") @lombok.Generated InsideInterface() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -71,4 +71,4 @@ interface UtilityInsideInterface { UtilityInner() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/UtilityClassGeneric.java b/test/transform/resource/after-ecj/UtilityClassGeneric.java index 2e163d24a3..d339a5faa7 100644 --- a/test/transform/resource/after-ecj/UtilityClassGeneric.java +++ b/test/transform/resource/after-ecj/UtilityClassGeneric.java @@ -14,7 +14,7 @@ static DTO convert(Object json) { static Object convert(DTO dto) { return null; } - private @java.lang.SuppressWarnings("all") UtilityClassGeneric() { + private @java.lang.SuppressWarnings("all") @lombok.Generated UtilityClassGeneric() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } diff --git a/test/transform/resource/after-ecj/UtilityClassInner.java b/test/transform/resource/after-ecj/UtilityClassInner.java index eebc5d135a..9086367cf8 100644 --- a/test/transform/resource/after-ecj/UtilityClassInner.java +++ b/test/transform/resource/after-ecj/UtilityClassInner.java @@ -1,6 +1,6 @@ class UtilityClassInner { static final @lombok.experimental.UtilityClass class UtilClass { - private @java.lang.SuppressWarnings("all") UtilClass() { + private @java.lang.SuppressWarnings("all") @lombok.Generated UtilClass() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -8,4 +8,4 @@ class UtilityClassInner { UtilityClassInner() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ValueCallSuper.java b/test/transform/resource/after-ecj/ValueCallSuper.java index 72422a4a9e..b004edf74e 100644 --- a/test/transform/resource/after-ecj/ValueCallSuper.java +++ b/test/transform/resource/after-ecj/ValueCallSuper.java @@ -4,7 +4,7 @@ class ValueParent { } } final @lombok.Value class ValueCallSuper extends ValueParent { - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueCallSuper))) @@ -16,17 +16,17 @@ class ValueParent { return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof ValueCallSuper); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = super.hashCode(); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "ValueCallSuper()"; } - public @java.lang.SuppressWarnings("all") ValueCallSuper() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ValueCallSuper() { super(); } } diff --git a/test/transform/resource/after-ecj/ValueInAnonymousClass.java b/test/transform/resource/after-ecj/ValueInAnonymousClass.java index 49cf8fc2f8..eb28b81e3e 100644 --- a/test/transform/resource/after-ecj/ValueInAnonymousClass.java +++ b/test/transform/resource/after-ecj/ValueInAnonymousClass.java @@ -3,10 +3,10 @@ public class ValueInAnonymousClass { Object annonymous = new Object() { final @Value class Inner { private final String string; - public @java.lang.SuppressWarnings("all") String getString() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getString() { return this.string; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Inner))) @@ -18,17 +18,17 @@ public class ValueInAnonymousClass { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $string = this.getString(); result = ((result * PRIME) + (($string == null) ? 43 : $string.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("Inner(string=" + this.getString()) + ")"); } - public @java.lang.SuppressWarnings("all") Inner(final String string) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner(final String string) { super(); this.string = string; } diff --git a/test/transform/resource/after-ecj/ValuePlain.java b/test/transform/resource/after-ecj/ValuePlain.java index 442a63ac9c..4b03937b95 100644 --- a/test/transform/resource/after-ecj/ValuePlain.java +++ b/test/transform/resource/after-ecj/ValuePlain.java @@ -2,13 +2,13 @@ final @lombok.Value class Value1 { private final int x; private final String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value1))) @@ -22,7 +22,7 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -30,10 +30,10 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Value1(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Value1(final int x, final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Value1(final int x, final String name) { super(); this.x = x; this.name = name; @@ -42,13 +42,13 @@ @Value @lombok.experimental.NonFinal class Value2 { public final int x; private final String name; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value2))) @@ -64,10 +64,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Value2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -75,10 +75,10 @@ result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Value2(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") Value2(final int x, final String name) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Value2(final int x, final String name) { super(); this.x = x; this.name = name; @@ -87,13 +87,13 @@ final @Value class Value3 { private @lombok.experimental.NonFinal int x; private final int y; - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") int getY() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getY() { return this.y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value3))) @@ -105,17 +105,17 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); result = ((result * PRIME) + this.getY()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("Value3(x=" + this.getX()) + ", y=") + this.getY()) + ")"); } - public @java.lang.SuppressWarnings("all") Value3(final int x, final int y) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Value3(final int x, final int y) { super(); this.x = x; this.y = y; diff --git a/test/transform/resource/after-ecj/ValueStaticConstructorOf.java b/test/transform/resource/after-ecj/ValueStaticConstructorOf.java index 878835660a..15d140d7a2 100644 --- a/test/transform/resource/after-ecj/ValueStaticConstructorOf.java +++ b/test/transform/resource/after-ecj/ValueStaticConstructorOf.java @@ -7,13 +7,13 @@ private ValueStaticConstructorOf(String name, Double price) { this.name = name; this.price = price; } - public @java.lang.SuppressWarnings("all") String getName() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") Double getPrice() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Double getPrice() { return this.price; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueStaticConstructorOf))) @@ -29,7 +29,7 @@ private ValueStaticConstructorOf(String name, Double price) { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $price = this.getPrice(); @@ -38,10 +38,10 @@ private ValueStaticConstructorOf(String name, Double price) { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("ValueStaticConstructorOf(name=" + this.getName()) + ", price=") + this.getPrice()) + ")"); } - public static @java.lang.SuppressWarnings("all") ValueStaticConstructorOf of(final String name, final Double price) { + public static @java.lang.SuppressWarnings("all") @lombok.Generated ValueStaticConstructorOf of(final String name, final Double price) { return new ValueStaticConstructorOf(name, price); } } diff --git a/test/transform/resource/after-ecj/ValueStaticField.java b/test/transform/resource/after-ecj/ValueStaticField.java index d1e74708b2..adbf620f73 100644 --- a/test/transform/resource/after-ecj/ValueStaticField.java +++ b/test/transform/resource/after-ecj/ValueStaticField.java @@ -4,21 +4,21 @@ static String PASSWORD = "Ken sent me"; () { } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueStaticField))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return "ValueStaticField()"; } - public @java.lang.SuppressWarnings("all") ValueStaticField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated ValueStaticField() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java index 8117dbb040..5be622c83a 100644 --- a/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-ecj/ValueWithJavaBeansSpecCapitalization.java @@ -1,9 +1,9 @@ final @lombok.Value class ValueWithJavaBeansSpecCapitalization { private final int aField; - public @java.lang.SuppressWarnings("all") int getaField() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getaField() { return this.aField; } - public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueWithJavaBeansSpecCapitalization))) @@ -13,16 +13,16 @@ return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getaField()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (("ValueWithJavaBeansSpecCapitalization(aField=" + this.getaField()) + ")"); } - public @java.lang.SuppressWarnings("all") ValueWithJavaBeansSpecCapitalization(final int aField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated ValueWithJavaBeansSpecCapitalization(final int aField) { super(); this.aField = aField; } diff --git a/test/transform/resource/after-ecj/WithAlreadyExists.java b/test/transform/resource/after-ecj/WithAlreadyExists.java index 9dbd6d8aa1..46ea5bb86c 100644 --- a/test/transform/resource/after-ecj/WithAlreadyExists.java +++ b/test/transform/resource/after-ecj/WithAlreadyExists.java @@ -40,7 +40,7 @@ void withFoo() { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") With5 withFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated With5 withFoo(final String foo) { return ((this.foo == foo) ? this : new With5(foo)); } } @@ -54,7 +54,7 @@ void withFoo(String foo, int x) { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") With6 withFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated With6 withFoo(final String foo) { return ((this.foo == foo) ? this : new With6(foo)); } } diff --git a/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java b/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java index 52a7f3a342..f27118379c 100644 --- a/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java +++ b/test/transform/resource/after-ecj/WithAndAllArgsConstructor.java @@ -7,16 +7,16 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor withTest(final J test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithAndAllArgsConstructor withTest(final J test) { return ((this.test == test) ? this : new WithAndAllArgsConstructor(test, this.test2, this.y, this.z)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor withTest2(final java.util.List test2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithAndAllArgsConstructor withTest2(final java.util.List test2) { return ((this.test2 == test2) ? this : new WithAndAllArgsConstructor(this.test, test2, this.y, this.z)); } - public @java.lang.SuppressWarnings("all") WithAndAllArgsConstructor(final J test, final java.util.List test2, final int y, final int z) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithAndAllArgsConstructor(final J test, final java.util.List test2, final int y, final int z) { super(); this.test = test; this.test2 = test2; diff --git a/test/transform/resource/after-ecj/WithByInAnonymousClass.java b/test/transform/resource/after-ecj/WithByInAnonymousClass.java index 1bc3e80c0a..4f9d7b7150 100644 --- a/test/transform/resource/after-ecj/WithByInAnonymousClass.java +++ b/test/transform/resource/after-ecj/WithByInAnonymousClass.java @@ -6,7 +6,7 @@ public class WithByInAnonymousClass { private Inner(String string) { super(); } - public @java.lang.SuppressWarnings("all") Inner withStringBy(final java.util.function.Function transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner withStringBy(final java.util.function.Function transformer) { return new Inner(transformer.apply(this.string)); } } diff --git a/test/transform/resource/after-ecj/WithByNullAnnos.java b/test/transform/resource/after-ecj/WithByNullAnnos.java index ff140192a3..4b731cc51e 100644 --- a/test/transform/resource/after-ecj/WithByNullAnnos.java +++ b/test/transform/resource/after-ecj/WithByNullAnnos.java @@ -1,11 +1,11 @@ import java.util.List; public @lombok.RequiredArgsConstructor class WithByNullAnnos { final @lombok.experimental.WithBy List test; - public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") WithByNullAnnos withTestBy(final java.util.function. @org.checkerframework.checker.nullness.qual.NonNull Function, ? extends List> transformer) { + public @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated WithByNullAnnos withTestBy(final java.util.function. @org.checkerframework.checker.nullness.qual.NonNull Function, ? extends List> transformer) { return new WithByNullAnnos(transformer.apply(this.test)); } - public @java.lang.SuppressWarnings("all") WithByNullAnnos(final List test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByNullAnnos(final List test) { super(); this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/WithByOnRecord.java b/test/transform/resource/after-ecj/WithByOnRecord.java index a6ec01fb09..a2363f3f22 100644 --- a/test/transform/resource/after-ecj/WithByOnRecord.java +++ b/test/transform/resource/after-ecj/WithByOnRecord.java @@ -3,10 +3,10 @@ public @WithBy record WithByOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - public @java.lang.SuppressWarnings("all") WithByOnRecord withABy(final java.util.function.Function transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByOnRecord withABy(final java.util.function.Function transformer) { return new WithByOnRecord(transformer.apply(this.a), this.b); } - public @java.lang.SuppressWarnings("all") WithByOnRecord withBBy(final java.util.function.Function transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByOnRecord withBBy(final java.util.function.Function transformer) { return new WithByOnRecord(this.a, transformer.apply(this.b)); } } diff --git a/test/transform/resource/after-ecj/WithByOnRecordComponent.java b/test/transform/resource/after-ecj/WithByOnRecordComponent.java index 5502eb062d..4d3fc72fb3 100644 --- a/test/transform/resource/after-ecj/WithByOnRecordComponent.java +++ b/test/transform/resource/after-ecj/WithByOnRecordComponent.java @@ -3,7 +3,7 @@ public record WithByOnRecordComponent(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - public @java.lang.SuppressWarnings("all") WithByOnRecordComponent withABy(final java.util.function.Function transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByOnRecordComponent withABy(final java.util.function.Function transformer) { return new WithByOnRecordComponent(transformer.apply(this.a), this.b); } } diff --git a/test/transform/resource/after-ecj/WithByTypes.java b/test/transform/resource/after-ecj/WithByTypes.java index b997ffba8d..15cb2dca09 100644 --- a/test/transform/resource/after-ecj/WithByTypes.java +++ b/test/transform/resource/after-ecj/WithByTypes.java @@ -11,7 +11,7 @@ public static void example() { new WithByTypes(0, 0, (short) 0, ' ', (byte) 0, 0.0, 0.0F, true, "").withHBy(( x) -> (! x)).withFBy(( x) -> (x + 0.5)); } - public @java.lang.SuppressWarnings("all") WithByTypes(final int a, final long b, final short c, final char d, final byte e, final double f, final float g, final boolean h, final T i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes(final int a, final long b, final short c, final char d, final byte e, final double f, final float g, final boolean h, final T i) { super(); this.a = a; this.b = b; @@ -23,31 +23,31 @@ public static void example() { this.h = h; this.i = i; } - public @java.lang.SuppressWarnings("all") WithByTypes withABy(final java.util.function.IntUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withABy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(transformer.applyAsInt(this.a), this.b, this.c, this.d, this.e, this.f, this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withBBy(final java.util.function.LongUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withBBy(final java.util.function.LongUnaryOperator transformer) { return new WithByTypes(this.a, transformer.applyAsLong(this.b), this.c, this.d, this.e, this.f, this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withCBy(final java.util.function.IntUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withCBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, (short) transformer.applyAsInt(this.c), this.d, this.e, this.f, this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withDBy(final java.util.function.IntUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withDBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, (char) transformer.applyAsInt(this.d), this.e, this.f, this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withEBy(final java.util.function.IntUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withEBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, (byte) transformer.applyAsInt(this.e), this.f, this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withFBy(final java.util.function.DoubleUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withFBy(final java.util.function.DoubleUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, transformer.applyAsDouble(this.f), this.g, this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withGBy(final java.util.function.DoubleUnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withGBy(final java.util.function.DoubleUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, (float) transformer.applyAsDouble(this.g), this.h, this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withHBy(final java.util.function.UnaryOperator transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withHBy(final java.util.function.UnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, this.g, transformer.apply(this.h), this.i); } - public @java.lang.SuppressWarnings("all") WithByTypes withIBy(final java.util.function.Function transformer) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithByTypes withIBy(final java.util.function.Function transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, this.g, this.h, transformer.apply(this.i)); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/WithInAnonymousClass.java b/test/transform/resource/after-ecj/WithInAnonymousClass.java index fef9602280..8a6db1debd 100644 --- a/test/transform/resource/after-ecj/WithInAnonymousClass.java +++ b/test/transform/resource/after-ecj/WithInAnonymousClass.java @@ -9,7 +9,7 @@ private Inner(String string) { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") Inner withString(final String string) { + public @java.lang.SuppressWarnings("all") @lombok.Generated Inner withString(final String string) { return ((this.string == string) ? this : new Inner(string)); } } diff --git a/test/transform/resource/after-ecj/WithMethodAbstract.java b/test/transform/resource/after-ecj/WithMethodAbstract.java index e0b14fc206..324b5011b4 100644 --- a/test/transform/resource/after-ecj/WithMethodAbstract.java +++ b/test/transform/resource/after-ecj/WithMethodAbstract.java @@ -6,5 +6,5 @@ abstract class WithMethodAbstract { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public abstract @java.lang.SuppressWarnings("all") WithMethodAbstract withFoo(final String foo); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated WithMethodAbstract withFoo(final String foo); } diff --git a/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java b/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java index d5f2bbcc40..8cd97772b0 100644 --- a/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java +++ b/test/transform/resource/after-ecj/WithMethodMarkedDeprecated.java @@ -8,14 +8,14 @@ class WithMethodMarkedDeprecated { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WithMethodMarkedDeprecated withAnnotation(final int annotation) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated WithMethodMarkedDeprecated withAnnotation(final int annotation) { return ((this.annotation == annotation) ? this : new WithMethodMarkedDeprecated(annotation, this.javadoc)); } /** * @deprecated * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WithMethodMarkedDeprecated withJavadoc(final int javadoc) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated WithMethodMarkedDeprecated withJavadoc(final int javadoc) { return ((this.javadoc == javadoc) ? this : new WithMethodMarkedDeprecated(this.annotation, javadoc)); } } diff --git a/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java b/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java index d4604af52b..7805bcb20b 100644 --- a/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java +++ b/test/transform/resource/after-ecj/WithMethodMarkedDeprecatedAnnOnly.java @@ -7,8 +7,7 @@ class WithMethodMarkedDeprecatedAnnOnly { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WithMethodMarkedDeprecatedAnnOnly withAnnotation(final int annotation) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated WithMethodMarkedDeprecatedAnnOnly withAnnotation(final int annotation) { return ((this.annotation == annotation) ? this : new WithMethodMarkedDeprecatedAnnOnly(annotation)); } } - diff --git a/test/transform/resource/after-ecj/WithNested.java b/test/transform/resource/after-ecj/WithNested.java index 25a8bcedd5..9ce69f37aa 100644 --- a/test/transform/resource/after-ecj/WithNested.java +++ b/test/transform/resource/after-ecj/WithNested.java @@ -4,10 +4,10 @@ public interface WithNested { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithNested.IAmStaticReally withX(final String x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithNested.IAmStaticReally withX(final String x) { return ((this.x == x) ? this : new WithNested.IAmStaticReally(x)); } - public @java.lang.SuppressWarnings("all") IAmStaticReally(final String x) { + public @java.lang.SuppressWarnings("all") @lombok.Generated IAmStaticReally(final String x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/WithOnClass.java b/test/transform/resource/after-ecj/WithOnClass.java index 1c635fcee0..2483fc585d 100644 --- a/test/transform/resource/after-ecj/WithOnClass.java +++ b/test/transform/resource/after-ecj/WithOnClass.java @@ -7,7 +7,7 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnClass1 withPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass1 withPublic(final boolean isPublic) { return ((this.isPublic == isPublic) ? this : new WithOnClass1(this.isNone, isPublic)); } } @@ -21,13 +21,13 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - @java.lang.SuppressWarnings("all") WithOnClass2 withPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass2 withPackage(final boolean isPackage) { return ((this.isPackage == isPackage) ? this : new WithOnClass2(this.isNone, this.isProtected, isPackage)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - protected @java.lang.SuppressWarnings("all") WithOnClass2 withProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass2 withProtected(final boolean isProtected) { return ((this.isProtected == isProtected) ? this : new WithOnClass2(this.isNone, isProtected, this.isPackage)); } } @@ -40,13 +40,13 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnClass3 withCouldBeNull(final String couldBeNull) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass3 withCouldBeNull(final String couldBeNull) { return ((this.couldBeNull == couldBeNull) ? this : new WithOnClass3(couldBeNull, this.nonNull)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnClass3 withNonNull(final @lombok.NonNull String nonNull) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass3 withNonNull(final @lombok.NonNull String nonNull) { if ((nonNull == null)) { throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); @@ -64,7 +64,7 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnClass4 withY(final int fY) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnClass4 withY(final int fY) { return ((this.fY == fY) ? this : new WithOnClass4(fY)); } } diff --git a/test/transform/resource/after-ecj/WithOnNestedRecord.java b/test/transform/resource/after-ecj/WithOnNestedRecord.java index a83ac94cc9..ecd76658b8 100644 --- a/test/transform/resource/after-ecj/WithOnNestedRecord.java +++ b/test/transform/resource/after-ecj/WithOnNestedRecord.java @@ -3,17 +3,16 @@ public record WithOnNestedRecord() { public @With record Nested(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnNestedRecord.Nested withA(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnNestedRecord.Nested withA(final String a) { return ((this.a == a) ? this : new WithOnNestedRecord.Nested(a, this.b)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnNestedRecord.Nested withB(final String b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnNestedRecord.Nested withB(final String b) { return ((this.b == b) ? this : new WithOnNestedRecord.Nested(this.a, b)); } } diff --git a/test/transform/resource/after-ecj/WithOnRecord.java b/test/transform/resource/after-ecj/WithOnRecord.java index 1b34e661ac..b8bf738ebf 100644 --- a/test/transform/resource/after-ecj/WithOnRecord.java +++ b/test/transform/resource/after-ecj/WithOnRecord.java @@ -6,13 +6,13 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnRecord withA(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnRecord withA(final String a) { return ((this.a == a) ? this : new WithOnRecord(a, this.b)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnRecord withB(final String b) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnRecord withB(final String b) { return ((this.b == b) ? this : new WithOnRecord(this.a, b)); } } diff --git a/test/transform/resource/after-ecj/WithOnRecordComponent.java b/test/transform/resource/after-ecj/WithOnRecordComponent.java index 7d210a0adf..49c052571c 100644 --- a/test/transform/resource/after-ecj/WithOnRecordComponent.java +++ b/test/transform/resource/after-ecj/WithOnRecordComponent.java @@ -6,7 +6,7 @@ public record WithOnRecordComponent(String a, String b) { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithOnRecordComponent withA(final String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithOnRecordComponent withA(final String a) { return ((this.a == a) ? this : new WithOnRecordComponent(a, this.b)); } } diff --git a/test/transform/resource/after-ecj/WithPlain.java b/test/transform/resource/after-ecj/WithPlain.java index 9f888abe48..7f6f77f9d8 100644 --- a/test/transform/resource/after-ecj/WithPlain.java +++ b/test/transform/resource/after-ecj/WithPlain.java @@ -10,13 +10,13 @@ class WithPlain { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") WithPlain withI(final int i) { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated WithPlain withI(final int i) { return ((this.i == i) ? this : new WithPlain(i, this.foo)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") WithPlain withFoo(final int foo) { + public @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") @lombok.Generated WithPlain withFoo(final int foo) { return ((this.foo == foo) ? this : new WithPlain(this.i, foo)); } } diff --git a/test/transform/resource/after-ecj/WithWithGenerics.java b/test/transform/resource/after-ecj/WithWithGenerics.java index 98b1809297..c971c656f6 100644 --- a/test/transform/resource/after-ecj/WithWithGenerics.java +++ b/test/transform/resource/after-ecj/WithWithGenerics.java @@ -9,19 +9,19 @@ public WithWithGenerics(J test, java.util.List test2, java.util.List withTest(final J test) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithWithGenerics withTest(final J test) { return ((this.test == test) ? this : new WithWithGenerics(test, this.test2, this.test3)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithWithGenerics withTest2(final java.util.List test2) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithWithGenerics withTest2(final java.util.List test2) { return ((this.test2 == test2) ? this : new WithWithGenerics(this.test, test2, this.test3)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithWithGenerics withTest3(final java.util.List test3) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithWithGenerics withTest3(final java.util.List test3) { return ((this.test3 == test3) ? this : new WithWithGenerics(this.test, this.test2, test3)); } } diff --git a/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java index fb035da4a3..1f4e152fed 100644 --- a/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-ecj/WithWithJavaBeansSpecCapitalization.java @@ -6,7 +6,7 @@ /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithWithJavaBeansSpecCapitalization withaField(final int aField) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithWithJavaBeansSpecCapitalization withaField(final int aField) { return ((this.aField == aField) ? this : new WithWithJavaBeansSpecCapitalization(aField)); } } diff --git a/test/transform/resource/after-ecj/WithWithTypeAnnos.java b/test/transform/resource/after-ecj/WithWithTypeAnnos.java index 8f1b3f6972..5b1f498e81 100644 --- a/test/transform/resource/after-ecj/WithWithTypeAnnos.java +++ b/test/transform/resource/after-ecj/WithWithTypeAnnos.java @@ -15,7 +15,7 @@ class WithWithTypeAnnos { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WithWithTypeAnnos withFoo(final @TA List foo) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WithWithTypeAnnos withFoo(final @TA List foo) { return ((this.foo == foo) ? this : new WithWithTypeAnnos(foo)); } } diff --git a/test/transform/resource/after-ecj/WitherAccessLevel.java b/test/transform/resource/after-ecj/WitherAccessLevel.java index b6457534b8..b0610a1157 100644 --- a/test/transform/resource/after-ecj/WitherAccessLevel.java +++ b/test/transform/resource/after-ecj/WitherAccessLevel.java @@ -12,31 +12,31 @@ class WitherAccessLevel { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - private @java.lang.SuppressWarnings("all") WitherAccessLevel withPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @lombok.Generated WitherAccessLevel withPrivate(final boolean isPrivate) { return ((this.isPrivate == isPrivate) ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - @java.lang.SuppressWarnings("all") WitherAccessLevel withPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @lombok.Generated WitherAccessLevel withPackage(final boolean isPackage) { return ((this.isPackage == isPackage) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - protected @java.lang.SuppressWarnings("all") WitherAccessLevel withProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @lombok.Generated WitherAccessLevel withProtected(final boolean isProtected) { return ((this.isProtected == isProtected) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WitherAccessLevel withPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WitherAccessLevel withPublic(final boolean isPublic) { return ((this.isPublic == isPublic) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value)); } /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WitherAccessLevel withValue(final boolean value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WitherAccessLevel withValue(final boolean value) { return ((this.value == value) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value)); } } diff --git a/test/transform/resource/after-ecj/WitherLegacyStar.java b/test/transform/resource/after-ecj/WitherLegacyStar.java index 2b9ebe79c9..45faa5d1e8 100644 --- a/test/transform/resource/after-ecj/WitherLegacyStar.java +++ b/test/transform/resource/after-ecj/WitherLegacyStar.java @@ -8,7 +8,7 @@ class WitherLegacyStar { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ - public @java.lang.SuppressWarnings("all") WitherLegacyStar withI(final int i) { + public @java.lang.SuppressWarnings("all") @lombok.Generated WitherLegacyStar withI(final int i) { return ((this.i == i) ? this : new WitherLegacyStar(i)); } -} \ No newline at end of file +} diff --git a/test/transform/resource/before/GeneratedJavaxOff.java b/test/transform/resource/before/GeneratedJavaxOff.java deleted file mode 100644 index db7ee0d130..0000000000 --- a/test/transform/resource/before/GeneratedJavaxOff.java +++ /dev/null @@ -1,5 +0,0 @@ -//CONF: lombok.addJavaxGeneratedAnnotation = false -class GeneratedJavaxOff { - @lombok.Getter - int x; -} diff --git a/test/transform/resource/before/GeneratedJavaxOffLombokOff.java b/test/transform/resource/before/GeneratedJavaxOffLombokOff.java new file mode 100644 index 0000000000..0d0a36e970 --- /dev/null +++ b/test/transform/resource/before/GeneratedJavaxOffLombokOff.java @@ -0,0 +1,6 @@ +//CONF: lombok.addJavaxGeneratedAnnotation = false +//CONF: lombok.addLombokGeneratedAnnotation = false +class GeneratedJavaxOffLombokOff { + @lombok.Getter + int x; +} From 0065d06b6ef89f12b19ad5f95270cc252850eb16 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:27:13 +0200 Subject: [PATCH 044/118] [tests] Continue with adjusting tests to reflect `lombok.Generated` defaulted: eclipse usually skipped tests. --- .../resource/after-ecj/DelegateGenerics.java | 6 +++--- .../resource/after-ecj/DelegateOnGetter.java | 6 +++--- .../after-ecj/DelegateOnGetterNone.java | 4 ++-- .../resource/after-ecj/DelegateOnMethods.java | 2 +- .../after-ecj/DelegateTypesAndExcludes.java | 4 ++-- .../after-ecj/DelegateWithDeprecated.java | 6 +++--- .../after-ecj/DelegateWithVarargs.java | 8 ++++---- .../after-ecj/DelegateWithVarargs2.java | 2 +- .../after-ecj/LoggerFloggerRecord.java | 2 +- .../resource/after-ecj/MixGetterVal.java | 2 +- .../resource/after-ecj/OnXJava7Style.java | 18 +++++++++--------- .../resource/after-ecj/OnXJava8StyleOn7.java | 18 +++++++++--------- .../after-ecj/TrickyTypeResolution.java | 2 +- .../after-ecj/ValDelegateMethodReference.java | 16 ++++++++-------- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/test/transform/resource/after-ecj/DelegateGenerics.java b/test/transform/resource/after-ecj/DelegateGenerics.java index 97b05102a7..72819c962d 100644 --- a/test/transform/resource/after-ecj/DelegateGenerics.java +++ b/test/transform/resource/after-ecj/DelegateGenerics.java @@ -3,13 +3,13 @@ public class DelegateGenerics { public DelegateGenerics() { super(); } - public @java.lang.SuppressWarnings("all") T a(final T a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated T a(final T a) { return this.target.a(a); } - public @java.lang.SuppressWarnings("all") java.lang.String i(final java.lang.String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String i(final java.lang.String a) { return this.target.i(a); } - public @java.lang.SuppressWarnings("all") java.lang.Integer t(final java.lang.Integer t) { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Integer t(final java.lang.Integer t) { return this.target.t(t); } } diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java index c23ea91709..5378257a6d 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetter.java +++ b/test/transform/resource/after-ecj/DelegateOnGetter.java @@ -9,7 +9,7 @@ private interface Bar { DelegateOnGetter() { super(); } - public @Delegate @java.lang.SuppressWarnings({"all", "unchecked"}) Bar getBar() { + public @Delegate @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated Bar getBar() { java.lang.Object $value = this.bar.get(); if (($value == null)) { @@ -35,10 +35,10 @@ public int getInt() { } return (Bar) (($value == this.bar) ? null : $value); } - public @java.lang.SuppressWarnings("all") int getInt() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getInt() { return this.getBar().getInt(); } - public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setList(final java.util.ArrayList list) { this.getBar().setList(list); } } diff --git a/test/transform/resource/after-ecj/DelegateOnGetterNone.java b/test/transform/resource/after-ecj/DelegateOnGetterNone.java index 0cfb02c0ed..79cc34e846 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetterNone.java +++ b/test/transform/resource/after-ecj/DelegateOnGetterNone.java @@ -10,10 +10,10 @@ private interface Bar { DelegateOnGetterNone() { super(); } - public @java.lang.SuppressWarnings("all") int getInt() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getInt() { return this.bar.getInt(); } - public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setList(final java.util.ArrayList list) { this.bar.setList(list); } } diff --git a/test/transform/resource/after-ecj/DelegateOnMethods.java b/test/transform/resource/after-ecj/DelegateOnMethods.java index 6560657ce4..2b45bb09b6 100644 --- a/test/transform/resource/after-ecj/DelegateOnMethods.java +++ b/test/transform/resource/after-ecj/DelegateOnMethods.java @@ -7,7 +7,7 @@ public static interface Bar { super(); } public abstract @Delegate Bar getBar(); - public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void bar(final java.util.ArrayList list) { this.getBar().bar(list); } } diff --git a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java index 86f54139c8..096b662f43 100644 --- a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java +++ b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java @@ -27,10 +27,10 @@ private static interface Bar { DelegatePlain() { super(); } - public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void bar(final java.util.ArrayList list) { this.bar.bar(list); } - public @java.lang.SuppressWarnings("all") void foo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated void foo() { this.foo.foo(); } } diff --git a/test/transform/resource/after-ecj/DelegateWithDeprecated.java b/test/transform/resource/after-ecj/DelegateWithDeprecated.java index 71eb788935..6f789d48c1 100644 --- a/test/transform/resource/after-ecj/DelegateWithDeprecated.java +++ b/test/transform/resource/after-ecj/DelegateWithDeprecated.java @@ -9,13 +9,13 @@ private interface Bar { DelegateWithDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void deprecatedAnnotation() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void deprecatedAnnotation() { this.bar.deprecatedAnnotation(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void deprecatedComment() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void deprecatedComment() { this.bar.deprecatedComment(); } - public @java.lang.SuppressWarnings("all") void notDeprecated() { + public @java.lang.SuppressWarnings("all") @lombok.Generated void notDeprecated() { this.bar.notDeprecated(); } } diff --git a/test/transform/resource/after-ecj/DelegateWithVarargs.java b/test/transform/resource/after-ecj/DelegateWithVarargs.java index 71a0ca5a5e..83ae59a5f8 100644 --- a/test/transform/resource/after-ecj/DelegateWithVarargs.java +++ b/test/transform/resource/after-ecj/DelegateWithVarargs.java @@ -10,16 +10,16 @@ private interface Bar { DelegateWithVarargs() { super(); } - public @java.lang.SuppressWarnings("all") void array(final int[] array) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void array(final int[] array) { this.bar.array(array); } - public @java.lang.SuppressWarnings("all") void arrayVarargs(final int[]... arrayVarargs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void arrayVarargs(final int[]... arrayVarargs) { this.bar.arrayVarargs(arrayVarargs); } - public @java.lang.SuppressWarnings("all") void justOneParameter(final int... varargs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void justOneParameter(final int... varargs) { this.bar.justOneParameter(varargs); } - public @java.lang.SuppressWarnings("all") void multipleParameters(final java.lang.String first, final int... varargs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void multipleParameters(final java.lang.String first, final int... varargs) { this.bar.multipleParameters(first, varargs); } } diff --git a/test/transform/resource/after-ecj/DelegateWithVarargs2.java b/test/transform/resource/after-ecj/DelegateWithVarargs2.java index ed0cddf532..444f8a54b4 100644 --- a/test/transform/resource/after-ecj/DelegateWithVarargs2.java +++ b/test/transform/resource/after-ecj/DelegateWithVarargs2.java @@ -11,7 +11,7 @@ public void varargs(Object[]... keys) { DelegateWithVarargs2() { super(); } - public @java.lang.SuppressWarnings("all") void varargs(final java.lang.Object[]... keys) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void varargs(final java.lang.Object[]... keys) { this.bar.varargs(keys); } } diff --git a/test/transform/resource/after-ecj/LoggerFloggerRecord.java b/test/transform/resource/after-ecj/LoggerFloggerRecord.java index 7db8aabebb..47bf4cc6e6 100644 --- a/test/transform/resource/after-ecj/LoggerFloggerRecord.java +++ b/test/transform/resource/after-ecj/LoggerFloggerRecord.java @@ -3,7 +3,7 @@ class LoggerFloggerRecord { public @Flogger record Inner(String x) { /* Implicit */ private final String x; - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } } diff --git a/test/transform/resource/after-ecj/MixGetterVal.java b/test/transform/resource/after-ecj/MixGetterVal.java index d980970320..82d061ed6f 100644 --- a/test/transform/resource/after-ecj/MixGetterVal.java +++ b/test/transform/resource/after-ecj/MixGetterVal.java @@ -13,7 +13,7 @@ public void test() { final @val int a = getX(); m(a); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/OnXJava7Style.java b/test/transform/resource/after-ecj/OnXJava7Style.java index b38c2c906d..0bdb304655 100644 --- a/test/transform/resource/after-ecj/OnXJava7Style.java +++ b/test/transform/resource/after-ecj/OnXJava7Style.java @@ -20,31 +20,31 @@ public class OnXJava7Style { public OnXJava7Style() { super(); } - public @Foo @java.lang.SuppressWarnings("all") String getA() { + public @Foo @java.lang.SuppressWarnings("all") @lombok.Generated String getA() { return this.a; } - public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) { + public @Foo() @java.lang.SuppressWarnings("all") @lombok.Generated void setB(final String b) { this.b = b; } - public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setC(final @Foo("a") String c) { this.c = c; } - public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setD(final @Bar(stuff = "b") String d) { this.d = d; } - public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() { + public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @lombok.Generated String getE() { return this.e; } - public @Array @java.lang.SuppressWarnings("all") String getF() { + public @Array @java.lang.SuppressWarnings("all") @lombok.Generated String getF() { return this.f; } - public @Array() @java.lang.SuppressWarnings("all") String getG() { + public @Array() @java.lang.SuppressWarnings("all") @lombok.Generated String getG() { return this.g; } - public @Array({}) @java.lang.SuppressWarnings("all") String getH() { + public @Array({}) @java.lang.SuppressWarnings("all") @lombok.Generated String getH() { return this.h; } - public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") String getI() { + public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") @lombok.Generated String getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/OnXJava8StyleOn7.java b/test/transform/resource/after-ecj/OnXJava8StyleOn7.java index 109d975a62..6836e45df7 100644 --- a/test/transform/resource/after-ecj/OnXJava8StyleOn7.java +++ b/test/transform/resource/after-ecj/OnXJava8StyleOn7.java @@ -20,31 +20,31 @@ public class OnXJava8StyleOn7 { public OnXJava8StyleOn7() { super(); } - public @Foo @java.lang.SuppressWarnings("all") String getA() { + public @Foo @java.lang.SuppressWarnings("all") @lombok.Generated String getA() { return this.a; } - public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) { + public @Foo() @java.lang.SuppressWarnings("all") @lombok.Generated void setB(final String b) { this.b = b; } - public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setC(final @Foo("a") String c) { this.c = c; } - public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setD(final @Bar(stuff = "b") String d) { this.d = d; } - public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() { + public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @lombok.Generated String getE() { return this.e; } - public @Array @java.lang.SuppressWarnings("all") String getF() { + public @Array @java.lang.SuppressWarnings("all") @lombok.Generated String getF() { return this.f; } - public @Array() @java.lang.SuppressWarnings("all") String getG() { + public @Array() @java.lang.SuppressWarnings("all") @lombok.Generated String getG() { return this.g; } - public @Array({}) @java.lang.SuppressWarnings("all") String getH() { + public @Array({}) @java.lang.SuppressWarnings("all") @lombok.Generated String getH() { return this.h; } - public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") String getI() { + public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") @lombok.Generated String getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/TrickyTypeResolution.java b/test/transform/resource/after-ecj/TrickyTypeResolution.java index 4553aabac9..67bab8b787 100644 --- a/test/transform/resource/after-ecj/TrickyTypeResolution.java +++ b/test/transform/resource/after-ecj/TrickyTypeResolution.java @@ -20,7 +20,7 @@ class TrickySuccess { TrickySuccess() { super(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/ValDelegateMethodReference.java b/test/transform/resource/after-ecj/ValDelegateMethodReference.java index cfd0dab2bf..bcc54e268d 100644 --- a/test/transform/resource/after-ecj/ValDelegateMethodReference.java +++ b/test/transform/resource/after-ecj/ValDelegateMethodReference.java @@ -24,16 +24,16 @@ class Entity { Entity() { super(); } - public @java.lang.SuppressWarnings("all") java.lang.Boolean getABoolean() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Boolean getABoolean() { return this.innerDelegate.getABoolean(); } - public @java.lang.SuppressWarnings("all") java.lang.String getValue() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String getValue() { return this.innerDelegate.getValue(); } - public @java.lang.SuppressWarnings("all") void setABoolean(final java.lang.Boolean aBoolean) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setABoolean(final java.lang.Boolean aBoolean) { this.innerDelegate.setABoolean(aBoolean); } - public @java.lang.SuppressWarnings("all") void setValue(final java.lang.String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setValue(final java.lang.String value) { this.innerDelegate.setValue(value); } } @@ -43,16 +43,16 @@ class Entity { MyDelegate() { super(); } - public @java.lang.SuppressWarnings("all") String getValue() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getValue() { return this.value; } - public @java.lang.SuppressWarnings("all") Boolean getABoolean() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Boolean getABoolean() { return this.aBoolean; } - public @java.lang.SuppressWarnings("all") void setValue(final String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setValue(final String value) { this.value = value; } - public @java.lang.SuppressWarnings("all") void setABoolean(final Boolean aBoolean) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setABoolean(final Boolean aBoolean) { this.aBoolean = aBoolean; } } From 4c3746bb46fa3029b0137bf8fff3c91e24743a65 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:38:49 +0200 Subject: [PATCH 045/118] [tests] This seemingly humongous commit is actually nothing: All test-cases now have `@Generated` annotations where before they did not. --- .../resource/after-delombok/Accessors.java | 16 ++++ .../after-delombok/AccessorsCascade.java | 6 +- .../AccessorsConfiguration.java | 4 + .../AccessorsInAnonymousClass.java | 5 +- .../after-delombok/AccessorsMakeFinal.java | 3 +- .../AccessorsMakeFinalLombokConfig.java | 3 +- .../AccessorsNoParamWarning.java | 4 +- .../BuilderAccessWithGetter.java | 18 ++--- .../after-delombok/BuilderComplex.java | 13 ++++ .../BuilderConstructorJavadoc.java | 23 +++--- .../after-delombok/BuilderDefaults.java | 24 +++++- .../after-delombok/BuilderDefaultsArray.java | 26 ++++--- .../BuilderDefaultsGenerics.java | 18 +++++ .../BuilderDefaultsTargetTyping.java | 21 +++--- .../BuilderDefaultsWarnings.java | 19 +++++ .../after-delombok/BuilderGenericMethod.java | 9 +++ .../after-delombok/BuilderInstanceMethod.java | 13 ++++ .../after-delombok/BuilderJavadoc.java | 14 ++++ .../after-delombok/BuilderNestedInEnum.java | 14 +++- .../after-delombok/BuilderOnNestedClass.java | 18 ++--- .../after-delombok/BuilderOnNestedRecord.java | 14 ++-- .../after-delombok/BuilderSimple.java | 10 +++ .../after-delombok/BuilderSimpleOnRecord.java | 9 +++ .../BuilderSimpleWithSetterPrefix.java | 8 ++ .../BuilderSingularAnnotatedTypes.java | 17 ++++- ...ingularAnnotatedTypesWithSetterPrefix.java | 15 ++++ .../BuilderSingularGuavaListsSets.java | 26 +++++++ .../BuilderSingularGuavaMaps.java | 18 +++++ .../after-delombok/BuilderSingularLists.java | 18 +++++ .../after-delombok/BuilderSingularNoAuto.java | 18 +++++ ...BuilderSingularNoAutoWithSetterPrefix.java | 18 +++++ .../BuilderSingularNullBehavior1.java | 14 ++++ .../BuilderSingularNullBehavior2.java | 12 ++- .../BuilderSingularOnRecord.java | 17 +++++ .../BuilderSingularRedirectToGuava.java | 18 +++++ .../after-delombok/BuilderSingularSets.java | 22 ++++++ .../BuilderSingularSetsWithSetterPrefix.java | 22 ++++++ .../BuilderSingularToBuilderWithNull.java | 11 +++ ...ularToBuilderWithNullWithSetterPrefix.java | 11 +++ ...derSingularWildcardListsWithToBuilder.java | 15 ++++ .../BuilderSingularWithPrefixes.java | 10 +++ ...rSingularWithPrefixesWithSetterPrefix.java | 10 +++ .../after-delombok/BuilderTypeAnnos.java | 9 ++- .../BuilderTypeAnnosWithSetterPrefix.java | 9 ++- .../after-delombok/BuilderValueData.java | 22 +++++- .../BuilderValueDataWithSetterPrefix.java | 22 +++++- .../after-delombok/BuilderWithAccessors.java | 14 ++++ .../after-delombok/BuilderWithBadNames.java | 10 +++ .../after-delombok/BuilderWithDeprecated.java | 18 +++++ .../BuilderWithDeprecatedAnnOnly.java | 16 ++++ .../BuilderWithExistingBuilderClass.java | 8 ++ ...hExistingBuilderClassWithSetterPrefix.java | 8 ++ ...uilderWithJavaBeansSpecCapitalization.java | 18 ++++- .../BuilderWithNoBuilderMethod.java | 8 ++ .../after-delombok/BuilderWithNonNull.java | 10 ++- .../BuilderWithNonNullWithSetterPrefix.java | 8 ++ .../BuilderWithRecursiveGenerics.java | 15 ++++ .../after-delombok/BuilderWithToBuilder.java | 47 +++++++++--- .../after-delombok/BuilderWithTolerate.java | 7 ++ .../after-delombok/CheckerFrameworkBasic.java | 10 +++ .../CheckerFrameworkBuilder.java | 19 ++++- .../CheckerFrameworkSuperBuilder.java | 40 +++++++++- .../after-delombok/ClassNamedAfterGetter.java | 1 + .../after-delombok/CommentsInterspersed.java | 1 + .../ConflictingStaticConstructorNames.java | 5 ++ .../after-delombok/ConstructorInner.java | 4 +- .../resource/after-delombok/Constructors.java | 13 ++++ .../ConstructorsConfiguration.java | 1 + .../ConstructorsInAnonymousClass.java | 8 +- .../after-delombok/ConstructorsTypeAnnos.java | 1 + .../ConstructorsWithAccessors.java | 5 +- .../ConstructorsWithBuilderDefaults.java | 18 +++++ .../ConstructorsWithBuilderDefaults2.java | 24 +++++- .../ConstructorsWithSuperBuilderDefaults.java | 36 ++++----- .../after-delombok/DataConfiguration.java | 7 ++ .../resource/after-delombok/DataExtended.java | 7 ++ .../resource/after-delombok/DataIgnore.java | 6 ++ .../after-delombok/DataInAnonymousClass.java | 15 ++-- .../resource/after-delombok/DataOnEnum.java | 3 + .../after-delombok/DataOnLocalClass.java | 21 ++++++ .../resource/after-delombok/DataPlain.java | 38 ++++++++++ .../after-delombok/DataWithGetter.java | 10 +++ .../after-delombok/DataWithGetterNone.java | 7 ++ .../DataWithOverrideEqualsAndHashCode.java | 7 +- .../after-delombok/DelegateGenerics.java | 13 +--- .../after-delombok/DelegateOnGetter.java | 3 + .../after-delombok/DelegateOnGetterNone.java | 2 + .../after-delombok/DelegateOnMethods.java | 5 +- .../DelegateTypesAndExcludes.java | 13 +--- .../DelegateWithDeprecated.java | 3 + .../after-delombok/DelegateWithVarargs.java | 4 + .../after-delombok/DelegateWithVarargs2.java | 2 +- .../after-delombok/EncodingUsAscii.java | 1 + .../resource/after-delombok/EncodingUtf8.java | 1 + .../after-delombok/EqualsAndHashCode.java | 11 +++ .../EqualsAndHashCodeAnnotated.java | 6 +- .../EqualsAndHashCodeAutoExclude.java | 8 +- .../EqualsAndHashCodeCache.java | 19 +++++ .../EqualsAndHashCodeConfigKeys1.java | 6 ++ .../EqualsAndHashCodeConfigKeys2.java | 9 +++ .../EqualsAndHashCodeEmpty.java | 6 ++ .../EqualsAndHashCodeExplicitInclude.java | 5 +- .../EqualsAndHashCodeInAnonymousClass.java | 7 +- .../EqualsAndHashCodeNestedShadow.java | 6 ++ .../EqualsAndHashCodeNewStyle.java | 3 + .../EqualsAndHashCodeOfAndExclude.java | 4 + .../after-delombok/EqualsAndHashCodeRank.java | 5 +- .../EqualsAndHashCodeWithExistingMethods.java | 2 + ...EqualsAndHashCodeWithGenericsOnInners.java | 4 +- ...hCodeWithGenericsOnInnersInInterfaces.java | 3 + ...EqualsAndHashCodeWithNonNullByDefault.java | 3 + .../EqualsAndHashCodeWithOnParam.java | 4 +- ...alsAndHashCodeWithSomeExistingMethods.java | 15 +++- ...tsViaConfigAndRequiredArgsConstructor.java | 1 + .../FieldNameConstantsBasic.java | 1 + .../FieldNameConstantsConfigKeys.java | 3 +- .../FieldNameConstantsEnum.java | 1 + .../FieldNameConstantsOnRecord.java | 1 + .../FieldNameConstantsUppercased.java | 1 + .../GenerateSuppressFBWarnings.java | 1 + .../after-delombok/GeneratedJavaxJakarta.java | 2 +- .../resource/after-delombok/GeneratedOff.java | 1 + .../after-delombok/GeneratedOffJavaxOn.java | 1 + .../resource/after-delombok/GeneratedOn.java | 2 +- .../after-delombok/GetterAccessLevel.java | 9 +++ .../after-delombok/GetterAlreadyExists.java | 10 +++ .../after-delombok/GetterBoolean.java | 4 + .../after-delombok/GetterDeprecated.java | 2 + .../resource/after-delombok/GetterEnum.java | 3 + .../GetterInAnonymousClass.java | 3 +- .../resource/after-delombok/GetterLazy.java | 1 + .../after-delombok/GetterLazyArguments.java | 17 ++--- .../after-delombok/GetterLazyBoolean.java | 6 ++ .../GetterLazyEahcToString.java | 15 ++-- .../GetterLazyErrorPosition.java | 2 +- .../after-delombok/GetterLazyGenerics.java | 4 +- .../GetterLazyInAnonymousClass.java | 3 +- .../after-delombok/GetterLazyInvalid.java | 1 + .../after-delombok/GetterLazyNative.java | 9 +++ .../after-delombok/GetterLazyTransient.java | 2 + .../resource/after-delombok/GetterNone.java | 1 + .../after-delombok/GetterOnClass.java | 8 ++ .../after-delombok/GetterOnMethod.java | 3 + .../after-delombok/GetterOnMethodErrors2.java | 8 ++ .../after-delombok/GetterOnMethodOnType.java | 2 + .../after-delombok/GetterOnStatic.java | 2 + .../resource/after-delombok/GetterPlain.java | 2 + .../after-delombok/GetterSetterJavadoc.java | 19 ++++- .../after-delombok/GetterTypeAnnos.java | 1 + .../after-delombok/GetterWithDollar.java | 3 + ...GetterWithJavaBeansSpecCapitalization.java | 4 +- .../I2335_BuilderMultipleObtainVia.java | 10 +++ .../resource/after-delombok/InjectField.java | 21 ++---- .../resource/after-delombok/InnerClass.java | 6 ++ .../JacksonBuilderSingular.java | 25 ++++++- .../after-delombok/JacksonJsonProperty.java | 11 ++- .../JacksonizedBuilderComplex.java | 15 +++- .../JacksonizedBuilderSimple.java | 10 +++ .../after-delombok/JacksonizedOnRecord.java | 21 +++--- .../JacksonizedSuperBuilderSimple.java | 12 +++ ...onizedSuperBuilderWithJsonDeserialize.java | 14 +++- .../after-delombok/JavadocMultiline.java | 10 +-- .../after-delombok/LockedInInitializer.java | 3 + .../resource/after-delombok/LockedPlain.java | 4 + .../after-delombok/LockedStaticMix.java | 1 + .../after-delombok/LockedTypeMismatch.java | 1 + .../after-delombok/LoggerCommons.java | 6 +- .../resource/after-delombok/LoggerConfig.java | 1 + .../resource/after-delombok/LoggerCustom.java | 5 +- .../LoggerCustomWithPackage.java | 5 +- .../LoggerCustomWithTopicAndName.java | 6 +- .../after-delombok/LoggerFlogger.java | 5 ++ .../after-delombok/LoggerFloggerRecord.java | 3 +- .../after-delombok/LoggerJBossLog.java | 11 ++- .../resource/after-delombok/LoggerJul.java | 9 ++- .../resource/after-delombok/LoggerLog4j.java | 7 +- .../resource/after-delombok/LoggerLog4j2.java | 9 ++- .../resource/after-delombok/LoggerSlf4j.java | 11 ++- .../after-delombok/LoggerSlf4jOnRecord.java | 1 + .../after-delombok/LoggerSlf4jTypes.java | 3 + .../LoggerSlf4jWithPackage.java | 2 + .../resource/after-delombok/LoggerXSlf4j.java | 6 +- .../after-delombok/MultiFieldGetter.java | 4 + .../NoArgsConstructorForce.java | 3 +- .../NoPrivateNoArgsConstructor.java | 13 +++- .../NonNullExistingConstructorOnRecord.java | 1 + .../after-delombok/NonNullOnRecordSimple.java | 1 + .../NonNullOnRecordTypeUse.java | 1 + .../resource/after-delombok/NonNullPlain.java | 7 ++ .../NonNullWithAlternateException.java | 1 + .../after-delombok/NonNullWithAssertion.java | 5 +- .../after-delombok/NonNullWithGuava.java | 3 +- .../after-delombok/NonNullWithJdk.java | 3 +- ...AnnotatedCheckerFrameworkSuperBuilder.java | 74 ++++++++++--------- .../resource/after-delombok/NullLibrary1.java | 6 ++ .../resource/after-delombok/NullLibrary2.java | 6 ++ .../resource/after-delombok/NullLibrary3.java | 14 ++-- .../after-delombok/OnXJava8Style.java | 13 +++- .../PrivateNoArgsConstructor.java | 38 ++++++++++ .../after-delombok/SetterAccessLevel.java | 5 ++ .../after-delombok/SetterAlreadyExists.java | 2 + .../SetterAndWithMethodJavadoc.java | 4 + .../after-delombok/SetterDeprecated.java | 2 + .../SetterInAnonymousClass.java | 3 +- .../after-delombok/SetterOnClass.java | 8 ++ .../after-delombok/SetterOnMethodOnParam.java | 3 + .../after-delombok/SetterOnStatic.java | 2 + .../resource/after-delombok/SetterPlain.java | 2 + .../after-delombok/SetterTypeAnnos.java | 1 + .../after-delombok/SetterWithDollar.java | 9 +-- ...SetterWithJavaBeansSpecCapitalization.java | 2 + .../after-delombok/SimpleTypeResolution.java | 1 + .../SingularCleanupForDelombok.java | 16 +++- .../after-delombok/SkipSuppressWarnings.java | 6 +- .../after-delombok/StandardExceptions.java | 9 ++- .../after-delombok/StaticConstructor.java | 4 +- .../after-delombok/SuperBuilderAbstract.java | 31 ++++++++ .../SuperBuilderAbstractToBuilder.java | 39 ++++++++++ .../after-delombok/SuperBuilderBasic.java | 28 +++++++ .../SuperBuilderBasicToBuilder.java | 40 ++++++++++ .../SuperBuilderCustomName.java | 14 +++- .../SuperBuilderCustomized.java | 17 +++++ ...uperBuilderCustomizedWithSetterPrefix.java | 10 +++ .../SuperBuilderInitializer.java | 28 +++---- .../after-delombok/SuperBuilderJavadoc.java | 27 ++++--- .../SuperBuilderNameClashes.java | 42 +++++++++++ .../SuperBuilderNestedGenericTypes.java | 10 +++ .../SuperBuilderSingularAnnotatedTypes.java | 21 +++++- .../SuperBuilderSingularCustomized.java | 15 +++- .../SuperBuilderSingularToBuilderGuava.java | 50 ++++++++++++- .../SuperBuilderWithAnnotatedTypeParam.java | 24 ++++++ ...uperBuilderWithCustomBuilderClassName.java | 22 +++++- .../SuperBuilderWithCustomBuilderMethod.java | 27 +++++++ .../SuperBuilderWithDefaults.java | 32 ++++++++ ...perBuilderWithDefaultsAndTargetTyping.java | 59 +++++++-------- .../SuperBuilderWithExistingConstructor.java | 12 ++- .../SuperBuilderWithGenerics.java | 28 +++++++ .../SuperBuilderWithGenerics2.java | 28 +++++++ .../SuperBuilderWithGenerics3.java | 26 ++++++- .../SuperBuilderWithGenericsAndToBuilder.java | 35 +++++++++ .../SuperBuilderWithNonNull.java | 26 +++++++ ...BuilderWithOverloadedGeneratedMethods.java | 24 ++++++ .../SuperBuilderWithPrefixes.java | 20 ++++- .../SuperBuilderWithSetterPrefix.java | 40 ++++++++++ .../SynchronizedInAnonymousClass.java | 3 +- .../SynchronizedInInitializer.java | 1 + .../after-delombok/SynchronizedPlain.java | 2 + .../after-delombok/ToStringArray.java | 3 +- .../ToStringArrayTypeAnnotations.java | 5 +- .../after-delombok/ToStringAutoExclude.java | 4 +- .../after-delombok/ToStringAutoSuper.java | 3 +- .../after-delombok/ToStringConfiguration.java | 5 ++ .../resource/after-delombok/ToStringEnum.java | 5 +- .../ToStringExplicitInclude.java | 3 +- .../ToStringExplicitIncludeConf.java | 1 + .../ToStringInAnonymousClass.java | 3 +- .../after-delombok/ToStringInner.java | 5 +- .../after-delombok/ToStringNewStyle.java | 1 + .../after-delombok/ToStringPlain.java | 2 + .../resource/after-delombok/Tolerate.java | 5 ++ .../after-delombok/TypeUseAnnotations.java | 5 +- .../resource/after-delombok/UtilityClass.java | 4 + .../after-delombok/UtilityClassGeneric.java | 7 +- .../after-delombok/UtilityClassInner.java | 3 +- .../after-delombok/ValueCallSuper.java | 5 ++ .../after-delombok/ValueInAnonymousClass.java | 11 ++- .../resource/after-delombok/ValuePlain.java | 19 +++++ .../ValueStaticConstructorOf.java | 6 ++ .../after-delombok/ValueStaticField.java | 4 + .../ValueWithJavaBeansSpecCapitalization.java | 7 +- .../after-delombok/WithAlreadyExists.java | 2 + .../WithAndAllArgsConstructor.java | 3 + .../WithByInAnonymousClass.java | 4 +- .../after-delombok/WithByNullAnnos.java | 2 + .../after-delombok/WithByOnRecord.java | 2 + .../WithByOnRecordComponent.java | 1 + .../resource/after-delombok/WithByTypes.java | 12 ++- .../after-delombok/WithInAnonymousClass.java | 4 +- .../after-delombok/WithMethodAbstract.java | 1 + .../WithMethodMarkedDeprecated.java | 2 + .../WithMethodMarkedDeprecatedAnnOnly.java | 1 + .../resource/after-delombok/WithNested.java | 2 + .../resource/after-delombok/WithOnClass.java | 6 ++ .../after-delombok/WithOnNestedRecord.java | 4 +- .../resource/after-delombok/WithOnRecord.java | 2 + .../after-delombok/WithOnRecordComponent.java | 1 + .../resource/after-delombok/WithPlain.java | 2 + .../after-delombok/WithWithGenerics.java | 3 + .../WithWithJavaBeansSpecCapitalization.java | 1 + .../after-delombok/WithWithTypeAnnos.java | 1 + .../after-delombok/WitherAccessLevel.java | 5 ++ .../after-delombok/WitherLegacyStar.java | 1 + 292 files changed, 2545 insertions(+), 432 deletions(-) diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java index 0e148b887f..0b2a097bbc 100644 --- a/test/transform/resource/after-delombok/Accessors.java +++ b/test/transform/resource/after-delombok/Accessors.java @@ -1,6 +1,7 @@ class AccessorsFluent { private String fieldName = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public String fieldName() { return this.fieldName; } @@ -8,6 +9,7 @@ public String fieldName() { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -17,10 +19,12 @@ class AccessorsFluentOnClass { private String fieldName = ""; private String otherFieldWithOverride = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } @@ -28,6 +32,7 @@ public String getOtherFieldWithOverride() { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -39,6 +44,7 @@ class AccessorsChain { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; @@ -48,6 +54,7 @@ class AccessorsPrefix { private String fieldName; private String fActualField; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -56,10 +63,12 @@ class AccessorsPrefix2 { private String fieldName; private String fActualField; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFieldName(final String fieldName) { this.fieldName = fieldName; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -71,11 +80,13 @@ private String getName() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "AccessorsPrefix3(fName=" + this.getName() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof AccessorsPrefix3)) return false; @@ -87,11 +98,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof AccessorsPrefix3; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -106,6 +119,7 @@ class AccessorsFluentGenerics { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsFluentGenerics name(final String name) { this.name = name; return this; @@ -114,6 +128,7 @@ public AccessorsFluentGenerics name(final String name) { class AccessorsFluentNoChaining { private String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public void name(final String name) { this.name = name; } @@ -121,6 +136,7 @@ public void name(final String name) { class AccessorsFluentStatic { private static String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public static void name(final String name) { AccessorsFluentStatic.name = name; } diff --git a/test/transform/resource/after-delombok/AccessorsCascade.java b/test/transform/resource/after-delombok/AccessorsCascade.java index ba4d13d4a9..1c30a37235 100644 --- a/test/transform/resource/after-delombok/AccessorsCascade.java +++ b/test/transform/resource/after-delombok/AccessorsCascade.java @@ -8,6 +8,7 @@ class AccessorsInner1 { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsOuter.AccessorsInner1 setTest3(final String zTest3) { this.zTest3 = zTest3; return this; @@ -16,6 +17,7 @@ public AccessorsOuter.AccessorsInner1 setTest3(final String zTest3) { class AccessorsInner2 { private String fTest4; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setTest4(final String fTest4) { this.fTest4 = fTest4; } @@ -24,6 +26,7 @@ public void setTest4(final String fTest4) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsOuter setTest(final String fTest) { this.fTest = fTest; return this; @@ -32,8 +35,9 @@ public AccessorsOuter setTest(final String fTest) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsOuter setTest2(final String zTest2) { this.zTest2 = zTest2; return this; } -} \ 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 f52ff30758..e62a6a9f59 100644 --- a/test/transform/resource/after-delombok/AccessorsConfiguration.java +++ b/test/transform/resource/after-delombok/AccessorsConfiguration.java @@ -1,10 +1,12 @@ class AccessorsConfiguration { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public String fieldName() { return this.m_FieldName; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void fieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -12,6 +14,7 @@ public void fieldName(final String m_FieldName) { class AccessorsConfiguration2 { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setM_FieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -22,6 +25,7 @@ class AccessorsConfiguration3 { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public AccessorsConfiguration3 setFieldName(final String fFieldName) { this.fFieldName = fFieldName; return this; diff --git a/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java b/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java index 27fab50980..bf527319f3 100644 --- a/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java +++ b/test/transform/resource/after-delombok/AccessorsInAnonymousClass.java @@ -1,18 +1,17 @@ public class AccessorsInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public String string() { return this.string; } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner string(final String string) { this.string = string; return this; diff --git a/test/transform/resource/after-delombok/AccessorsMakeFinal.java b/test/transform/resource/after-delombok/AccessorsMakeFinal.java index d88e861609..0d10c2e4d1 100644 --- a/test/transform/resource/after-delombok/AccessorsMakeFinal.java +++ b/test/transform/resource/after-delombok/AccessorsMakeFinal.java @@ -4,8 +4,9 @@ class AccessorsMakeFinal1 { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public final AccessorsMakeFinal1 test(final String test) { this.test = test; return this; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/AccessorsMakeFinalLombokConfig.java b/test/transform/resource/after-delombok/AccessorsMakeFinalLombokConfig.java index 61deedeea9..d29ac79f1a 100644 --- a/test/transform/resource/after-delombok/AccessorsMakeFinalLombokConfig.java +++ b/test/transform/resource/after-delombok/AccessorsMakeFinalLombokConfig.java @@ -1,7 +1,8 @@ class AccessorsMakeFinalLombokConfig { private String test; @java.lang.SuppressWarnings("all") + @lombok.Generated public final void setTest(final String test) { this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/AccessorsNoParamWarning.java b/test/transform/resource/after-delombok/AccessorsNoParamWarning.java index 3e9c4c5f87..e38c7e6a19 100644 --- a/test/transform/resource/after-delombok/AccessorsNoParamWarning.java +++ b/test/transform/resource/after-delombok/AccessorsNoParamWarning.java @@ -1,6 +1,7 @@ class AccessorsNoParams { private String otherFieldWithOverride = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public String otherFieldWithOverride() { return this.otherFieldWithOverride; } @@ -8,7 +9,8 @@ public String otherFieldWithOverride() { class AccessorsNoParams2 { private boolean foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFoo(final boolean foo) { this.foo = foo; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderAccessWithGetter.java b/test/transform/resource/after-delombok/BuilderAccessWithGetter.java index f36403bfa1..118273ef93 100644 --- a/test/transform/resource/after-delombok/BuilderAccessWithGetter.java +++ b/test/transform/resource/after-delombok/BuilderAccessWithGetter.java @@ -1,48 +1,48 @@ public final class BuilderAccessWithGetter { private final String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAccessWithGetter(final String string) { this.string = string; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static class BuilderAccessWithGetterBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAccessWithGetterBuilder() { } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated private BuilderAccessWithGetter.BuilderAccessWithGetterBuilder string(final String string) { this.string = string; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated private BuilderAccessWithGetter build() { return new BuilderAccessWithGetter(this.string); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAccessWithGetter.BuilderAccessWithGetterBuilder(string=" + this.string + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated private static BuilderAccessWithGetter.BuilderAccessWithGetterBuilder builder() { return new BuilderAccessWithGetter.BuilderAccessWithGetterBuilder(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public String getString() { return this.string; } diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java index 591c2b4d4c..1bf5447d0d 100644 --- a/test/transform/resource/after-delombok/BuilderComplex.java +++ b/test/transform/resource/after-delombok/BuilderComplex.java @@ -3,22 +3,29 @@ class BuilderComplex { private static void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class TestVoidName { @java.lang.SuppressWarnings("all") + @lombok.Generated private T number; @java.lang.SuppressWarnings("all") + @lombok.Generated private int arg2; @java.lang.SuppressWarnings("all") + @lombok.Generated private String arg3; @java.lang.SuppressWarnings("all") + @lombok.Generated private BuilderComplex selfRef; @java.lang.SuppressWarnings("all") + @lombok.Generated TestVoidName() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderComplex.TestVoidName number(final T number) { this.number = number; return this; @@ -27,6 +34,7 @@ public BuilderComplex.TestVoidName number(final T number) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderComplex.TestVoidName arg2(final int arg2) { this.arg2 = arg2; return this; @@ -35,6 +43,7 @@ public BuilderComplex.TestVoidName arg2(final int arg2) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderComplex.TestVoidName arg3(final String arg3) { this.arg3 = arg3; return this; @@ -43,21 +52,25 @@ public BuilderComplex.TestVoidName arg3(final String arg3) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderComplex.TestVoidName selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void execute() { BuilderComplex.testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderComplex.TestVoidName(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderComplex.TestVoidName builder() { return new BuilderComplex.TestVoidName(); } diff --git a/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java b/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java index 96673b1a00..4746de45fc 100644 --- a/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java +++ b/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java @@ -1,5 +1,4 @@ import java.util.List; - class BuilderConstructorJavadoc { /** * This is a comment @@ -13,23 +12,23 @@ class BuilderConstructorJavadoc { */ BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc) { } - - public static class BuilderConstructorJavadocBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int basic; @java.lang.SuppressWarnings("all") + @lombok.Generated private int multiline; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predef; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predefWithJavadoc; - public BuilderConstructorJavadocBuilder predef(final int x) { this.predef = x; return this; } - /** * This javadoc remains untouched. * @param x 1/100 of the thing @@ -39,21 +38,20 @@ public BuilderConstructorJavadocBuilder predefWithJavadoc(final int x) { this.predefWithJavadoc = x; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderConstructorJavadocBuilder() { } - /** * @param basic tag is moved to the setter * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder basic(final int basic) { this.basic = basic; return this; } - /** * @param multiline a param comment * can be on multiple lines and can use @@ -61,25 +59,26 @@ public BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder basic(final * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder multiline(final int multiline) { this.multiline = multiline; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderConstructorJavadoc build() { return new BuilderConstructorJavadoc(this.basic, this.multiline, this.predef, this.predefWithJavadoc); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(basic=" + this.basic + ", multiline=" + this.multiline + ", predef=" + this.predef + ", predefWithJavadoc=" + this.predefWithJavadoc + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder builder() { return new BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java index 2170eed51f..10f9fdcd24 100644 --- a/test/transform/resource/after-delombok/BuilderDefaults.java +++ b/test/transform/resource/after-delombok/BuilderDefaults.java @@ -3,38 +3,49 @@ public final class BuilderDefaults { private final String name; private final long z; @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 10; } @java.lang.SuppressWarnings("all") + @lombok.Generated private static long $default$z() { return System.currentTimeMillis(); } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaults(final int x, final String name, final long z) { this.x = x; this.name = name; this.z = z; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderDefaultsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean z$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private long z$value; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaults.BuilderDefaultsBuilder x(final int x) { this.x$value = x; x$set = true; @@ -44,6 +55,7 @@ public BuilderDefaults.BuilderDefaultsBuilder x(final int x) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaults.BuilderDefaultsBuilder name(final String name) { this.name = name; return this; @@ -52,12 +64,14 @@ public BuilderDefaults.BuilderDefaultsBuilder name(final String name) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaults.BuilderDefaultsBuilder z(final long z) { this.z$value = z; z$set = true; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaults build() { int x$value = this.x$value; if (!this.x$set) x$value = BuilderDefaults.$default$x(); @@ -67,28 +81,34 @@ public BuilderDefaults build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaults.BuilderDefaultsBuilder(x$value=" + this.x$value + ", name=" + this.name + ", z$value=" + this.z$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderDefaults.BuilderDefaultsBuilder builder() { return new BuilderDefaults.BuilderDefaultsBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public long getZ() { return this.z; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderDefaults)) return false; @@ -102,6 +122,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -114,7 +135,8 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaults(x=" + this.getX() + ", name=" + this.getName() + ", z=" + this.getZ() + ")"; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderDefaultsArray.java b/test/transform/resource/after-delombok/BuilderDefaultsArray.java index 2dd6b30479..4112659827 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsArray.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsArray.java @@ -1,62 +1,64 @@ import lombok.Value; - public class BuilderDefaultsArray { int[] x; java.lang.String[][] y; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static int[] $default$x() { return new int[] {1, 2}; } - @java.lang.SuppressWarnings("all") + @lombok.Generated private static java.lang.String[][] $default$y() { return new java.lang.String[][] {}; } - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsArray(final int[] x, final java.lang.String[][] y) { this.x = x; this.y = y; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderDefaultsArrayBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int[] x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean y$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.lang.String[][] y$value; - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsArrayBuilder() { } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsArray.BuilderDefaultsArrayBuilder x(final int[] x) { this.x$value = x; x$set = true; return this; } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsArray.BuilderDefaultsArrayBuilder y(final java.lang.String[][] y) { this.y$value = y; y$set = true; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsArray build() { int[] x$value = this.x$value; if (!this.x$set) x$value = BuilderDefaultsArray.$default$x(); @@ -64,15 +66,15 @@ public BuilderDefaultsArray build() { if (!this.y$set) y$value = BuilderDefaultsArray.$default$y(); return new BuilderDefaultsArray(x$value, y$value); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaultsArray.BuilderDefaultsArrayBuilder(x$value=" + java.util.Arrays.toString(this.x$value) + ", y$value=" + java.util.Arrays.deepToString(this.y$value) + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderDefaultsArray.BuilderDefaultsArrayBuilder builder() { return new BuilderDefaultsArray.BuilderDefaultsArrayBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java index 44d9491f57..e0bee634af 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java @@ -4,44 +4,57 @@ public class BuilderDefaultsGenerics> { private T tee; private R arrr; @java.lang.SuppressWarnings("all") + @lombok.Generated private static > java.util.concurrent.Callable $default$callable() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated private static > T $default$tee() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated private static > R $default$arrr() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsGenerics(final java.util.concurrent.Callable callable, final T tee, final R arrr) { this.callable = callable; this.tee = tee; this.arrr = arrr; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderDefaultsGenericsBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean callable$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.concurrent.Callable callable$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean tee$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private T tee$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean arrr$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private R arrr$value; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsGenericsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder callable(final java.util.concurrent.Callable callable) { this.callable$value = callable; callable$set = true; @@ -51,6 +64,7 @@ public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder callable( * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder tee(final T tee) { this.tee$value = tee; tee$set = true; @@ -60,12 +74,14 @@ public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder tee(final * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder arrr(final R arrr) { this.arrr$value = arrr; arrr$set = true; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsGenerics build() { java.util.concurrent.Callable callable$value = this.callable$value; if (!this.callable$set) callable$value = BuilderDefaultsGenerics.$default$callable(); @@ -77,11 +93,13 @@ public BuilderDefaultsGenerics build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(callable$value=" + this.callable$value + ", tee$value=" + this.tee$value + ", arrr$value=" + this.arrr$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static > BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder builder() { return new BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderDefaultsTargetTyping.java b/test/transform/resource/after-delombok/BuilderDefaultsTargetTyping.java index d9907ce820..476b8a09af 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsTargetTyping.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsTargetTyping.java @@ -1,59 +1,58 @@ import java.util.Arrays; - public class BuilderDefaultsTargetTyping { String foo; - static String doSth(java.util.List i, java.util.List c) { return null; } - @java.lang.SuppressWarnings("all") + @lombok.Generated private static String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsTargetTyping(final String foo) { this.foo = foo; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderDefaultsTargetTypingBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean foo$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private String foo$value; - @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsTargetTypingBuilder() { } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder foo(final String foo) { this.foo$value = foo; foo$set = true; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsTargetTyping build() { String foo$value = this.foo$value; if (!this.foo$set) foo$value = BuilderDefaultsTargetTyping.$default$foo(); return new BuilderDefaultsTargetTyping(foo$value); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder(foo$value=" + this.foo$value + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder builder() { return new BuilderDefaultsTargetTyping.BuilderDefaultsTargetTypingBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java index c7e37abe5d..79a33da33b 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java @@ -5,26 +5,33 @@ public class BuilderDefaultsWarnings { int z; java.util.List items; @java.lang.SuppressWarnings("all") + @lombok.Generated 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") + @lombok.Generated public static class BuilderDefaultsWarningsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private long x; @java.lang.SuppressWarnings("all") + @lombok.Generated private int z; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderDefaultsWarningsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) { this.x = x; return this; @@ -33,17 +40,20 @@ public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) { this.z = z; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsWarnings.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") + @lombok.Generated public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -53,11 +63,13 @@ public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.u return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderDefaultsWarnings build() { java.util.List items; switch (this.items == null ? 0 : this.items.size()) { @@ -74,11 +86,13 @@ public BuilderDefaultsWarnings build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(x=" + this.x + ", z=" + this.z + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() { return new BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(); } @@ -88,21 +102,26 @@ class NoBuilderButHasDefaults { public NoBuilderButHasDefaults() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class NoBuilderButHasDefaultsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated NoBuilderButHasDefaultsBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public NoBuilderButHasDefaults build() { return new NoBuilderButHasDefaults(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() { return new NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderGenericMethod.java b/test/transform/resource/after-delombok/BuilderGenericMethod.java index 36375952ef..a3b717389c 100644 --- a/test/transform/resource/after-delombok/BuilderGenericMethod.java +++ b/test/transform/resource/after-delombok/BuilderGenericMethod.java @@ -5,18 +5,23 @@ public Map foo(int a, long b) { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated public class MapBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int a; @java.lang.SuppressWarnings("all") + @lombok.Generated private long b; @java.lang.SuppressWarnings("all") + @lombok.Generated MapBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderGenericMethod.MapBuilder a(final int a) { this.a = a; return this; @@ -25,21 +30,25 @@ public BuilderGenericMethod.MapBuilder a(final int a) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderGenericMethod.MapBuilder b(final long b) { this.b = b; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Map build() { return BuilderGenericMethod.this.foo(this.a, this.b); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderGenericMethod.MapBuilder(a=" + this.a + ", b=" + this.b + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderGenericMethod.MapBuilder builder() { return this.new MapBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java index 2ee81dcb8e..ee13797a9f 100644 --- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java +++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java @@ -4,22 +4,29 @@ public String create(int show, final int yes, List also, int $andMe) { return "" + show + yes + also + $andMe; } @java.lang.SuppressWarnings("all") + @lombok.Generated public class StringBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int show; @java.lang.SuppressWarnings("all") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") + @lombok.Generated private List also; @java.lang.SuppressWarnings("all") + @lombok.Generated private int $andMe; @java.lang.SuppressWarnings("all") + @lombok.Generated StringBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderInstanceMethod.StringBuilder show(final int show) { this.show = show; return this; @@ -28,6 +35,7 @@ public BuilderInstanceMethod.StringBuilder show(final int show) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderInstanceMethod.StringBuilder yes(final int yes) { this.yes = yes; return this; @@ -36,6 +44,7 @@ public BuilderInstanceMethod.StringBuilder yes(final int yes) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderInstanceMethod.StringBuilder also(final List also) { this.also = also; return this; @@ -44,21 +53,25 @@ public BuilderInstanceMethod.StringBuilder also(final List also) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderInstanceMethod.StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String build() { return BuilderInstanceMethod.this.create(this.show, this.yes, this.also, this.$andMe); } @java.lang.Override @java.lang.SuppressWarnings("all") + @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") + @lombok.Generated public BuilderInstanceMethod.StringBuilder builder() { return this.new StringBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderJavadoc.java b/test/transform/resource/after-delombok/BuilderJavadoc.java index f7caa2d6cb..34de4ab8a2 100644 --- a/test/transform/resource/after-delombok/BuilderJavadoc.java +++ b/test/transform/resource/after-delombok/BuilderJavadoc.java @@ -24,12 +24,16 @@ class BuilderJavadoc { private final int predefWithJavadoc; public static class BuilderJavadocBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int basic; @java.lang.SuppressWarnings("all") + @lombok.Generated private int getsetwith; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predef; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predefWithJavadoc; public BuilderJavadocBuilder predef(final int x) { this.predef = x * 10; @@ -45,6 +49,7 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderJavadocBuilder() { } /** @@ -54,6 +59,7 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderJavadoc.BuilderJavadocBuilder basic(final int basic) { this.basic = basic; return this; @@ -64,21 +70,25 @@ public BuilderJavadoc.BuilderJavadocBuilder basic(final int basic) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderJavadoc.BuilderJavadocBuilder getsetwith(final int getsetwith) { this.getsetwith = getsetwith; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderJavadoc build() { return new BuilderJavadoc(this.basic, this.getsetwith, this.predef, this.predefWithJavadoc); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderJavadoc.BuilderJavadocBuilder(basic=" + this.basic + ", getsetwith=" + this.getsetwith + ", predef=" + this.predef + ", predefWithJavadoc=" + this.predefWithJavadoc + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderJavadoc(final int basic, final int getsetwith, final int predef, final int predefWithJavadoc) { this.basic = basic; this.getsetwith = getsetwith; @@ -86,6 +96,7 @@ public java.lang.String toString() { this.predefWithJavadoc = predefWithJavadoc; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderJavadoc.BuilderJavadocBuilder builder() { return new BuilderJavadoc.BuilderJavadocBuilder(); } @@ -94,6 +105,7 @@ public static BuilderJavadoc.BuilderJavadocBuilder builder() { * @return tag is moved to the getter. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGetsetwith() { return this.getsetwith; } @@ -102,6 +114,7 @@ public int getGetsetwith() { * @param tag is moved to the setters and wither. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setGetsetwith(final int getsetwith) { this.getsetwith = getsetwith; } @@ -111,6 +124,7 @@ public void setGetsetwith(final int getsetwith) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderJavadoc withGetsetwith(final int getsetwith) { return this.getsetwith == getsetwith ? this : new BuilderJavadoc(this.basic, getsetwith, this.predef, this.predefWithJavadoc); } diff --git a/test/transform/resource/after-delombok/BuilderNestedInEnum.java b/test/transform/resource/after-delombok/BuilderNestedInEnum.java index 26dc2a0638..84fcc4352d 100644 --- a/test/transform/resource/after-delombok/BuilderNestedInEnum.java +++ b/test/transform/resource/after-delombok/BuilderNestedInEnum.java @@ -4,44 +4,54 @@ public enum TestEnum { public static final class TestBuilder { private final String field; @java.lang.SuppressWarnings("all") + @lombok.Generated TestBuilder(final String field) { this.field = field; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class TestBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String field; @java.lang.SuppressWarnings("all") + @lombok.Generated TestBuilderBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) { this.field = field; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderNestedInEnum.TestEnum.TestBuilder build() { return new BuilderNestedInEnum.TestEnum.TestBuilder(this.field); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(field=" + this.field + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() { return new BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getField() { return this.field; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderNestedInEnum.TestEnum.TestBuilder)) return false; @@ -53,6 +63,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -62,9 +73,10 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderNestedInEnum.TestEnum.TestBuilder(field=" + this.getField() + ")"; } } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderOnNestedClass.java b/test/transform/resource/after-delombok/BuilderOnNestedClass.java index 76e69f7899..98b6dfa741 100644 --- a/test/transform/resource/after-delombok/BuilderOnNestedClass.java +++ b/test/transform/resource/after-delombok/BuilderOnNestedClass.java @@ -1,47 +1,45 @@ public class BuilderOnNestedClass { private T t; - - public static class Nested { private String a; - @java.lang.SuppressWarnings("all") + @lombok.Generated Nested(final String a) { this.a = a; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static class NestedBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String a; - @java.lang.SuppressWarnings("all") + @lombok.Generated NestedBuilder() { } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderOnNestedClass.Nested.NestedBuilder a(final String a) { this.a = a; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderOnNestedClass.Nested build() { return new BuilderOnNestedClass.Nested(this.a); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderOnNestedClass.Nested.NestedBuilder(a=" + this.a + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderOnNestedClass.Nested.NestedBuilder builder() { return new BuilderOnNestedClass.Nested.NestedBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderOnNestedRecord.java b/test/transform/resource/after-delombok/BuilderOnNestedRecord.java index 83de7e06e3..8803537228 100644 --- a/test/transform/resource/after-delombok/BuilderOnNestedRecord.java +++ b/test/transform/resource/after-delombok/BuilderOnNestedRecord.java @@ -1,39 +1,39 @@ // version 14: public record BuilderOnNestedRecord(T t) { - public record Nested(String a) { - @java.lang.SuppressWarnings("all") + @lombok.Generated public static class NestedBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String a; - @java.lang.SuppressWarnings("all") + @lombok.Generated NestedBuilder() { } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderOnNestedRecord.Nested.NestedBuilder a(final String a) { this.a = a; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderOnNestedRecord.Nested build() { return new BuilderOnNestedRecord.Nested(this.a); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderOnNestedRecord.Nested.NestedBuilder(a=" + this.a + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderOnNestedRecord.Nested.NestedBuilder builder() { return new BuilderOnNestedRecord.Nested.NestedBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java index a43567b31f..79e71b3bae 100644 --- a/test/transform/resource/after-delombok/BuilderSimple.java +++ b/test/transform/resource/after-delombok/BuilderSimple.java @@ -5,23 +5,29 @@ class BuilderSimple { private List also; private int $butNotMe; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSimple(final int yes, final List also) { this.yes = yes; this.also = also; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static class BuilderSimpleBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") + @lombok.Generated private List also; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSimpleBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimple.BuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; @@ -30,21 +36,25 @@ public BuilderSimple.BuilderSimpleBuilder yes(final int yes) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimple.BuilderSimpleBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimple build() { return new BuilderSimple(this.yes, this.also); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static BuilderSimple.BuilderSimpleBuilder builder() { return new BuilderSimple.BuilderSimpleBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java b/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java index acb6f20a29..3952de248e 100644 --- a/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java +++ b/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java @@ -2,18 +2,23 @@ import java.util.List; public record BuilderSimpleOnRecord(List l, String a) { @java.lang.SuppressWarnings("all") + @lombok.Generated protected static class BuilderSimpleOnRecordBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private List l; @java.lang.SuppressWarnings("all") + @lombok.Generated private String a; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSimpleOnRecordBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder l(final List l) { this.l = l; return this; @@ -22,21 +27,25 @@ public BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder l(final List l) * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder a(final String a) { this.a = a; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimpleOnRecord build() { return new BuilderSimpleOnRecord(this.l, this.a); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder(l=" + this.l + ", a=" + this.a + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder builder() { return new BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java index 3038fe3949..f4991d73e9 100644 --- a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java @@ -2,35 +2,43 @@ class BuilderSimpleWithSetterPrefix { private int unprefixed; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSimpleWithSetterPrefix(final int unprefixed) { this.unprefixed = unprefixed; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static class BuilderSimpleWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int unprefixed; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSimpleWithSetterPrefixBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder withUnprefixed(final int unprefixed) { this.unprefixed = unprefixed; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSimpleWithSetterPrefix build() { return new BuilderSimpleWithSetterPrefix(this.unprefixed); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(unprefixed=" + this.unprefixed + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder builder() { return new BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java index 7568d81215..e18982a7ce 100644 --- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java @@ -11,22 +11,29 @@ class BuilderSingularAnnotatedTypes { private Set<@MyAnnotation @NonNull String> foos; private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularAnnotatedTypes(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { this.foos = foos; this.bars = bars; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularAnnotatedTypesBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> foos; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularAnnotatedTypesBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(@MyAnnotation @NonNull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -36,6 +43,7 @@ public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(@M return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection foos) { if (foos == null) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -45,11 +53,13 @@ public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(f return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearFoos() { if (this.foos != null) this.foos.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) { if (barKey == null) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); @@ -66,6 +76,7 @@ public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(@M return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map bars) { if (bars == null) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -81,6 +92,7 @@ public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(f return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearBars() { if (this.bars$key != null) { this.bars$key.clear(); @@ -89,6 +101,7 @@ public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearB return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypes build() { java.util.Set<@MyAnnotation @NonNull String> foos; switch (this.foos == null ? 0 : this.foos.size()) { @@ -120,12 +133,14 @@ public BuilderSingularAnnotatedTypes build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(foos=" + this.foos + ", bars$key=" + this.bars$key + ", bars$value=" + this.bars$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder builder() { return new BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java index d58caf4ded..6f31c6ec2f 100644 --- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java @@ -11,22 +11,29 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix { private Set<@MyAnnotation @NonNull String> foos; private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefix(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { this.foos = foos; this.bars = bars; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularAnnotatedTypesWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> foos; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(@MyAnnotation @NonNull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -36,6 +43,7 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTyp return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection foos) { if (foos == null) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -45,11 +53,13 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTyp return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() { if (this.foos != null) this.foos.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) { if (barKey == null) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); @@ -66,6 +76,7 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTyp return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map bars) { if (bars == null) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -81,6 +92,7 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTyp return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() { if (this.bars$key != null) { this.bars$key.clear(); @@ -89,6 +101,7 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTyp return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularAnnotatedTypesWithSetterPrefix build() { java.util.Set<@MyAnnotation @NonNull String> foos; switch (this.foos == null ? 0 : this.foos.size()) { @@ -120,11 +133,13 @@ public BuilderSingularAnnotatedTypesWithSetterPrefix build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(foos=" + this.foos + ", bars$key=" + this.bars$key + ", bars$value=" + this.bars$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() { return new BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java index 32b7c08433..c798773b14 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java @@ -11,6 +11,7 @@ class BuilderSingularGuavaListsSets { private ImmutableSortedSet passes; private ImmutableTable users; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { this.cards = cards; this.frogs = frogs; @@ -19,27 +20,36 @@ class BuilderSingularGuavaListsSets { this.users = users; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularGuavaListsSetsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder cards; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder frogs; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSet.Builder rawSet; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSortedSet.Builder passes; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableTable.Builder users; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.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") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { if (cards == null) { throw new java.lang.NullPointerException("cards cannot be null"); @@ -49,17 +59,20 @@ public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder car return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearCards() { this.cards = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.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") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { if (frogs == null) { throw new java.lang.NullPointerException("frogs cannot be null"); @@ -69,17 +82,20 @@ public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder fro return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearFrogs() { this.frogs = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.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") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { if (rawSet == null) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -89,17 +105,20 @@ public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder raw return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearRawSet() { this.rawSet = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.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") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { if (passes == null) { throw new java.lang.NullPointerException("passes cannot be null"); @@ -109,17 +128,20 @@ public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder pas return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearPasses() { this.passes = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.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") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder users(final com.google.common.collect.Table users) { if (users == null) { throw new java.lang.NullPointerException("users cannot be null"); @@ -129,11 +151,13 @@ public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder use return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearUsers() { this.users = null; return this; } @java.lang.SuppressWarnings("all") + @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(); @@ -144,11 +168,13 @@ public BuilderSingularGuavaListsSets build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @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") + @lombok.Generated public static BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder builder() { return new BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java index 9e3c6c156d..8748f12f7d 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java @@ -7,29 +7,37 @@ class BuilderSingularGuavaMaps { @SuppressWarnings("all") private ImmutableBiMap rawMap; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { this.battleaxes = battleaxes; this.vertices = vertices; this.rawMap = rawMap; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularGuavaMapsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableMap.Builder battleaxes; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSortedMap.Builder vertices; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableBiMap.Builder rawMap; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularGuavaMapsBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.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") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { if (battleaxes == null) { throw new java.lang.NullPointerException("battleaxes cannot be null"); @@ -39,17 +47,20 @@ public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxes return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearBattleaxes() { this.battleaxes = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.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") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { if (vertices == null) { throw new java.lang.NullPointerException("vertices cannot be null"); @@ -59,17 +70,20 @@ public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertices(f return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearVertices() { this.vertices = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.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") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { if (rawMap == null) { throw new java.lang.NullPointerException("rawMap cannot be null"); @@ -79,11 +93,13 @@ public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(fin return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearRawMap() { this.rawMap = null; return this; } @java.lang.SuppressWarnings("all") + @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(); @@ -92,11 +108,13 @@ public BuilderSingularGuavaMaps build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder builder() { return new BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java index f722dfcd16..059e139803 100644 --- a/test/transform/resource/after-delombok/BuilderSingularLists.java +++ b/test/transform/resource/after-delombok/BuilderSingularLists.java @@ -6,29 +6,37 @@ class BuilderSingularLists { @SuppressWarnings("all") private List rawList; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularLists(final List children, final Collection scarves, final List rawList) { this.children = children; this.scarves = scarves; this.rawList = rawList; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularListsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList children; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList scarves; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList rawList; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.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") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder children(final java.util.Collection children) { if (children == null) { throw new java.lang.NullPointerException("children cannot be null"); @@ -38,17 +46,20 @@ public BuilderSingularLists.BuilderSingularListsBuilder children(final java.u return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.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") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { if (scarves == null) { throw new java.lang.NullPointerException("scarves cannot be null"); @@ -58,17 +69,20 @@ public BuilderSingularLists.BuilderSingularListsBuilder scarves(final java.ut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.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") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { if (rawList == null) { throw new java.lang.NullPointerException("rawList cannot be null"); @@ -78,11 +92,13 @@ public BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.ut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists.BuilderSingularListsBuilder clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularLists build() { java.util.List children; switch (this.children == null ? 0 : this.children.size()) { @@ -121,11 +137,13 @@ public BuilderSingularLists build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularLists.BuilderSingularListsBuilder builder() { return new BuilderSingularLists.BuilderSingularListsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java index de86383f94..9eb4fc0e80 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java @@ -5,29 +5,37 @@ class BuilderSingularNoAuto { private List widgets; private List items; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNoAuto(final List things, final List widgets, final List items) { this.things = things; this.widgets = widgets; this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularNoAutoBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList things; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList widgets; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNoAutoBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.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") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final java.util.Collection things) { if (things == null) { throw new java.lang.NullPointerException("things cannot be null"); @@ -37,17 +45,20 @@ public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final java.util return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.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") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widgets(final java.util.Collection widgets) { if (widgets == null) { throw new java.lang.NullPointerException("widgets cannot be null"); @@ -57,17 +68,20 @@ public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widgets(final java.uti return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.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") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -77,11 +91,13 @@ public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final java.util. return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAuto build() { java.util.List things; switch (this.things == null ? 0 : this.things.size()) { @@ -120,11 +136,13 @@ public BuilderSingularNoAuto build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularNoAuto.BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java index 8858f14509..5759adbf34 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java @@ -5,29 +5,37 @@ class BuilderSingularNoAutoWithSetterPrefix { private List widgets; private List items; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNoAutoWithSetterPrefix(final List things, final List widgets, final List items) { this.things = things; this.widgets = widgets; this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularNoAutoWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList things; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList widgets; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNoAutoWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) { if (this.things == null) this.things = new java.util.ArrayList(); this.things.add(things); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection things) { if (things == null) { throw new java.lang.NullPointerException("things cannot be null"); @@ -37,17 +45,20 @@ public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPref return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) { if (this.widgets == null) this.widgets = new java.util.ArrayList(); this.widgets.add(widget); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection widgets) { if (widgets == null) { throw new java.lang.NullPointerException("widgets cannot be null"); @@ -57,17 +68,20 @@ public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPref return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(items); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -77,11 +91,13 @@ public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPref return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNoAutoWithSetterPrefix build() { java.util.List things; switch (this.things == null ? 0 : this.things.size()) { @@ -120,11 +136,13 @@ public BuilderSingularNoAutoWithSetterPrefix build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder builder() { return new BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNullBehavior1.java b/test/transform/resource/after-delombok/BuilderSingularNullBehavior1.java index 45ff97fa6f..a6405324cc 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNullBehavior1.java +++ b/test/transform/resource/after-delombok/BuilderSingularNullBehavior1.java @@ -5,26 +5,33 @@ class BuilderSingularNullBehavior1 { private List names; private List locations; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNullBehavior1(final List names, final List locations) { this.names = names; this.locations = locations; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularNullBehavior1Builder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList names; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList locations; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNullBehavior1Builder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder name(final String name) { if (this.names == null) this.names = new java.util.ArrayList(); this.names.add(name); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder names(final java.util.@org.checkerframework.checker.nullness.qual.NonNull Collection names) { assert names != null : "names cannot be null"; if (this.names == null) this.names = new java.util.ArrayList(); @@ -32,17 +39,20 @@ public static class BuilderSingularNullBehavior1Builder { return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearNames() { if (this.names != null) this.names.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder location(final String location) { if (this.locations == null) this.locations = new java.util.ArrayList(); this.locations.add(location); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder locations(final java.util.@org.checkerframework.checker.nullness.qual.Nullable Collection locations) { if (locations != null) { if (this.locations == null) this.locations = new java.util.ArrayList(); @@ -51,12 +61,14 @@ public static class BuilderSingularNullBehavior1Builder { return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder clearLocations() { if (this.locations != null) this.locations.clear(); return this; } @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior1 build() { java.util.List names; switch (this.names == null ? 0 : this.names.size()) { @@ -84,11 +96,13 @@ public BuilderSingularNullBehavior1 build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return "BuilderSingularNullBehavior1.BuilderSingularNullBehavior1Builder(names=" + this.names + ", locations=" + this.locations + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularNullBehavior1.@org.checkerframework.checker.nullness.qual.NonNull BuilderSingularNullBehavior1Builder builder() { return new BuilderSingularNullBehavior1.BuilderSingularNullBehavior1Builder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNullBehavior2.java b/test/transform/resource/after-delombok/BuilderSingularNullBehavior2.java index 5f605de455..763dcb4078 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNullBehavior2.java +++ b/test/transform/resource/after-delombok/BuilderSingularNullBehavior2.java @@ -3,18 +3,23 @@ class BuilderSingularNullBehavior2 { private List locations; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNullBehavior2(final List locations) { this.locations = locations; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularNullBehavior2Builder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList locations; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularNullBehavior2Builder() { } @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder location(final String location) { if (this.locations == null) this.locations = new java.util.ArrayList(); this.locations.add(location); @@ -22,6 +27,7 @@ public BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder location } @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder locations(@org.springframework.lang.NonNull final java.util.Collection locations) { java.util.Objects.requireNonNull(locations, "locations cannot be null"); if (this.locations == null) this.locations = new java.util.ArrayList(); @@ -30,12 +36,14 @@ public BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder location } @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder clearLocations() { if (this.locations != null) this.locations.clear(); return this; } @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularNullBehavior2 build() { java.util.List locations; switch (this.locations == null ? 0 : this.locations.size()) { @@ -53,13 +61,15 @@ public BuilderSingularNullBehavior2 build() { @org.springframework.lang.NonNull @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder(locations=" + this.locations + ")"; } } @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder builder() { return new BuilderSingularNullBehavior2.BuilderSingularNullBehavior2Builder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderSingularOnRecord.java b/test/transform/resource/after-delombok/BuilderSingularOnRecord.java index 0aaa12cdb0..ae785b79a2 100644 --- a/test/transform/resource/after-delombok/BuilderSingularOnRecord.java +++ b/test/transform/resource/after-delombok/BuilderSingularOnRecord.java @@ -3,23 +3,30 @@ import java.util.List; public record BuilderSingularOnRecord(List children, Collection scarves, @SuppressWarnings("all") List rawList) { @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularOnRecordBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList children; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList scarves; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList rawList; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularOnRecordBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder child(final T child) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.add(child); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder children(final java.util.Collection children) { if (children == null) { throw new java.lang.NullPointerException("children cannot be null"); @@ -29,17 +36,20 @@ public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder children(final return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarves(final java.util.Collection scarves) { if (scarves == null) { throw new java.lang.NullPointerException("scarves cannot be null"); @@ -49,17 +59,20 @@ public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder scarves(final j return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder 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") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final java.util.Collection rawList) { if (rawList == null) { throw new java.lang.NullPointerException("rawList cannot be null"); @@ -69,11 +82,13 @@ public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder rawList(final j return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularOnRecord build() { java.util.List children; switch (this.children == null ? 0 : this.children.size()) { @@ -112,11 +127,13 @@ public BuilderSingularOnRecord build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularOnRecord.BuilderSingularOnRecordBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularOnRecord.BuilderSingularOnRecordBuilder builder() { return new BuilderSingularOnRecord.BuilderSingularOnRecordBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java index a718d7cd6c..418b71e948 100644 --- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java @@ -6,29 +6,37 @@ class BuilderSingularRedirectToGuava { private NavigableMap things; private Collection> doohickeys; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { this.dangerMice = dangerMice; this.things = things; this.doohickeys = doohickeys; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularRedirectToGuavaBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSet.Builder dangerMice; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSortedMap.Builder things; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder> doohickeys; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularRedirectToGuavaBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.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") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable dangerMice) { if (dangerMice == null) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -38,17 +46,20 @@ public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dang return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.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") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder things(final java.util.Map things) { if (things == null) { throw new java.lang.NullPointerException("things cannot be null"); @@ -58,17 +69,20 @@ public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder thin return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.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") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable> doohickeys) { if (doohickeys == null) { throw new java.lang.NullPointerException("doohickeys cannot be null"); @@ -78,11 +92,13 @@ public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dooh return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } @java.lang.SuppressWarnings("all") + @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(); @@ -91,11 +107,13 @@ public BuilderSingularRedirectToGuava build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java index 25f106e9c0..86e10848c5 100644 --- a/test/transform/resource/after-delombok/BuilderSingularSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularSets.java @@ -7,6 +7,7 @@ class BuilderSingularSets { private Set rawSet; private Set stringSet; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { this.dangerMice = dangerMice; this.octopodes = octopodes; @@ -14,25 +15,33 @@ class BuilderSingularSets { this.stringSet = stringSet; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularSetsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList dangerMice; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList octopodes; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList rawSet; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList stringSet; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularSetsBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder dangerMouse(final T dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder dangerMice(final java.util.Collection dangerMice) { if (dangerMice == null) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -42,17 +51,20 @@ public BuilderSingularSets.BuilderSingularSetsBuilder dangerMice(final java.u return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder clearDangerMice() { if (this.dangerMice != null) this.dangerMice.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder octopus(final Number octopus) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder octopodes(final java.util.Collection octopodes) { if (octopodes == null) { throw new java.lang.NullPointerException("octopodes cannot be null"); @@ -62,17 +74,20 @@ public BuilderSingularSets.BuilderSingularSetsBuilder octopodes(final java.ut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder clearOctopodes() { if (this.octopodes != null) this.octopodes.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.util.Collection rawSet) { if (rawSet == null) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -82,17 +97,20 @@ public BuilderSingularSets.BuilderSingularSetsBuilder rawSet(final java.util. return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder clearRawSet() { if (this.rawSet != null) this.rawSet.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final String stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final java.util.Collection stringSet) { if (stringSet == null) { throw new java.lang.NullPointerException("stringSet cannot be null"); @@ -102,11 +120,13 @@ public BuilderSingularSets.BuilderSingularSetsBuilder stringSet(final java.ut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets.BuilderSingularSetsBuilder clearStringSet() { if (this.stringSet != null) this.stringSet.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSets build() { java.util.Set dangerMice; switch (this.dangerMice == null ? 0 : this.dangerMice.size()) { @@ -154,11 +174,13 @@ public BuilderSingularSets build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularSets.BuilderSingularSetsBuilder builder() { return new BuilderSingularSets.BuilderSingularSetsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java index a3d3c621cf..e5e40fd103 100644 --- a/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java @@ -7,6 +7,7 @@ class BuilderSingularSetsWithSetterPrefix { private Set rawSet; private Set stringSet; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularSetsWithSetterPrefix(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { this.dangerMice = dangerMice; this.octopodes = octopodes; @@ -14,25 +15,33 @@ class BuilderSingularSetsWithSetterPrefix { this.stringSet = stringSet; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularSetsWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList dangerMice; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList octopodes; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList rawSet; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList stringSet; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularSetsWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMouse(final T dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withDangerMice(final java.util.Collection dangerMice) { if (dangerMice == null) { throw new java.lang.NullPointerException("dangerMice cannot be null"); @@ -42,17 +51,20 @@ public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBu return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearDangerMice() { if (this.dangerMice != null) this.dangerMice.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopus(final Number octopus) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withOctopodes(final java.util.Collection octopodes) { if (octopodes == null) { throw new java.lang.NullPointerException("octopodes cannot be null"); @@ -62,17 +74,20 @@ public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBu return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearOctopodes() { if (this.octopodes != null) this.octopodes.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.util.Collection rawSet) { if (rawSet == null) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -82,17 +97,20 @@ public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBu return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearRawSet() { if (this.rawSet != null) this.rawSet.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final String stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final java.util.Collection stringSet) { if (stringSet == null) { throw new java.lang.NullPointerException("stringSet cannot be null"); @@ -102,11 +120,13 @@ public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBu return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder clearStringSet() { if (this.stringSet != null) this.stringSet.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularSetsWithSetterPrefix build() { java.util.Set dangerMice; switch (this.dangerMice == null ? 0 : this.dangerMice.size()) { @@ -154,11 +174,13 @@ public BuilderSingularSetsWithSetterPrefix build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder builder() { return new BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java index fcd57a318a..052f53dc6f 100644 --- a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java +++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java @@ -4,23 +4,29 @@ public static void test() { new BuilderSingularToBuilderWithNull(null).toBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularToBuilderWithNull(final java.util.List elems) { this.elems = elems; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularToBuilderWithNullBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularToBuilderWithNullBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection elems) { if (elems == null) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -30,11 +36,13 @@ public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNull build() { java.util.List elems; switch (this.elems == null ? 0 : this.elems.size()) { @@ -51,15 +59,18 @@ public BuilderSingularToBuilderWithNull build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder() { return new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder toBuilder() { final BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(); if (this.elems != null) builder.elems(this.elems); diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java index 59bc09c19a..9121f01ab8 100644 --- a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java @@ -4,23 +4,29 @@ public static void test() { new BuilderSingularToBuilderWithNullWithSetterPrefix(null).toBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefix(final java.util.List elems) { this.elems = elems; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if (elems == null) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -30,11 +36,13 @@ public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilder return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNullWithSetterPrefix build() { java.util.List elems; switch (this.elems == null ? 0 : this.elems.size()) { @@ -51,15 +59,18 @@ public BuilderSingularToBuilderWithNullWithSetterPrefix build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() { return new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() { final BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); if (this.elems != null) builder.withElems(this.elems); diff --git a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java index 59cca1d3ea..faf1d5e231 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java +++ b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java @@ -4,26 +4,33 @@ class BuilderSingularWildcardListsWithToBuilder { private List objects; private Collection numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWildcardListsWithToBuilder(final List objects, final Collection numbers) { this.objects = objects; this.numbers = numbers; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularWildcardListsWithToBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList objects; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWildcardListsWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) { if (this.objects == null) this.objects = new java.util.ArrayList(); this.objects.add(object); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection objects) { if (objects == null) { throw new java.lang.NullPointerException("objects cannot be null"); @@ -33,17 +40,20 @@ public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWit return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() { if (this.objects != null) this.objects.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) { if (this.numbers == null) this.numbers = new java.util.ArrayList(); this.numbers.add(number); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection numbers) { if (numbers == null) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -53,11 +63,13 @@ public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWit return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() { if (this.numbers != null) this.numbers.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder build() { java.util.List objects; switch (this.objects == null ? 0 : this.objects.size()) { @@ -85,15 +97,18 @@ public BuilderSingularWildcardListsWithToBuilder build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(objects=" + this.objects + ", numbers=" + this.numbers + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder() { return new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() { final BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(); if (this.objects != null) builder.objects(this.objects); diff --git a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java index bb6c5bfb87..c23769dbbb 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java +++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java @@ -1,23 +1,29 @@ class BuilderSingularWithPrefixes { private java.util.List _elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWithPrefixes(final java.util.List elems) { this._elems = elems; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularWithPrefixesBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWithPrefixesBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elems(final java.util.Collection elems) { if (elems == null) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -27,11 +33,13 @@ public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elems(fina return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixes build() { java.util.List elems; switch (this.elems == null ? 0 : this.elems.size()) { @@ -48,11 +56,13 @@ public BuilderSingularWithPrefixes build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder builder() { return new BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java index 94633cfeef..ead2616872 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java @@ -1,23 +1,29 @@ class BuilderSingularWithPrefixesWithSetterPrefix { private java.util.List _elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefix(final java.util.List elems) { this._elems = elems; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderSingularWithPrefixesWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderSingularWithPrefixesWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if (elems == null) { throw new java.lang.NullPointerException("elems cannot be null"); @@ -27,11 +33,13 @@ public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWi return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderSingularWithPrefixesWithSetterPrefix build() { java.util.List elems; switch (this.elems == null ? 0 : this.elems.size()) { @@ -48,11 +56,13 @@ public BuilderSingularWithPrefixesWithSetterPrefix build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() { return new BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnos.java b/test/transform/resource/after-delombok/BuilderTypeAnnos.java index f5ef42f7a1..d081449499 100644 --- a/test/transform/resource/after-delombok/BuilderTypeAnnos.java +++ b/test/transform/resource/after-delombok/BuilderTypeAnnos.java @@ -12,37 +12,44 @@ class BuilderTypeAnnos { @TB private List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderTypeAnnos(@TA final List foo) { this.foo = foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderTypeAnnosBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderTypeAnnosBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderTypeAnnos.BuilderTypeAnnosBuilder foo(@TA final List foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderTypeAnnos build() { return new BuilderTypeAnnos(this.foo); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderTypeAnnos.BuilderTypeAnnosBuilder builder() { return new BuilderTypeAnnos.BuilderTypeAnnosBuilder(); } } - diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java index 1fb7798ab8..8ee9071dfb 100644 --- a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java @@ -12,37 +12,44 @@ class BuilderTypeAnnosWithSetterPrefix { @TB private List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderTypeAnnosWithSetterPrefix(@TA final List foo) { this.foo = foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderTypeAnnosWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderTypeAnnosWithSetterPrefixBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder withFoo(@TA final List foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderTypeAnnosWithSetterPrefix build() { return new BuilderTypeAnnosWithSetterPrefix(this.foo); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(foo=" + this.foo + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder builder() { return new BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(); } } - diff --git a/test/transform/resource/after-delombok/BuilderValueData.java b/test/transform/resource/after-delombok/BuilderValueData.java index 0af32fe514..1f7d83465a 100644 --- a/test/transform/resource/after-delombok/BuilderValueData.java +++ b/test/transform/resource/after-delombok/BuilderValueData.java @@ -2,33 +2,41 @@ final class BuilderAndValue { private final int zero = 0; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndValue() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderAndValueBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndValueBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderAndValue build() { return new BuilderAndValue(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndValue.BuilderAndValueBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderAndValue.BuilderAndValueBuilder builder() { return new BuilderAndValue.BuilderAndValueBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getZero() { return this.zero; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndValue)) return false; @@ -38,6 +46,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -46,41 +55,49 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndValue(zero=" + this.getZero() + ")"; } } - class BuilderAndData { private final int zero = 0; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndData() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderAndDataBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndDataBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderAndData build() { return new BuilderAndData(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndData.BuilderAndDataBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderAndData.BuilderAndDataBuilder builder() { return new BuilderAndData.BuilderAndDataBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getZero() { return this.zero; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndData)) return false; @@ -90,11 +107,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof BuilderAndData; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -103,6 +122,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndData(zero=" + this.getZero() + ")"; } diff --git a/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java index de83d5db73..8597086b0e 100644 --- a/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java @@ -2,33 +2,41 @@ final class BuilderAndValueWithSetterPrefix { private final int zero = 0; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndValueWithSetterPrefix() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderAndValueWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndValueWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderAndValueWithSetterPrefix build() { return new BuilderAndValueWithSetterPrefix(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder builder() { return new BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getZero() { return this.zero; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndValueWithSetterPrefix)) return false; @@ -38,6 +46,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -46,41 +55,49 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndValueWithSetterPrefix(zero=" + this.getZero() + ")"; } } - class BuilderAndDataWithSetterPrefix { private final int zero = 0; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndDataWithSetterPrefix() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderAndDataWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderAndDataWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderAndDataWithSetterPrefix build() { return new BuilderAndDataWithSetterPrefix(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder builder() { return new BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getZero() { return this.zero; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndDataWithSetterPrefix)) return false; @@ -90,11 +107,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof BuilderAndDataWithSetterPrefix; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -103,6 +122,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderAndDataWithSetterPrefix(zero=" + this.getZero() + ")"; } diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java index a8a9bc1153..2e197179c5 100644 --- a/test/transform/resource/after-delombok/BuilderWithAccessors.java +++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java @@ -4,6 +4,7 @@ class BuilderWithAccessors { private int _foo; private int __bar; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { this.plower = plower; this.pUpper = upper; @@ -11,22 +12,29 @@ class BuilderWithAccessors { this.__bar = _bar; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithAccessorsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int plower; @java.lang.SuppressWarnings("all") + @lombok.Generated private int upper; @java.lang.SuppressWarnings("all") + @lombok.Generated private int foo; @java.lang.SuppressWarnings("all") + @lombok.Generated private int _bar; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithAccessorsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) { this.plower = plower; return this; @@ -35,6 +43,7 @@ public BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) { this.upper = upper; return this; @@ -43,6 +52,7 @@ public BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) { this.foo = foo; return this; @@ -51,21 +61,25 @@ public BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithAccessors.BuilderWithAccessorsBuilder _bar(final int _bar) { this._bar = _bar; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithAccessors build() { return new BuilderWithAccessors(this.plower, this.upper, this.foo, this._bar); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithAccessors.BuilderWithAccessorsBuilder builder() { return new BuilderWithAccessors.BuilderWithAccessorsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithBadNames.java b/test/transform/resource/after-delombok/BuilderWithBadNames.java index c96fbc58bf..ebb4fdfdba 100644 --- a/test/transform/resource/after-delombok/BuilderWithBadNames.java +++ b/test/transform/resource/after-delombok/BuilderWithBadNames.java @@ -2,23 +2,29 @@ public class BuilderWithBadNames { String build; String toString; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithBadNames(final String build, final String toString) { this.build = build; this.toString = toString; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithBadNamesBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String build; @java.lang.SuppressWarnings("all") + @lombok.Generated private String toString; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithBadNamesBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) { this.build = build; return this; @@ -27,21 +33,25 @@ public BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithBadNames.BuilderWithBadNamesBuilder toString(final String toString) { this.toString = toString; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithBadNames build() { return new BuilderWithBadNames(this.build, this.toString); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithBadNames.BuilderWithBadNamesBuilder(build=" + this.build + ", toString=" + this.toString + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithBadNames.BuilderWithBadNamesBuilder builder() { return new BuilderWithBadNames.BuilderWithBadNamesBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecated.java b/test/transform/resource/after-delombok/BuilderWithDeprecated.java index f072964922..26a02b44e9 100644 --- a/test/transform/resource/after-delombok/BuilderWithDeprecated.java +++ b/test/transform/resource/after-delombok/BuilderWithDeprecated.java @@ -11,6 +11,7 @@ public class BuilderWithDeprecated { @Deprecated ImmutableList numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List strings, final ImmutableList numbers) { this.dep1 = dep1; this.dep2 = dep2; @@ -18,16 +19,22 @@ public class BuilderWithDeprecated { this.numbers = numbers; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithDeprecatedBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String dep1; @java.lang.SuppressWarnings("all") + @lombok.Generated private int dep2; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList strings; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithDeprecatedBuilder() { } /** @@ -36,6 +43,7 @@ public static class BuilderWithDeprecatedBuilder { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep1(final String dep1) { this.dep1 = dep1; return this; @@ -45,12 +53,14 @@ public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep1(final String dep1 */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep2(final int dep2) { this.dep2 = dep2; return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder string(final String string) { if (this.strings == null) this.strings = new java.util.ArrayList(); this.strings.add(string); @@ -58,6 +68,7 @@ public BuilderWithDeprecated.BuilderWithDeprecatedBuilder string(final String st } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder strings(final java.util.Collection strings) { if (strings == null) { throw new java.lang.NullPointerException("strings cannot be null"); @@ -68,12 +79,14 @@ public BuilderWithDeprecated.BuilderWithDeprecatedBuilder strings(final java.uti } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearStrings() { if (this.strings != null) this.strings.clear(); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder number(final Integer number) { if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder(); this.numbers.add(number); @@ -81,6 +94,7 @@ public BuilderWithDeprecated.BuilderWithDeprecatedBuilder number(final Integer n } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable numbers) { if (numbers == null) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -91,11 +105,13 @@ public BuilderWithDeprecated.BuilderWithDeprecatedBuilder numbers(final java.lan } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearNumbers() { this.numbers = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecated build() { java.util.List strings; switch (this.strings == null ? 0 : this.strings.size()) { @@ -113,11 +129,13 @@ public BuilderWithDeprecated build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithDeprecated.BuilderWithDeprecatedBuilder(dep1=" + this.dep1 + ", dep2=" + this.dep2 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithDeprecated.BuilderWithDeprecatedBuilder builder() { return new BuilderWithDeprecated.BuilderWithDeprecatedBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java b/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java index d5c06465a9..f6d152337d 100644 --- a/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java +++ b/test/transform/resource/after-delombok/BuilderWithDeprecatedAnnOnly.java @@ -7,20 +7,26 @@ public class BuilderWithDeprecatedAnnOnly { @Deprecated ImmutableList numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithDeprecatedAnnOnly(final int dep1, final java.util.List strings, final ImmutableList numbers) { this.dep1 = dep1; this.strings = strings; this.numbers = numbers; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithDeprecatedAnnOnlyBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int dep1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList strings; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder numbers; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithDeprecatedAnnOnlyBuilder() { } /** @@ -28,12 +34,14 @@ public static class BuilderWithDeprecatedAnnOnlyBuilder { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder dep1(final int dep1) { this.dep1 = dep1; return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder string(final String string) { if (this.strings == null) this.strings = new java.util.ArrayList(); this.strings.add(string); @@ -41,6 +49,7 @@ public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder string(f } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder strings(final java.util.Collection strings) { if (strings == null) { throw new java.lang.NullPointerException("strings cannot be null"); @@ -51,12 +60,14 @@ public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder strings( } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearStrings() { if (this.strings != null) this.strings.clear(); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder number(final Integer number) { if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder(); this.numbers.add(number); @@ -64,6 +75,7 @@ public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder number(f } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder numbers(final java.lang.Iterable numbers) { if (numbers == null) { throw new java.lang.NullPointerException("numbers cannot be null"); @@ -74,11 +86,13 @@ public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder numbers( } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder clearNumbers() { this.numbers = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithDeprecatedAnnOnly build() { java.util.List strings; switch (this.strings == null ? 0 : this.strings.size()) { @@ -96,11 +110,13 @@ public BuilderWithDeprecatedAnnOnly build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder(dep1=" + this.dep1 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder builder() { return new BuilderWithDeprecatedAnnOnly.BuilderWithDeprecatedAnnOnlyBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java index 9c7ac1adb8..63dca1b419 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java @@ -4,19 +4,23 @@ public static BuilderWithExistingBuilderClass stat } public static class BuilderWithExistingBuilderClassBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean arg2; @java.lang.SuppressWarnings("all") + @lombok.Generated private String arg3; private Z arg1; public void arg2(boolean arg) { } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithExistingBuilderClassBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg1(final Z arg1) { this.arg1 = arg1; return this; @@ -25,21 +29,25 @@ public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClass build() { return BuilderWithExistingBuilderClass.staticMethod(this.arg1, this.arg2, this.arg3); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder builder() { return new BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java index c7da67f8fe..bc7ec3f5df 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -4,19 +4,23 @@ public static BuilderWithExistingBuilderClassWithSetterPrefix } public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean arg2; @java.lang.SuppressWarnings("all") + @lombok.Generated private String arg3; private Z arg1; public void withArg2(boolean arg) { } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithExistingBuilderClassWithSetterPrefixBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg1(final Z arg1) { this.arg1 = arg1; return this; @@ -25,21 +29,25 @@ public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilde * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithExistingBuilderClassWithSetterPrefix build() { return BuilderWithExistingBuilderClassWithSetterPrefix.staticMethod(this.arg1, this.arg2, this.arg3); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder builder() { return new BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java index 4a21f2c305..ca056f4d7e 100644 --- a/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-delombok/BuilderWithJavaBeansSpecCapitalization.java @@ -3,29 +3,37 @@ class BuilderWithJavaBeansSpecCapitalization { java.util.List aField; String bField; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithJavaBeansSpecCapitalization(final java.util.List a, final java.util.List aField, final String bField) { this.a = a; this.aField = aField; this.bField = bField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithJavaBeansSpecCapitalizationBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList a; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList aField; @java.lang.SuppressWarnings("all") + @lombok.Generated private String bField; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithJavaBeansSpecCapitalizationBuilder() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setZ(final String z) { if (this.a == null) this.a = new java.util.ArrayList(); this.a.add(z); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setA(final java.util.Collection a) { if (a == null) { throw new java.lang.NullPointerException("a cannot be null"); @@ -35,17 +43,20 @@ public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitaliza return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearA() { if (this.a != null) this.a.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setyField(final String yField) { if (this.aField == null) this.aField = new java.util.ArrayList(); this.aField.add(yField); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setaField(final java.util.Collection aField) { if (aField == null) { throw new java.lang.NullPointerException("aField cannot be null"); @@ -55,6 +66,7 @@ public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitaliza return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder clearaField() { if (this.aField != null) this.aField.clear(); return this; @@ -63,11 +75,13 @@ public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitaliza * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder setbField(final String bField) { this.bField = bField; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithJavaBeansSpecCapitalization build() { java.util.List a; switch (this.a == null ? 0 : this.a.size()) { @@ -95,12 +109,14 @@ public BuilderWithJavaBeansSpecCapitalization build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder(a=" + this.a + ", aField=" + this.aField + ", bField=" + this.bField + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder builder() { return new BuilderWithJavaBeansSpecCapitalization.BuilderWithJavaBeansSpecCapitalizationBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java index 61df442778..cf10f98eb4 100644 --- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java +++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java @@ -1,35 +1,43 @@ class BuilderWithNoBuilderMethod { private String a = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNoBuilderMethod(final String a) { this.a = a; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithNoBuilderMethodBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String a; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNoBuilderMethodBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder a(final String a) { this.a = a; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNoBuilderMethod build() { return new BuilderWithNoBuilderMethod(this.a); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder(a=" + this.a + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder toBuilder() { return new BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder().a(this.a); } diff --git a/test/transform/resource/after-delombok/BuilderWithNonNull.java b/test/transform/resource/after-delombok/BuilderWithNonNull.java index 00728ea732..68f82145cf 100644 --- a/test/transform/resource/after-delombok/BuilderWithNonNull.java +++ b/test/transform/resource/after-delombok/BuilderWithNonNull.java @@ -3,6 +3,7 @@ class BuilderWithNonNull { @lombok.NonNull private final String id; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNonNull(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -10,16 +11,20 @@ class BuilderWithNonNull { this.id = id; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithNonNullBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String id; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNonNullBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNonNull.BuilderWithNonNullBuilder id(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -28,17 +33,20 @@ public BuilderWithNonNull.BuilderWithNonNullBuilder id(@lombok.NonNull final Str return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNonNull build() { return new BuilderWithNonNull(this.id); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithNonNull.BuilderWithNonNullBuilder(id=" + this.id + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithNonNull.BuilderWithNonNullBuilder builder() { return new BuilderWithNonNull.BuilderWithNonNullBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java index f6dfed672e..2ed41f0e91 100644 --- a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java @@ -3,6 +3,7 @@ class BuilderWithNonNullWithSetterPrefix { @lombok.NonNull private final String id; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNonNullWithSetterPrefix(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -10,16 +11,20 @@ class BuilderWithNonNullWithSetterPrefix { this.id = id; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithNonNullWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String id; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithNonNullWithSetterPrefixBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder withId(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); @@ -28,16 +33,19 @@ public BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuil return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithNonNullWithSetterPrefix build() { return new BuilderWithNonNullWithSetterPrefix(this.id); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(id=" + this.id + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder builder() { return new BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java index a96fe1cc50..2e86e34883 100644 --- a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java +++ b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java @@ -6,23 +6,29 @@ public static final class Test, Quz extends Inter, Quz extends Inter> { @java.lang.SuppressWarnings("all") + @lombok.Generated private Foo foo; @java.lang.SuppressWarnings("all") + @lombok.Generated private Bar bar; @java.lang.SuppressWarnings("all") + @lombok.Generated TestBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithRecursiveGenerics.Test.TestBuilder foo(final Foo foo) { this.foo = foo; return this; @@ -31,34 +37,41 @@ public BuilderWithRecursiveGenerics.Test.TestBuilder foo(final Fo * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithRecursiveGenerics.Test.TestBuilder bar(final Bar bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithRecursiveGenerics.Test build() { return new BuilderWithRecursiveGenerics.Test(this.foo, this.bar); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithRecursiveGenerics.Test.TestBuilder(foo=" + this.foo + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static , Quz extends Inter> BuilderWithRecursiveGenerics.Test.TestBuilder builder() { return new BuilderWithRecursiveGenerics.Test.TestBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public Foo getFoo() { return this.foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Bar getBar() { return this.bar; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderWithRecursiveGenerics.Test)) return false; @@ -73,6 +86,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -84,6 +98,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithRecursiveGenerics.Test(foo=" + this.getFoo() + ", bar=" + this.getBar() + ")"; } diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java index 290e473b53..f496730eff 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java +++ b/test/transform/resource/after-delombok/BuilderWithToBuilder.java @@ -8,6 +8,7 @@ public static K rrr(BuilderWithToBuilder x) { return x.foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithToBuilder(final String one, final String two, final T foo, final List bars) { this.mOne = one; this.mTwo = two; @@ -15,22 +16,29 @@ public static K rrr(BuilderWithToBuilder x) { this.bars = bars; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BuilderWithToBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String one; @java.lang.SuppressWarnings("all") + @lombok.Generated private String two; @java.lang.SuppressWarnings("all") + @lombok.Generated private T foo; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList bars; @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithToBuilderBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder one(final String one) { this.one = one; return this; @@ -39,6 +47,7 @@ public BuilderWithToBuilder.BuilderWithToBuilderBuilder one(final String one) * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder two(final String two) { this.two = two; return this; @@ -47,17 +56,20 @@ public BuilderWithToBuilder.BuilderWithToBuilderBuilder two(final String two) * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder foo(final T foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder bar(final T bar) { if (this.bars == null) this.bars = new java.util.ArrayList(); this.bars.add(bar); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder bars(final java.util.Collection bars) { if (bars == null) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -67,11 +79,13 @@ public BuilderWithToBuilder.BuilderWithToBuilderBuilder bars(final java.util. return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder clearBars() { if (this.bars != null) this.bars.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder build() { java.util.List bars; switch (this.bars == null ? 0 : this.bars.size()) { @@ -88,15 +102,18 @@ public BuilderWithToBuilder build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithToBuilder.BuilderWithToBuilderBuilder builder() { return new BuilderWithToBuilder.BuilderWithToBuilderBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithToBuilder.BuilderWithToBuilderBuilder toBuilder() { final T foo = BuilderWithToBuilder.rrr(this); final BuilderWithToBuilder.BuilderWithToBuilderBuilder builder = new BuilderWithToBuilder.BuilderWithToBuilderBuilder().one(this.mOne).two(this.mTwo).foo(foo); @@ -112,20 +129,26 @@ class ConstructorWithToBuilder { public ConstructorWithToBuilder(String mOne, T baz, com.google.common.collect.ImmutableList bars) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class ConstructorWithToBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String mOne; @java.lang.SuppressWarnings("all") + @lombok.Generated private T baz; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList bars; @java.lang.SuppressWarnings("all") + @lombok.Generated ConstructorWithToBuilderBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder mOne(final String mOne) { this.mOne = mOne; return this; @@ -134,6 +157,7 @@ public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder mOne(final St * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder baz(final T baz) { this.baz = baz; return this; @@ -142,76 +166,81 @@ public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder baz(final T b * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder bars(final com.google.common.collect.ImmutableList bars) { this.bars = bars; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorWithToBuilder build() { return new ConstructorWithToBuilder(this.mOne, this.baz, this.bars); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne + ", baz=" + this.baz + ", bars=" + this.bars + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static ConstructorWithToBuilder.ConstructorWithToBuilderBuilder builder() { return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder toBuilder() { return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder().mOne(this.mOne).baz(this.foo).bars(this.bars); } } class StaticMethodWithToBuilder { private T foo; - public StaticMethodWithToBuilder(T foo) { this.foo = foo; } - public static StaticMethodWithToBuilder of(T foo) { return new StaticMethodWithToBuilder(foo); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static class StaticMethodWithToBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private T foo; - @java.lang.SuppressWarnings("all") + @lombok.Generated StaticMethodWithToBuilderBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder foo(final T foo) { this.foo = foo; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public StaticMethodWithToBuilder build() { return StaticMethodWithToBuilder.of(this.foo); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder(foo=" + this.foo + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder builder() { return new StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder toBuilder() { return new StaticMethodWithToBuilder.StaticMethodWithToBuilderBuilder().foo(this.foo); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/BuilderWithTolerate.java b/test/transform/resource/after-delombok/BuilderWithTolerate.java index 79494c4966..ee6259d136 100644 --- a/test/transform/resource/after-delombok/BuilderWithTolerate.java +++ b/test/transform/resource/after-delombok/BuilderWithTolerate.java @@ -6,37 +6,44 @@ public static void main(String[] args) { } public static class BuilderWithTolerateBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int value; @Tolerate public BuilderWithTolerateBuilder value(String s) { return this.value(Integer.parseInt(s)); } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithTolerateBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithTolerate.BuilderWithTolerateBuilder value(final int value) { this.value = value; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public BuilderWithTolerate build() { return new BuilderWithTolerate(this.value); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated BuilderWithTolerate(final int value) { this.value = value; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static BuilderWithTolerate.BuilderWithTolerateBuilder builder() { return new BuilderWithTolerate.BuilderWithTolerateBuilder(); } diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java index bdd7921a65..62c8b0c779 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java @@ -6,16 +6,19 @@ class CheckerFrameworkBasic { private int z; @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") + @lombok.Generated public int getY() { return this.y; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public int getZ() { return this.z; } @@ -23,6 +26,7 @@ public int getZ() { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public @org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBasic setZ(final int z) { this.z = z; return this; @@ -30,6 +34,7 @@ public int getZ() { @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof CheckerFrameworkBasic)) return false; @@ -42,12 +47,14 @@ public boolean equals(final java.lang.Object o) { } @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof CheckerFrameworkBasic; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -59,10 +66,12 @@ public int hashCode() { @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "CheckerFrameworkBasic(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBasic(final int x, final int y, final int z) { this.x = x; this.y = y; @@ -73,6 +82,7 @@ public CheckerFrameworkBasic(final int x, final int y, final int z) { */ @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBasic withX(final int x) { return this.x == x ? this : new CheckerFrameworkBasic(x, this.y, this.z); } diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java index 64f07c37eb..5c31e34675 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java @@ -7,10 +7,12 @@ class CheckerFrameworkBuilder { int z; List names; @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 5; } @java.lang.SuppressWarnings("all") + @lombok.Generated CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { this.x = x; this.y = y; @@ -18,24 +20,32 @@ class CheckerFrameworkBuilder { this.names = names; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class CheckerFrameworkBuilderBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int y; @java.lang.SuppressWarnings("all") + @lombok.Generated private int z; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList names; @java.lang.SuppressWarnings("all") + @lombok.Generated CheckerFrameworkBuilderBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder x(final int x) { this.x$value = x; x$set = true; @@ -45,6 +55,7 @@ public static class CheckerFrameworkBuilderBuilder { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder y(final int y) { this.y = y; return this; @@ -53,17 +64,20 @@ public static class CheckerFrameworkBuilderBuilder { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder z(final int z) { this.z = z; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder name(final String name) { if (this.names == null) this.names = new java.util.ArrayList(); this.names.add(name); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder names(final java.util.Collection names) { if (names == null) { throw new java.lang.NullPointerException("names cannot be null"); @@ -73,12 +87,14 @@ public static class CheckerFrameworkBuilderBuilder { return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder.@org.checkerframework.common.returnsreceiver.qual.This CheckerFrameworkBuilderBuilder clearNames() { if (this.names != null) this.names.clear(); return this; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkBuilder build(CheckerFrameworkBuilder.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) { java.util.List names; switch (this.names == null ? 0 : this.names.size()) { @@ -98,13 +114,14 @@ public CheckerFrameworkBuilder build(CheckerFrameworkBuilder.@org.checkerframewo @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(x$value=" + this.x$value + ", y=" + this.y + ", z=" + this.z + ", names=" + this.names + ")"; } } - @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public static CheckerFrameworkBuilder.@org.checkerframework.common.aliasing.qual.Unique CheckerFrameworkBuilderBuilder builder() { return new CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(); } diff --git a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java index cf00f5fcd1..000b281689 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java @@ -8,25 +8,33 @@ public static class Parent { int z; List names; @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 5; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int y; @java.lang.SuppressWarnings("all") + @lombok.Generated private int z; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList names; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public @org.checkerframework.common.returnsreceiver.qual.This B x(final int x) { this.x$value = x; x$set = true; @@ -36,6 +44,7 @@ public static abstract class ParentBuilder(); this.names.add(name); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public @org.checkerframework.common.returnsreceiver.qual.This B names(final java.util.Collection names) { if (names == null) { throw new java.lang.NullPointerException("names cannot be null"); @@ -64,43 +76,52 @@ public static abstract class ParentBuilder this); @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "CheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value + ", y=" + this.y + ", z=" + this.z + ", names=" + this.names + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") + @lombok.Generated protected CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.common.returnsreceiver.qual.This ParentBuilderImpl self() { return this; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkSuperBuilder.Parent build(CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.calledmethods.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) { return new CheckerFrameworkSuperBuilder.Parent(this); } } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final CheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { if (b.x$set) this.x = b.x$value; else this.x = CheckerFrameworkSuperBuilder.Parent.$default$x(); @@ -121,6 +142,7 @@ protected Parent(final CheckerFrameworkSuperBuilder.Parent.ParentBuilder b } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public static CheckerFrameworkSuperBuilder.Parent.@org.checkerframework.common.aliasing.qual.Unique ParentBuilder builder() { return new CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } @@ -129,21 +151,27 @@ public static class ZChild extends Parent { int a; int b; @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$a() { return 1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ZChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean a$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int a$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int b; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public @org.checkerframework.common.returnsreceiver.qual.This B a(final int a) { this.a$value = a; a$set = true; @@ -153,6 +181,7 @@ public static abstract class ZChildBuilder this); @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder(super=" + super.toString() + ", a$value=" + this.a$value + ", b=" + this.b + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ZChildBuilderImpl extends CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ZChildBuilderImpl() { } @java.lang.Override @org.checkerframework.dataflow.qual.Pure @java.lang.SuppressWarnings("all") + @lombok.Generated protected CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.common.returnsreceiver.qual.This ZChildBuilderImpl self() { return this; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public CheckerFrameworkSuperBuilder.ZChild build(CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.calledmethods.qual.CalledMethods("b") ZChildBuilderImpl this) { return new CheckerFrameworkSuperBuilder.ZChild(this); } } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated protected ZChild(final CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { super(b); if (b.a$set) this.a = b.a$value; @@ -200,8 +237,9 @@ protected ZChild(final CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") + @lombok.Generated public static CheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.common.aliasing.qual.Unique ZChildBuilder builder() { return new CheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java index 769aaf7cf0..5ab2797bae 100644 --- a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java +++ b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java @@ -1,6 +1,7 @@ class GetFoo { private int foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/CommentsInterspersed.java b/test/transform/resource/after-delombok/CommentsInterspersed.java index 833f2ce0a2..d00af73d8b 100644 --- a/test/transform/resource/after-delombok/CommentsInterspersed.java +++ b/test/transform/resource/after-delombok/CommentsInterspersed.java @@ -12,6 +12,7 @@ public class CommentsInterspersed { javascript; }-*/ @java.lang.SuppressWarnings("all") + @lombok.Generated public String getTest() { return this.test; } diff --git a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java index ced4f3f2da..c14e2927c5 100644 --- a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java +++ b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java @@ -1,6 +1,7 @@ class ConflictingStaticConstructorNames { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ConflictingStaticConstructorNames)) return false; @@ -9,21 +10,25 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof ConflictingStaticConstructorNames; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConflictingStaticConstructorNames()"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConflictingStaticConstructorNames() { } } diff --git a/test/transform/resource/after-delombok/ConstructorInner.java b/test/transform/resource/after-delombok/ConstructorInner.java index fb0852dcba..9fd08d3e89 100644 --- a/test/transform/resource/after-delombok/ConstructorInner.java +++ b/test/transform/resource/after-delombok/ConstructorInner.java @@ -1,11 +1,13 @@ class ConstructorInner { static class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private Inner() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static ConstructorInner.Inner of() { return new ConstructorInner.Inner(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/Constructors.java b/test/transform/resource/after-delombok/Constructors.java index b2e51c4082..49227259ec 100644 --- a/test/transform/resource/after-delombok/Constructors.java +++ b/test/transform/resource/after-delombok/Constructors.java @@ -2,6 +2,7 @@ class RequiredArgsConstructor1 { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public RequiredArgsConstructor1(final int x) { this.x = x; } @@ -10,6 +11,7 @@ class RequiredArgsConstructorAccess { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated protected RequiredArgsConstructorAccess(final int x) { this.x = x; } @@ -18,10 +20,12 @@ class RequiredArgsConstructorStaticName { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private RequiredArgsConstructorStaticName(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static RequiredArgsConstructorStaticName staticname(final int x) { return new RequiredArgsConstructorStaticName(x); } @@ -31,6 +35,7 @@ class RequiredArgsConstructorWithAnnotations { String name; @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public RequiredArgsConstructorWithAnnotations(final int x) { this.x = x; } @@ -39,6 +44,7 @@ class AllArgsConstructor1 { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public AllArgsConstructor1(final int x, final String name) { this.x = x; this.name = name; @@ -48,6 +54,7 @@ class NoArgsConstructor1 { int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public NoArgsConstructor1() { } } @@ -55,10 +62,12 @@ class RequiredArgsConstructorStaticNameGenerics { final T x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private RequiredArgsConstructorStaticNameGenerics(final T x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static RequiredArgsConstructorStaticNameGenerics of(final T x) { return new RequiredArgsConstructorStaticNameGenerics(x); } @@ -67,10 +76,12 @@ class RequiredArgsConstructorStaticNameGenerics2 { final Class x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private RequiredArgsConstructorStaticNameGenerics2(final Class x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static RequiredArgsConstructorStaticNameGenerics2 of(final Class x) { return new RequiredArgsConstructorStaticNameGenerics2(x); } @@ -78,6 +89,7 @@ public static RequiredArgsConstructorStaticNameGenerics2 o class AllArgsConstructorPackageAccess { final String x; @java.lang.SuppressWarnings("all") + @lombok.Generated AllArgsConstructorPackageAccess(final String x) { this.x = x; } @@ -91,6 +103,7 @@ class NoArgsConstructor2 { final String s; byte z; @java.lang.SuppressWarnings("all") + @lombok.Generated public NoArgsConstructor2() { this.x = 0; this.y = 0.0; diff --git a/test/transform/resource/after-delombok/ConstructorsConfiguration.java b/test/transform/resource/after-delombok/ConstructorsConfiguration.java index 47b0cc16ca..8c90fd8b23 100644 --- a/test/transform/resource/after-delombok/ConstructorsConfiguration.java +++ b/test/transform/resource/after-delombok/ConstructorsConfiguration.java @@ -1,6 +1,7 @@ class ConstructorsConfiguration { int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsConfiguration(final int x) { this.x = x; } diff --git a/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java b/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java index 7483718fcf..748d9d8cf1 100644 --- a/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java +++ b/test/transform/resource/after-delombok/ConstructorsInAnonymousClass.java @@ -1,15 +1,13 @@ //version 8: import lombok.NonNull; - public class ConstructorsInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; @NonNull private String string2; - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner(final String string, @NonNull final String string2) { if (string2 == null) { throw new java.lang.NullPointerException("string2 is marked non-null but is null"); @@ -17,16 +15,16 @@ public Inner(final String string, @NonNull final String string2) { this.string = string; this.string2 = string2; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner(@NonNull final String string2) { if (string2 == null) { throw new java.lang.NullPointerException("string2 is marked non-null but is null"); } this.string2 = string2; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner() { } } diff --git a/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java b/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java index 2d59681cfc..16d0713d1a 100644 --- a/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java +++ b/test/transform/resource/after-delombok/ConstructorsTypeAnnos.java @@ -12,6 +12,7 @@ class ConstructorsTypeAnnos { @TB List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsTypeAnnos(@TA final List foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java index 7097d5a281..10bafc6913 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java +++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java @@ -4,8 +4,8 @@ class ConstructorsWithAccessors { int pUpper; int _huh; int __huh2; - @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { this.plower = plower; this.pUpper = upper; @@ -13,7 +13,6 @@ public ConstructorsWithAccessors(final int plower, final int upper, final int hu this.__huh2 = _huh2; } } - class ConstructorsWithAccessorsNonNull { @lombok.NonNull Integer plower; @@ -23,8 +22,8 @@ class ConstructorsWithAccessorsNonNull { Integer _huh; @lombok.NonNull final Integer __huh2; - @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithAccessorsNonNull(@lombok.NonNull final Integer plower, @lombok.NonNull final Integer upper, @lombok.NonNull final Integer huh, @lombok.NonNull final Integer _huh2) { if (plower == null) { throw new java.lang.NullPointerException("plower is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java index bcc9a57e3a..a4fb4af7a3 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java +++ b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java @@ -2,24 +2,31 @@ final class ConstructorsWithBuilderDefaults { private final int x; private final int y; @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 5; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class ConstructorsWithBuilderDefaultsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int y; @java.lang.SuppressWarnings("all") + @lombok.Generated ConstructorsWithBuilderDefaultsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final int x) { this.x$value = x; x$set = true; @@ -29,11 +36,13 @@ public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x( * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder y(final int y) { this.y = y; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults build() { int x$value = this.x$value; if (!this.x$set) x$value = ConstructorsWithBuilderDefaults.$default$x(); @@ -41,24 +50,29 @@ public ConstructorsWithBuilderDefaults build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(x$value=" + this.x$value + ", y=" + this.y + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getY() { return this.y; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ConstructorsWithBuilderDefaults)) return false; @@ -69,6 +83,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -78,15 +93,18 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorsWithBuilderDefaults(x=" + this.getX() + ", y=" + this.getY() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults() { this.y = 0; this.x = ConstructorsWithBuilderDefaults.$default$x(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults(final int x, final int y) { this.x = x; this.y = y; diff --git a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java index f62167c608..c23f0d7bda 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java +++ b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java @@ -5,38 +5,49 @@ final class ConstructorsWithBuilderDefaults { private final T x; private final T q; @java.lang.SuppressWarnings("all") + @lombok.Generated private static java.util.List $default$z() { return new java.util.ArrayList(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static T $default$x() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated ConstructorsWithBuilderDefaults(final java.util.List z, final T x, final T q) { this.z = z; this.x = x; this.q = q; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class ConstructorsWithBuilderDefaultsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean z$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.List z$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private T x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private T q; @java.lang.SuppressWarnings("all") + @lombok.Generated ConstructorsWithBuilderDefaultsBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder z(final java.util.List z) { this.z$value = z; z$set = true; @@ -46,6 +57,7 @@ public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final T x) { this.x$value = x; x$set = true; @@ -55,12 +67,13 @@ public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder q(final T q) { this.q = q; return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithBuilderDefaults build() { java.util.List z$value = this.z$value; if (!this.z$set) z$value = ConstructorsWithBuilderDefaults.$default$z(); @@ -70,34 +83,41 @@ public ConstructorsWithBuilderDefaults build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(z$value=" + this.z$value + ", x$value=" + this.x$value + ", q=" + this.q + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private ConstructorsWithBuilderDefaults() { this.q = null; this.z = ConstructorsWithBuilderDefaults.$default$z(); this.x = ConstructorsWithBuilderDefaults.$default$x(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public java.util.List getZ() { return this.z; } @java.lang.SuppressWarnings("all") + @lombok.Generated public T getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public T getQ() { return this.q; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ConstructorsWithBuilderDefaults)) return false; @@ -115,6 +135,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -128,6 +149,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorsWithBuilderDefaults(z=" + this.getZ() + ", x=" + this.getX() + ", q=" + this.getQ() + ")"; } diff --git a/test/transform/resource/after-delombok/ConstructorsWithSuperBuilderDefaults.java b/test/transform/resource/after-delombok/ConstructorsWithSuperBuilderDefaults.java index c5188bb35c..d2df277438 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithSuperBuilderDefaults.java +++ b/test/transform/resource/after-delombok/ConstructorsWithSuperBuilderDefaults.java @@ -1,94 +1,96 @@ class ConstructorsWithSuperBuilderDefaults { int x; int y; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 5; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ConstructorsWithSuperBuilderDefaultsBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int y; - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B x(final int x) { this.x$value = x; x$set = true; return self(); } - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B y(final int y) { this.y = y; return self(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder(x$value=" + this.x$value + ", y=" + this.y + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ConstructorsWithSuperBuilderDefaultsBuilderImpl extends ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ConstructorsWithSuperBuilderDefaultsBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithSuperBuilderDefaults build() { return new ConstructorsWithSuperBuilderDefaults(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected ConstructorsWithSuperBuilderDefaults(final ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder b) { if (b.x$set) this.x = b.x$value; else this.x = ConstructorsWithSuperBuilderDefaults.$default$x(); this.y = b.y; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilder builder() { return new ConstructorsWithSuperBuilderDefaults.ConstructorsWithSuperBuilderDefaultsBuilderImpl(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithSuperBuilderDefaults() { this.x = ConstructorsWithSuperBuilderDefaults.$default$x(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public ConstructorsWithSuperBuilderDefaults(final int x, final int y) { this.x = x; this.y = y; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/DataConfiguration.java b/test/transform/resource/after-delombok/DataConfiguration.java index 6771a6a777..593a60338c 100644 --- a/test/transform/resource/after-delombok/DataConfiguration.java +++ b/test/transform/resource/after-delombok/DataConfiguration.java @@ -1,19 +1,23 @@ class DataConfiguration { final int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public DataConfiguration(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated private DataConfiguration() { this.x = 0; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataConfiguration)) return false; @@ -23,11 +27,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataConfiguration; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -36,6 +42,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataConfiguration(x=" + this.x + ")"; } diff --git a/test/transform/resource/after-delombok/DataExtended.java b/test/transform/resource/after-delombok/DataExtended.java index bcbf2293b8..6925c308e8 100644 --- a/test/transform/resource/after-delombok/DataExtended.java +++ b/test/transform/resource/after-delombok/DataExtended.java @@ -1,18 +1,22 @@ class DataExtended { int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public DataExtended() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataExtended)) return false; @@ -22,11 +26,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataExtended; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -35,6 +41,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataExtended(x=" + this.x + ")"; } diff --git a/test/transform/resource/after-delombok/DataIgnore.java b/test/transform/resource/after-delombok/DataIgnore.java index 309d8150b2..297145be35 100644 --- a/test/transform/resource/after-delombok/DataIgnore.java +++ b/test/transform/resource/after-delombok/DataIgnore.java @@ -2,15 +2,18 @@ class DataIgnore { final int x; String $name; @java.lang.SuppressWarnings("all") + @lombok.Generated public DataIgnore(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataIgnore)) return false; @@ -20,11 +23,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataIgnore; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -33,6 +38,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataIgnore(x=" + this.getX() + ")"; } diff --git a/test/transform/resource/after-delombok/DataInAnonymousClass.java b/test/transform/resource/after-delombok/DataInAnonymousClass.java index 788d7be529..a777ee7bce 100644 --- a/test/transform/resource/after-delombok/DataInAnonymousClass.java +++ b/test/transform/resource/after-delombok/DataInAnonymousClass.java @@ -1,25 +1,24 @@ public class DataInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner() { } - @java.lang.SuppressWarnings("all") + @lombok.Generated public String getString() { return this.string; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public void setString(final String string) { this.string = string; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Inner)) return false; @@ -30,14 +29,14 @@ public boolean equals(final java.lang.Object o) { if (this$string == null ? other$string != null : !this$string.equals(other$string)) return false; return true; } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Inner; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -45,9 +44,9 @@ public int hashCode() { result = result * PRIME + ($string == null ? 43 : $string.hashCode()); return result; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Inner(string=" + this.getString() + ")"; } diff --git a/test/transform/resource/after-delombok/DataOnEnum.java b/test/transform/resource/after-delombok/DataOnEnum.java index 6b5779e8ae..8fb9cfd5a3 100644 --- a/test/transform/resource/after-delombok/DataOnEnum.java +++ b/test/transform/resource/after-delombok/DataOnEnum.java @@ -2,15 +2,18 @@ public enum DataOnEnum { A("hello"); private final String someField; @java.lang.SuppressWarnings("all") + @lombok.Generated public String getSomeField() { return this.someField; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataOnEnum." + this.name() + "(someField=" + this.getSomeField() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated private DataOnEnum(final String someField) { this.someField = someField; } diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java index 0d863f4fee..099140b8aa 100644 --- a/test/transform/resource/after-delombok/DataOnLocalClass.java +++ b/test/transform/resource/after-delombok/DataOnLocalClass.java @@ -5,23 +5,28 @@ class Local { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Local(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local)) return false; @@ -34,11 +39,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -49,6 +56,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Local(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -63,6 +71,7 @@ class InnerLocal { @lombok.NonNull String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public InnerLocal(@lombok.NonNull final String name) { if (name == null) { throw new java.lang.NullPointerException("name is marked non-null but is null"); @@ -71,10 +80,12 @@ public InnerLocal(@lombok.NonNull final String name) { } @lombok.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setName(@lombok.NonNull final String name) { if (name == null) { throw new java.lang.NullPointerException("name is marked non-null but is null"); @@ -83,6 +94,7 @@ public void setName(@lombok.NonNull final String name) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local.InnerLocal)) return false; @@ -94,11 +106,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local.InnerLocal; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -108,20 +122,24 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Local.InnerLocal(name=" + this.getName() + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public Local(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local)) return false; @@ -131,11 +149,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -144,6 +164,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Local(x=" + this.getX() + ")"; } diff --git a/test/transform/resource/after-delombok/DataPlain.java b/test/transform/resource/after-delombok/DataPlain.java index 15b834d9c3..8c130c1dc1 100644 --- a/test/transform/resource/after-delombok/DataPlain.java +++ b/test/transform/resource/after-delombok/DataPlain.java @@ -2,23 +2,28 @@ class Data1 { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Data1(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data1)) return false; @@ -31,11 +36,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data1; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -46,6 +53,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data1(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -54,23 +62,28 @@ class Data2 { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Data2(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data2)) return false; @@ -83,11 +96,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data2; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -98,6 +113,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data2(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -106,23 +122,28 @@ final class Data3 { final int x; String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Data3(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data3)) return false; @@ -135,6 +156,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -145,6 +167,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data3(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -155,20 +178,24 @@ final class Data4 extends java.util.Timer { super(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data4(x=" + this.getX() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data4)) return false; @@ -179,11 +206,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data4; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = super.hashCode(); @@ -193,10 +222,12 @@ public int hashCode() { } class Data5 { @java.lang.SuppressWarnings("all") + @lombok.Generated public Data5() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data5)) return false; @@ -205,27 +236,32 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data5; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data5()"; } } final class Data6 { @java.lang.SuppressWarnings("all") + @lombok.Generated public Data6() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data6)) return false; @@ -233,12 +269,14 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Data6()"; } diff --git a/test/transform/resource/after-delombok/DataWithGetter.java b/test/transform/resource/after-delombok/DataWithGetter.java index b4107bb342..8ad13867e3 100644 --- a/test/transform/resource/after-delombok/DataWithGetter.java +++ b/test/transform/resource/after-delombok/DataWithGetter.java @@ -3,19 +3,23 @@ class DataWithGetter { private int y; private final String z; @java.lang.SuppressWarnings("all") + @lombok.Generated public DataWithGetter(final String z) { this.z = z; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setY(final int y) { this.y = y; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGetter)) return false; @@ -29,11 +33,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGetter; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -45,18 +51,22 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataWithGetter(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getY() { return this.y; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getZ() { return this.z; } diff --git a/test/transform/resource/after-delombok/DataWithGetterNone.java b/test/transform/resource/after-delombok/DataWithGetterNone.java index 4467e40749..48192b21f1 100644 --- a/test/transform/resource/after-delombok/DataWithGetterNone.java +++ b/test/transform/resource/after-delombok/DataWithGetterNone.java @@ -3,19 +3,23 @@ class DataWithGetterNone { private int y; private final String z; @java.lang.SuppressWarnings("all") + @lombok.Generated public DataWithGetterNone(final String z) { this.z = z; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setY(final int y) { this.y = y; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGetterNone)) return false; @@ -29,11 +33,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGetterNone; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -45,6 +51,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataWithGetterNone(x=" + this.x + ", y=" + this.y + ", z=" + this.z + ")"; } diff --git a/test/transform/resource/after-delombok/DataWithOverrideEqualsAndHashCode.java b/test/transform/resource/after-delombok/DataWithOverrideEqualsAndHashCode.java index 7e84dda4be..3fca02d30a 100644 --- a/test/transform/resource/after-delombok/DataWithOverrideEqualsAndHashCode.java +++ b/test/transform/resource/after-delombok/DataWithOverrideEqualsAndHashCode.java @@ -1,23 +1,20 @@ class DataWithOverrideEqualsAndHashCode { - class Data1 { } - class Data2 extends Data1 { public int hashCode() { return 42; } - public boolean equals(Object other) { return false; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public Data2() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "DataWithOverrideEqualsAndHashCode.Data2()"; } diff --git a/test/transform/resource/after-delombok/DelegateGenerics.java b/test/transform/resource/after-delombok/DelegateGenerics.java index 894776eaa9..107d44f641 100644 --- a/test/transform/resource/after-delombok/DelegateGenerics.java +++ b/test/transform/resource/after-delombok/DelegateGenerics.java @@ -1,32 +1,27 @@ public class DelegateGenerics { I1 target; - @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.Integer t(final java.lang.Integer t) { return this.target.t(t); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String i(final java.lang.String a) { return this.target.i(a); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public T a(final T a) { return this.target.a(a); } } - interface I1 extends I2 { } - interface I2 extends I3 { } - interface I3 { T t(T t); - I i(I a); - A a(A a); -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/DelegateOnGetter.java b/test/transform/resource/after-delombok/DelegateOnGetter.java index 76794085e3..37f82d16e8 100644 --- a/test/transform/resource/after-delombok/DelegateOnGetter.java +++ b/test/transform/resource/after-delombok/DelegateOnGetter.java @@ -5,6 +5,7 @@ private interface Bar { int getInt(); } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public Bar getBar() { java.lang.Object $value = this.bar.get(); if ($value == null) { @@ -26,10 +27,12 @@ public int getInt() { return (Bar) ($value == this.bar ? null : $value); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setList(final java.util.ArrayList list) { this.getBar().setList(list); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getInt() { return this.getBar().getInt(); } diff --git a/test/transform/resource/after-delombok/DelegateOnGetterNone.java b/test/transform/resource/after-delombok/DelegateOnGetterNone.java index 1f6eb5be2b..b1dde5dbe6 100644 --- a/test/transform/resource/after-delombok/DelegateOnGetterNone.java +++ b/test/transform/resource/after-delombok/DelegateOnGetterNone.java @@ -5,10 +5,12 @@ private interface Bar { int getInt(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setList(final java.util.ArrayList list) { this.bar.setList(list); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getInt() { return this.bar.getInt(); } diff --git a/test/transform/resource/after-delombok/DelegateOnMethods.java b/test/transform/resource/after-delombok/DelegateOnMethods.java index eb94c6d25b..9753a3f81e 100644 --- a/test/transform/resource/after-delombok/DelegateOnMethods.java +++ b/test/transform/resource/after-delombok/DelegateOnMethods.java @@ -1,13 +1,10 @@ abstract class DelegateOnMethods { public abstract Bar getBar(); - public static interface Bar { void bar(java.util.ArrayList list); } - @java.lang.SuppressWarnings("all") - - + @lombok.Generated public void bar(final java.util.ArrayList list) { this.getBar().bar(list); } diff --git a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java index 921669c728..e9501392cd 100644 --- a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java +++ b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java @@ -1,38 +1,29 @@ class DelegatePlain { private final BarImpl bar = new BarImpl(); private final FooImpl foo = new FooImpl(); - private static class FooImpl implements Foo { public void foo() { } - public void bar(java.util.ArrayList list) { } } - private static class BarImpl implements Bar { public void bar(java.util.ArrayList list) { } } - private static interface Foo extends Bar { void foo(); } - private static interface Bar { void bar(java.util.ArrayList list); } - @java.lang.SuppressWarnings("all") - - + @lombok.Generated public void bar(final java.util.ArrayList list) { this.bar.bar(list); } - @java.lang.SuppressWarnings("all") - - + @lombok.Generated public void foo() { this.foo.foo(); } diff --git a/test/transform/resource/after-delombok/DelegateWithDeprecated.java b/test/transform/resource/after-delombok/DelegateWithDeprecated.java index f487dc874c..3aa65699ad 100644 --- a/test/transform/resource/after-delombok/DelegateWithDeprecated.java +++ b/test/transform/resource/after-delombok/DelegateWithDeprecated.java @@ -11,15 +11,18 @@ private interface Bar { } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public void deprecatedAnnotation() { this.bar.deprecatedAnnotation(); } @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public void deprecatedComment() { this.bar.deprecatedComment(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void notDeprecated() { this.bar.notDeprecated(); } diff --git a/test/transform/resource/after-delombok/DelegateWithVarargs.java b/test/transform/resource/after-delombok/DelegateWithVarargs.java index dadbb4ee3d..923a59b6c6 100644 --- a/test/transform/resource/after-delombok/DelegateWithVarargs.java +++ b/test/transform/resource/after-delombok/DelegateWithVarargs.java @@ -7,18 +7,22 @@ private interface Bar { void arrayVarargs(int[]... arrayVarargs); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void justOneParameter(final int... varargs) { this.bar.justOneParameter(varargs); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void multipleParameters(final java.lang.String first, final int... varargs) { this.bar.multipleParameters(first, varargs); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void array(final int[] array) { this.bar.array(array); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void arrayVarargs(final int[]... arrayVarargs) { this.bar.arrayVarargs(arrayVarargs); } diff --git a/test/transform/resource/after-delombok/DelegateWithVarargs2.java b/test/transform/resource/after-delombok/DelegateWithVarargs2.java index a8ff6e3be5..0ceefc6a1e 100644 --- a/test/transform/resource/after-delombok/DelegateWithVarargs2.java +++ b/test/transform/resource/after-delombok/DelegateWithVarargs2.java @@ -5,8 +5,8 @@ public void varargs(Object[]... keys) { } } @java.lang.SuppressWarnings("all") + @lombok.Generated public void varargs(final java.lang.Object[]... keys) { this.bar.varargs(keys); } } - diff --git a/test/transform/resource/after-delombok/EncodingUsAscii.java b/test/transform/resource/after-delombok/EncodingUsAscii.java index ec35205670..8f42e65c5d 100644 --- a/test/transform/resource/after-delombok/EncodingUsAscii.java +++ b/test/transform/resource/after-delombok/EncodingUsAscii.java @@ -3,6 +3,7 @@ class EncodingUsAscii { String foo\u0e51\u0e51 = "\016\t\b "; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EncodingUsAscii(foo\u0e51\u0e51=" + this.foo\u0e51\u0e51 + ")"; } diff --git a/test/transform/resource/after-delombok/EncodingUtf8.java b/test/transform/resource/after-delombok/EncodingUtf8.java index 1c7751b561..3723b27af5 100644 --- a/test/transform/resource/after-delombok/EncodingUtf8.java +++ b/test/transform/resource/after-delombok/EncodingUtf8.java @@ -2,6 +2,7 @@ class EncodingUtf8 { String foo๑๑ = "\016\t\b "; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EncodingUtf8(foo๑๑=" + this.foo๑๑ + ")"; } diff --git a/test/transform/resource/after-delombok/EqualsAndHashCode.java b/test/transform/resource/after-delombok/EqualsAndHashCode.java index 4eb02ebd6b..a8cbdde20e 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCode.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCode.java @@ -6,6 +6,7 @@ class EqualsAndHashCode { String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode)) return false; @@ -23,11 +24,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -49,6 +52,7 @@ final class EqualsAndHashCode2 { boolean b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode2)) return false; @@ -62,6 +66,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -78,6 +83,7 @@ public int hashCode() { final class EqualsAndHashCode3 extends EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode3)) return false; @@ -86,11 +92,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode3; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -99,6 +107,7 @@ public int hashCode() { class EqualsAndHashCode4 extends EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode4)) return false; @@ -108,11 +117,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode4; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = super.hashCode(); return result; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java b/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java index d99fc71c06..ef9bae67d8 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeAnnotated.java @@ -1,6 +1,5 @@ //version 8: import java.lang.annotation.*; - class EqualsAndHashCodeAnnotated { @Annotated int primitive; @@ -16,6 +15,7 @@ class EqualsAndHashCodeAnnotated { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeAnnotated)) return false; @@ -32,11 +32,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeAnnotated; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -49,4 +51,4 @@ public int hashCode() { result = result * PRIME + java.util.Arrays.deepHashCode(this.moreObjectValues); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeAutoExclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeAutoExclude.java index 711b588db9..2af7b60466 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeAutoExclude.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeAutoExclude.java @@ -4,6 +4,7 @@ class EqualsAndHashCodeAutoExclude { transient String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeAutoExclude)) return false; @@ -13,11 +14,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeAutoExclude; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -31,6 +34,7 @@ class EqualsAndHashCodeAutoExclude2 { transient String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeAutoExclude2)) return false; @@ -46,11 +50,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeAutoExclude2; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -61,4 +67,4 @@ public int hashCode() { result = result * PRIME + ($b == null ? 43 : $b.hashCode()); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeCache.java b/test/transform/resource/after-delombok/EqualsAndHashCodeCache.java index 4f3574b641..52f422324f 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeCache.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeCache.java @@ -1,5 +1,6 @@ class EqualsAndHashCode { @java.lang.SuppressWarnings("all") + @lombok.Generated private transient int $hashCodeCache; int x; boolean[] y; @@ -8,6 +9,7 @@ class EqualsAndHashCode { String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode)) return false; @@ -25,11 +27,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { if (this.$hashCodeCache != 0) return this.$hashCodeCache; final int PRIME = 59; @@ -48,6 +52,7 @@ public int hashCode() { } final class EqualsAndHashCode2 { @java.lang.SuppressWarnings("all") + @lombok.Generated private transient int $hashCodeCache; int x; long y; @@ -56,6 +61,7 @@ final class EqualsAndHashCode2 { boolean b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode2)) return false; @@ -69,6 +75,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { if (this.$hashCodeCache != 0) return this.$hashCodeCache; final int PRIME = 59; @@ -87,9 +94,11 @@ public int hashCode() { } final class EqualsAndHashCode3 extends EqualsAndHashCode { @java.lang.SuppressWarnings("all") + @lombok.Generated private transient int $hashCodeCache; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode3)) return false; @@ -98,11 +107,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode3; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { if (this.$hashCodeCache != 0) return this.$hashCodeCache; int result = 1; @@ -113,9 +124,11 @@ public int hashCode() { } class EqualsAndHashCode4 extends EqualsAndHashCode { @java.lang.SuppressWarnings("all") + @lombok.Generated private transient int $hashCodeCache; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode4)) return false; @@ -125,11 +138,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode4; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { if (this.$hashCodeCache != 0) return this.$hashCodeCache; int result = super.hashCode(); @@ -140,9 +155,11 @@ public int hashCode() { } final class EqualsAndHashCode5 extends EqualsAndHashCode { @java.lang.SuppressWarnings("all") + @lombok.Generated private transient int $hashCodeCache; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode5)) return false; @@ -152,11 +169,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode5; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { if (this.$hashCodeCache != 0) return this.$hashCodeCache; int result = super.hashCode(); diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java index 80a26cee9c..6bfe682a53 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java @@ -1,6 +1,7 @@ class EqualsAndHashCodeConfigKeys1Parent { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys1Parent)) return false; @@ -9,11 +10,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys1Parent; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -23,6 +26,7 @@ class EqualsAndHashCodeConfigKeys1 extends EqualsAndHashCodeConfigKeys1Parent { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys1)) return false; @@ -32,11 +36,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys1; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java index 2ff5e38840..9bf4c873f7 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java @@ -1,6 +1,7 @@ class EqualsAndHashCodeConfigKeys2Object extends Object { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys2Object)) return false; @@ -9,11 +10,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys2Object; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -22,6 +25,7 @@ public int hashCode() { class EqualsAndHashCodeConfigKeys2Parent { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys2Parent)) return false; @@ -30,11 +34,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys2Parent; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -44,6 +50,7 @@ class EqualsAndHashCodeConfigKeys2 extends EqualsAndHashCodeConfigKeys2Parent { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys2)) return false; @@ -54,11 +61,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys2; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = super.hashCode(); diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeEmpty.java b/test/transform/resource/after-delombok/EqualsAndHashCodeEmpty.java index ce3bfcb5f1..a64796eb9d 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeEmpty.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeEmpty.java @@ -1,6 +1,7 @@ class EqualsAndHashCodeEmpty { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeEmpty)) return false; @@ -9,11 +10,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeEmpty; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -22,6 +25,7 @@ public int hashCode() { class EqualsAndHashCodeEmptyWithSuper extends EqualsAndHashCodeEmpty { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeEmptyWithSuper)) return false; @@ -31,11 +35,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeEmptyWithSuper; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = super.hashCode(); return result; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java index 2d64e2fdf3..e5ade16dde 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java @@ -2,6 +2,7 @@ class EqualsAndHashCodeExplicitInclude { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeExplicitInclude)) return false; @@ -10,13 +11,15 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeExplicitInclude; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java b/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java index 6f0b573850..123ffdadff 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeInAnonymousClass.java @@ -1,11 +1,10 @@ public class EqualsAndHashCodeInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Inner)) return false; @@ -16,14 +15,14 @@ public boolean equals(final java.lang.Object o) { if (this$string == null ? other$string != null : !this$string.equals(other$string)) return false; return true; } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Inner; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java b/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java index 8ed883eb8f..4485359407 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java @@ -5,6 +5,7 @@ class Bar { public static class Foo extends Bar implements EqualsAndHashCodeNestedShadow.Foo { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeNestedShadow.Bar.Foo)) return false; @@ -13,11 +14,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeNestedShadow.Bar.Foo; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; @@ -28,6 +31,7 @@ class Baz { public static class Foo extends Bar implements EqualsAndHashCodeNestedShadow.Foo { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeNestedShadow.Baz.Foo)) return false; @@ -36,11 +40,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeNestedShadow.Baz.Foo; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java b/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java index 59c7b80699..6f80f99919 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeNewStyle.java @@ -13,6 +13,7 @@ long i() { int j; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeNewStyle)) return false; @@ -26,11 +27,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeNewStyle; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java index 895da4dbe0..32ffad3c48 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java @@ -3,6 +3,7 @@ final class EqualsAndHashCodeOf { int y; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeOf)) return false; @@ -12,6 +13,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -24,6 +26,7 @@ final class EqualsAndHashCodeExclude { int y; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeExclude)) return false; @@ -33,6 +36,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java b/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java index fcf371b624..7fb05b2502 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java @@ -4,6 +4,7 @@ public class EqualsAndHashCodeRank { int c; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeRank)) return false; @@ -15,11 +16,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeRank; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -28,4 +31,4 @@ public int hashCode() { result = result * PRIME + this.b; return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java index dcad026391..79572f9e18 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java @@ -17,6 +17,7 @@ private boolean canEqual(Object other) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithExistingMethods3)) return false; @@ -28,6 +29,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = super.hashCode(); diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java index 9eb3cdb367..307e873390 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInners.java @@ -4,6 +4,7 @@ class Inner { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithGenericsOnInners.Inner)) return false; @@ -13,11 +14,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithGenericsOnInners.Inner; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -26,4 +29,3 @@ public int hashCode() { } } } - diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java index ed25b3175f..65290fb122 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithGenericsOnInnersInInterfaces.java @@ -3,6 +3,7 @@ class Inner { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner)) return false; @@ -12,11 +13,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithGenericsOnInnersInInterfaces.Inner; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java index 37711004e9..6cae1f4da8 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java @@ -3,6 +3,7 @@ class EqualsAndHashCodeWithNonNullByDefault { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(@javax.annotation.Nullable final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithNonNullByDefault)) return false; @@ -11,11 +12,13 @@ public boolean equals(@javax.annotation.Nullable final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(@javax.annotation.Nullable final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithNonNullByDefault; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java index 91c62b0f8b..1b8ded76cd 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java @@ -1,6 +1,5 @@ @interface Nullable { } - class EqualsAndHashCodeWithOnParam { int x; boolean[] y; @@ -9,6 +8,7 @@ class EqualsAndHashCodeWithOnParam { String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(@Nullable final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithOnParam)) return false; @@ -26,11 +26,13 @@ public boolean equals(@Nullable final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(@Nullable final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithOnParam; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java index b3a1fb0dd0..b20ca22cfb 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java @@ -6,11 +6,12 @@ public int hashCode() { return 42; } @java.lang.SuppressWarnings("all") + @lombok.Generated public EqualsAndHashCodeWithSomeExistingMethods() { - } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EqualsAndHashCodeWithSomeExistingMethods(x=" + this.x + ")"; } @@ -21,10 +22,12 @@ protected boolean canEqual(Object other) { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public EqualsAndHashCodeWithSomeExistingMethods2() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithSomeExistingMethods2)) return false; @@ -35,6 +38,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -43,6 +47,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EqualsAndHashCodeWithSomeExistingMethods2(x=" + this.x + ")"; } @@ -56,10 +61,12 @@ public boolean equals(Object other) { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public EqualsAndHashCodeWithAllExistingMethods() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EqualsAndHashCodeWithAllExistingMethods(x=" + this.x + ")"; } @@ -67,11 +74,12 @@ public java.lang.String toString() { class EqualsAndHashCodeWithNoExistingMethods { int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public EqualsAndHashCodeWithNoExistingMethods() { - } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithNoExistingMethods)) return false; @@ -81,11 +89,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithNoExistingMethods; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -94,6 +104,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "EqualsAndHashCodeWithNoExistingMethods(x=" + this.x + ")"; } diff --git a/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java b/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java index 959bb1e077..0735cbf340 100644 --- a/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java +++ b/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java @@ -1,6 +1,7 @@ class FieldDefaultsViaConfigAndRequiredArgsConstructor { final int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { this.x = x; } diff --git a/test/transform/resource/after-delombok/FieldNameConstantsBasic.java b/test/transform/resource/after-delombok/FieldNameConstantsBasic.java index 0504327ab6..8f8920c542 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsBasic.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsBasic.java @@ -5,6 +5,7 @@ public class FieldNameConstantsBasic { int andMe; String butPrintMePlease; @java.lang.SuppressWarnings("all") + @lombok.Generated static final class Fields { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; public static final java.lang.String butPrintMePlease = "butPrintMePlease"; diff --git a/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java b/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java index 4c2a53e33e..286049e90d 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsConfigKeys.java @@ -1,7 +1,8 @@ public class FieldNameConstantsConfigKeys { String iAmADvdPlayer; @java.lang.SuppressWarnings("all") + @lombok.Generated public static final class Foobar { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/FieldNameConstantsEnum.java b/test/transform/resource/after-delombok/FieldNameConstantsEnum.java index c3fbf0c2c4..816ae13541 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsEnum.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsEnum.java @@ -4,6 +4,7 @@ public class FieldNameConstantsEnum { static double alsoDontSkipMe; int butSkipMe; @java.lang.SuppressWarnings("all") + @lombok.Generated public enum TypeTest { iAmADvdPlayer, $dontSkipMe, alsoDontSkipMe; } diff --git a/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java b/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java index ffaab75e42..21cd2a936f 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java @@ -2,6 +2,7 @@ public record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, int andMe, String butPrintMePlease) { static double skipMeToo; @java.lang.SuppressWarnings("all") + @lombok.Generated static final class Fields { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; public static final java.lang.String butPrintMePlease = "butPrintMePlease"; diff --git a/test/transform/resource/after-delombok/FieldNameConstantsUppercased.java b/test/transform/resource/after-delombok/FieldNameConstantsUppercased.java index dd7de86ade..6357178940 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsUppercased.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsUppercased.java @@ -5,6 +5,7 @@ public class FieldNameConstantsUppercased { int andMe; String butPrintMePlease; @java.lang.SuppressWarnings("all") + @lombok.Generated static final class Fields { public static final java.lang.String I_AM_A_DVD_PLAYER = "iAmADvdPlayer"; public static final java.lang.String BUT_PRINT_ME_PLEASE = "butPrintMePlease"; diff --git a/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java b/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java index e78ee55c22..f7829907d8 100644 --- a/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java +++ b/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java @@ -3,6 +3,7 @@ class GenerateSuppressFBWarnings { int y; @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") + @lombok.Generated public int getY() { return this.y; } diff --git a/test/transform/resource/after-delombok/GeneratedJavaxJakarta.java b/test/transform/resource/after-delombok/GeneratedJavaxJakarta.java index 42f7c2b6de..1be644937c 100644 --- a/test/transform/resource/after-delombok/GeneratedJavaxJakarta.java +++ b/test/transform/resource/after-delombok/GeneratedJavaxJakarta.java @@ -1,9 +1,9 @@ class GeneratedJavaxJakarta { int x; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @jakarta.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/GeneratedOff.java b/test/transform/resource/after-delombok/GeneratedOff.java index 0e4ecf7d0c..a8e561a4ad 100644 --- a/test/transform/resource/after-delombok/GeneratedOff.java +++ b/test/transform/resource/after-delombok/GeneratedOff.java @@ -1,6 +1,7 @@ class GeneratedOff { int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/GeneratedOffJavaxOn.java b/test/transform/resource/after-delombok/GeneratedOffJavaxOn.java index 05c2be090e..928b80f402 100644 --- a/test/transform/resource/after-delombok/GeneratedOffJavaxOn.java +++ b/test/transform/resource/after-delombok/GeneratedOffJavaxOn.java @@ -2,6 +2,7 @@ class GeneratedOffJavaxOn { int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/GeneratedOn.java b/test/transform/resource/after-delombok/GeneratedOn.java index f4976c7aab..3da8a77fd7 100644 --- a/test/transform/resource/after-delombok/GeneratedOn.java +++ b/test/transform/resource/after-delombok/GeneratedOn.java @@ -1,8 +1,8 @@ class GeneratedOn { int x; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/GetterAccessLevel.java b/test/transform/resource/after-delombok/GetterAccessLevel.java index 2574340aaf..9693126713 100644 --- a/test/transform/resource/after-delombok/GetterAccessLevel.java +++ b/test/transform/resource/after-delombok/GetterAccessLevel.java @@ -11,38 +11,47 @@ class GetterAccessLevel { String publicString; String value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean isPrivate() { return this.isPrivate; } @java.lang.SuppressWarnings("all") + @lombok.Generated boolean isPackage() { return this.isPackage; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean isProtected() { return this.isProtected; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @java.lang.SuppressWarnings("all") + @lombok.Generated private String getPrivateString() { return this.privateString; } @java.lang.SuppressWarnings("all") + @lombok.Generated String getPackageString() { return this.packageString; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected String getProtectedString() { return this.protectedString; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getPublicString() { return this.publicString; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getValue() { return this.value; } diff --git a/test/transform/resource/after-delombok/GetterAlreadyExists.java b/test/transform/resource/after-delombok/GetterAlreadyExists.java index d7f32ff198..289fe3492c 100644 --- a/test/transform/resource/after-delombok/GetterAlreadyExists.java +++ b/test/transform/resource/after-delombok/GetterAlreadyExists.java @@ -4,6 +4,7 @@ boolean hasFoo() { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isFoo() { return this.foo; } @@ -26,6 +27,7 @@ String hasFoo() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -36,6 +38,7 @@ String isFoo() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -52,6 +55,7 @@ boolean hasFoo() { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -62,6 +66,7 @@ boolean isFoo() { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -78,6 +83,7 @@ static boolean hasFoo() { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isFoo() { return this.foo; } @@ -100,6 +106,7 @@ static boolean hasFoo() { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -110,6 +117,7 @@ static boolean isFoo() { return false; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -126,6 +134,7 @@ static String hasFoo() { return ""; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } @@ -136,6 +145,7 @@ static String isFoo() { return ""; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterBoolean.java b/test/transform/resource/after-delombok/GetterBoolean.java index 6ac9151257..fb6143c237 100644 --- a/test/transform/resource/after-delombok/GetterBoolean.java +++ b/test/transform/resource/after-delombok/GetterBoolean.java @@ -3,14 +3,17 @@ class Getter { boolean isBar; boolean hasBaz; @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isFoo() { return this.foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isBar() { return this.isBar; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isHasBaz() { return this.hasBaz; } @@ -21,6 +24,7 @@ boolean hasFoo() { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterDeprecated.java b/test/transform/resource/after-delombok/GetterDeprecated.java index af123509c1..78e83ff399 100644 --- a/test/transform/resource/after-delombok/GetterDeprecated.java +++ b/test/transform/resource/after-delombok/GetterDeprecated.java @@ -7,6 +7,7 @@ class GetterDeprecated { int javadoc; @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getAnnotation() { return this.annotation; } @@ -15,6 +16,7 @@ public int getAnnotation() { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getJavadoc() { return this.javadoc; } diff --git a/test/transform/resource/after-delombok/GetterEnum.java b/test/transform/resource/after-delombok/GetterEnum.java index 272a2ee69c..149d38948b 100644 --- a/test/transform/resource/after-delombok/GetterEnum.java +++ b/test/transform/resource/after-delombok/GetterEnum.java @@ -3,15 +3,18 @@ enum GetterEnum { private final int id; private final String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private GetterEnum(final int id, final String name) { this.id = id; this.name = name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getId() { return this.id; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } diff --git a/test/transform/resource/after-delombok/GetterInAnonymousClass.java b/test/transform/resource/after-delombok/GetterInAnonymousClass.java index 3c99054532..6a84f672f7 100644 --- a/test/transform/resource/after-delombok/GetterInAnonymousClass.java +++ b/test/transform/resource/after-delombok/GetterInAnonymousClass.java @@ -1,10 +1,9 @@ public class GetterInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public String getString() { return this.string; } diff --git a/test/transform/resource/after-delombok/GetterLazy.java b/test/transform/resource/after-delombok/GetterLazy.java index 8e1300be1b..01bd42e247 100644 --- a/test/transform/resource/after-delombok/GetterLazy.java +++ b/test/transform/resource/after-delombok/GetterLazy.java @@ -3,6 +3,7 @@ static class ValueType { } private final java.util.concurrent.atomic.AtomicReference fieldName = new java.util.concurrent.atomic.AtomicReference(); @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public ValueType getFieldName() { java.lang.Object $value = this.fieldName.get(); if ($value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyArguments.java b/test/transform/resource/after-delombok/GetterLazyArguments.java index 00b17f5c80..7b5980cd50 100644 --- a/test/transform/resource/after-delombok/GetterLazyArguments.java +++ b/test/transform/resource/after-delombok/GetterLazyArguments.java @@ -3,23 +3,20 @@ class GetterLazyArguments { static String fun() { return null; } - static String stringInt(String arg1, Integer arg2) { return null; } - static String stringRunnable(String arg1, Runnable arg2) { return null; } - private final java.util.concurrent.atomic.AtomicReference field1 = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference field2 = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference field3 = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference field4 = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference field5 = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference field6 = new java.util.concurrent.atomic.AtomicReference(); - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField1() { java.lang.Object $value = this.field1.get(); if ($value == null) { @@ -34,8 +31,8 @@ public String getField1() { } return (String) ($value == this.field1 ? null : $value); } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField2() { java.lang.Object $value = this.field2.get(); if ($value == null) { @@ -50,8 +47,8 @@ public String getField2() { } return (String) ($value == this.field2 ? null : $value); } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField3() { java.lang.Object $value = this.field3.get(); if ($value == null) { @@ -66,8 +63,8 @@ public String getField3() { } return (String) ($value == this.field3 ? null : $value); } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField4() { java.lang.Object $value = this.field4.get(); if ($value == null) { @@ -83,8 +80,8 @@ public String getField4() { } return (String) ($value == this.field4 ? null : $value); } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField5() { java.lang.Object $value = this.field5.get(); if ($value == null) { @@ -100,8 +97,8 @@ public String getField5() { } return (String) ($value == this.field5 ? null : $value); } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField6() { java.lang.Object $value = this.field6.get(); if ($value == null) { @@ -116,4 +113,4 @@ public String getField6() { } return (String) ($value == this.field6 ? null : $value); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/GetterLazyBoolean.java b/test/transform/resource/after-delombok/GetterLazyBoolean.java index 495e6b9254..ea45627ab4 100644 --- a/test/transform/resource/after-delombok/GetterLazyBoolean.java +++ b/test/transform/resource/after-delombok/GetterLazyBoolean.java @@ -6,6 +6,7 @@ private static boolean calculateBoolean() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterLazyBoolean)) return false; @@ -15,11 +16,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterLazyBoolean; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -28,10 +31,12 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "GetterLazyBoolean(booleanValue=" + this.isBooleanValue() + ")"; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public boolean isBooleanValue() { java.lang.Object $value = this.booleanValue.get(); if ($value == null) { @@ -47,6 +52,7 @@ public boolean isBooleanValue() { return (java.lang.Boolean) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public boolean isOtherBooleanValue() { java.lang.Object $value = this.otherBooleanValue.get(); if ($value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyEahcToString.java b/test/transform/resource/after-delombok/GetterLazyEahcToString.java index 3742093ba4..4da740641e 100644 --- a/test/transform/resource/after-delombok/GetterLazyEahcToString.java +++ b/test/transform/resource/after-delombok/GetterLazyEahcToString.java @@ -1,10 +1,9 @@ class GetterLazyEahcToString { - private final java.util.concurrent.atomic.AtomicReference value = new java.util.concurrent.atomic.AtomicReference(); private final String value2 = ""; - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterLazyEahcToString)) return false; @@ -18,16 +17,14 @@ public boolean equals(final java.lang.Object o) { if (this$value2 == null ? other$value2 != null : !this$value2.equals(other$value2)) return false; return true; } - @java.lang.SuppressWarnings("all") - - + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterLazyEahcToString; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -37,14 +34,14 @@ public int hashCode() { result = result * PRIME + ($value2 == null ? 43 : $value2.hashCode()); return result; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "GetterLazyEahcToString(value=" + this.getValue() + ", value2=" + this.value2 + ")"; } - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getValue() { java.lang.Object $value = this.value.get(); if ($value == null) { @@ -59,8 +56,8 @@ public String getValue() { } return (String) ($value == this.value ? null : $value); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public String getValue2() { return this.value2; } diff --git a/test/transform/resource/after-delombok/GetterLazyErrorPosition.java b/test/transform/resource/after-delombok/GetterLazyErrorPosition.java index c901387690..9a8c79ac7e 100644 --- a/test/transform/resource/after-delombok/GetterLazyErrorPosition.java +++ b/test/transform/resource/after-delombok/GetterLazyErrorPosition.java @@ -1,7 +1,7 @@ class GetterLazyErrorPosition { private final java.util.concurrent.atomic.AtomicReference field = new java.util.concurrent.atomic.AtomicReference(); - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getField() { java.lang.Object $value = this.field.get(); if ($value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyGenerics.java b/test/transform/resource/after-delombok/GetterLazyGenerics.java index a8b8ff6c34..bcfc47af98 100644 --- a/test/transform/resource/after-delombok/GetterLazyGenerics.java +++ b/test/transform/resource/after-delombok/GetterLazyGenerics.java @@ -5,6 +5,7 @@ public static E getAny() { return null; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public E getField() { java.lang.Object $value = this.field.get(); if ($value == null) { @@ -20,6 +21,7 @@ public E getField() { return (E) ($value == this.field ? null : $value); } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public long getField2() { java.lang.Object $value = this.field2.get(); if ($value == null) { @@ -34,4 +36,4 @@ public long getField2() { } return (java.lang.Long) $value; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java b/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java index 199437a11d..e1c99bb33e 100644 --- a/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java +++ b/test/transform/resource/after-delombok/GetterLazyInAnonymousClass.java @@ -1,10 +1,9 @@ public class GetterLazyInAnonymousClass { Object annonymous = new Object() { - class Inner { private final java.util.concurrent.atomic.AtomicReference string = new java.util.concurrent.atomic.AtomicReference(); - @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public String getString() { java.lang.Object $value = this.string.get(); if ($value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyInvalid.java b/test/transform/resource/after-delombok/GetterLazyInvalid.java index 81d87c3c15..6151812f45 100644 --- a/test/transform/resource/after-delombok/GetterLazyInvalid.java +++ b/test/transform/resource/after-delombok/GetterLazyInvalid.java @@ -13,6 +13,7 @@ class GetterLazyInvalidNone { class GetterLazyInvalidClass { private final String fieldName = ""; @java.lang.SuppressWarnings("all") + @lombok.Generated public String getFieldName() { return this.fieldName; } diff --git a/test/transform/resource/after-delombok/GetterLazyNative.java b/test/transform/resource/after-delombok/GetterLazyNative.java index a71a0354bc..3c6a6ea53b 100644 --- a/test/transform/resource/after-delombok/GetterLazyNative.java +++ b/test/transform/resource/after-delombok/GetterLazyNative.java @@ -9,6 +9,7 @@ class GetterLazyNative { private final java.util.concurrent.atomic.AtomicReference charField = new java.util.concurrent.atomic.AtomicReference(); private final java.util.concurrent.atomic.AtomicReference intArrayField = new java.util.concurrent.atomic.AtomicReference(); @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public boolean isBooleanField() { java.lang.Object $value = this.booleanField.get(); if ($value == null) { @@ -24,6 +25,7 @@ public boolean isBooleanField() { return (java.lang.Boolean) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public byte getByteField() { java.lang.Object $value = this.byteField.get(); if ($value == null) { @@ -39,6 +41,7 @@ public byte getByteField() { return (java.lang.Byte) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public short getShortField() { java.lang.Object $value = this.shortField.get(); if ($value == null) { @@ -54,6 +57,7 @@ public short getShortField() { return (java.lang.Short) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public int getIntField() { java.lang.Object $value = this.intField.get(); if ($value == null) { @@ -69,6 +73,7 @@ public int getIntField() { return (java.lang.Integer) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public long getLongField() { java.lang.Object $value = this.longField.get(); if ($value == null) { @@ -84,6 +89,7 @@ public long getLongField() { return (java.lang.Long) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public float getFloatField() { java.lang.Object $value = this.floatField.get(); if ($value == null) { @@ -99,6 +105,7 @@ public float getFloatField() { return (java.lang.Float) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public double getDoubleField() { java.lang.Object $value = this.doubleField.get(); if ($value == null) { @@ -114,6 +121,7 @@ public double getDoubleField() { return (java.lang.Double) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public char getCharField() { java.lang.Object $value = this.charField.get(); if ($value == null) { @@ -129,6 +137,7 @@ public char getCharField() { return (java.lang.Character) $value; } @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public int[] getIntArrayField() { java.lang.Object $value = this.intArrayField.get(); if ($value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyTransient.java b/test/transform/resource/after-delombok/GetterLazyTransient.java index 3d1a2be302..cc36246da5 100644 --- a/test/transform/resource/after-delombok/GetterLazyTransient.java +++ b/test/transform/resource/after-delombok/GetterLazyTransient.java @@ -3,6 +3,7 @@ class GetterLazyTransient { private final transient int transientField = 2; private final transient int nonLazyTransientField = 3; @java.lang.SuppressWarnings({"all", "unchecked"}) + @lombok.Generated public int getNonTransientField() { java.lang.Object $value = this.nonTransientField.get(); if ($value == null) { @@ -18,6 +19,7 @@ public int getNonTransientField() { return (java.lang.Integer) $value; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getNonLazyTransientField() { return this.nonLazyTransientField; } diff --git a/test/transform/resource/after-delombok/GetterNone.java b/test/transform/resource/after-delombok/GetterNone.java index 5666f6fe23..6097e5d18b 100644 --- a/test/transform/resource/after-delombok/GetterNone.java +++ b/test/transform/resource/after-delombok/GetterNone.java @@ -2,6 +2,7 @@ class GetterNone { int i; int foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/GetterOnClass.java b/test/transform/resource/after-delombok/GetterOnClass.java index ae845e5462..c316411f5b 100644 --- a/test/transform/resource/after-delombok/GetterOnClass.java +++ b/test/transform/resource/after-delombok/GetterOnClass.java @@ -3,6 +3,7 @@ class GetterOnClass1 { boolean isNone; boolean isPublic; @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @@ -12,10 +13,12 @@ class GetterOnClass2 { boolean isProtected; boolean isPackage; @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean isProtected() { return this.isProtected; } @java.lang.SuppressWarnings("all") + @lombok.Generated boolean isPackage() { return this.isPackage; } @@ -24,6 +27,7 @@ class GetterOnClass3 { boolean isNone; boolean isPackage; @java.lang.SuppressWarnings("all") + @lombok.Generated boolean isPackage() { return this.isPackage; } @@ -32,6 +36,7 @@ class GetterOnClass4 { boolean isNone; boolean isPrivate; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean isPrivate() { return this.isPrivate; } @@ -40,6 +45,7 @@ class GetterOnClass5 { boolean isNone; boolean isPublic; @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @@ -49,11 +55,13 @@ class GetterOnClass6 { @lombok.NonNull String nonNull; @java.lang.SuppressWarnings("all") + @lombok.Generated public String getCouldBeNull() { return this.couldBeNull; } @lombok.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public String getNonNull() { return this.nonNull; } diff --git a/test/transform/resource/after-delombok/GetterOnMethod.java b/test/transform/resource/after-delombok/GetterOnMethod.java index 4a5b36225c..c3ec0b5d59 100644 --- a/test/transform/resource/after-delombok/GetterOnMethod.java +++ b/test/transform/resource/after-delombok/GetterOnMethod.java @@ -6,18 +6,21 @@ class GetterOnMethod { } @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") + @lombok.Generated public int getJ() { return this.j; } @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") + @lombok.Generated public int getK() { return this.k; } diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java index 639022d0c4..3857740bf7 100644 --- a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java +++ b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java @@ -10,38 +10,46 @@ class GetterOnMethodErrors2 { public @interface Test { } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getBad1() { return this.bad1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getBad2() { return this.bad2; } @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getBad3() { return this.bad3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getBad4() { return this.bad4; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGood1() { return this.good1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGood2() { return this.good2; } @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGood3() { return this.good3; } @Deprecated @Test @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGood4() { return this.good4; } diff --git a/test/transform/resource/after-delombok/GetterOnMethodOnType.java b/test/transform/resource/after-delombok/GetterOnMethodOnType.java index 625909c106..f622df40c6 100644 --- a/test/transform/resource/after-delombok/GetterOnMethodOnType.java +++ b/test/transform/resource/after-delombok/GetterOnMethodOnType.java @@ -3,11 +3,13 @@ class GetterOnMethodOnType { private String name; @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public int getTest() { return this.test; } @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } diff --git a/test/transform/resource/after-delombok/GetterOnStatic.java b/test/transform/resource/after-delombok/GetterOnStatic.java index 99e63e052d..2b9ce921d6 100644 --- a/test/transform/resource/after-delombok/GetterOnStatic.java +++ b/test/transform/resource/after-delombok/GetterOnStatic.java @@ -2,10 +2,12 @@ class Getter { static boolean foo; static int bar; @java.lang.SuppressWarnings("all") + @lombok.Generated public static boolean isFoo() { return Getter.foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static int getBar() { return Getter.bar; } diff --git a/test/transform/resource/after-delombok/GetterPlain.java b/test/transform/resource/after-delombok/GetterPlain.java index ceae2aac14..eea46d45a7 100644 --- a/test/transform/resource/after-delombok/GetterPlain.java +++ b/test/transform/resource/after-delombok/GetterPlain.java @@ -2,10 +2,12 @@ class GetterPlain { int i; int foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterSetterJavadoc.java b/test/transform/resource/after-delombok/GetterSetterJavadoc.java index 78d120a449..76afbd2d66 100644 --- a/test/transform/resource/after-delombok/GetterSetterJavadoc.java +++ b/test/transform/resource/after-delombok/GetterSetterJavadoc.java @@ -4,6 +4,7 @@ class GetterSetterJavadoc1 { */ private int fieldName; @java.lang.SuppressWarnings("all") + @lombok.Generated public GetterSetterJavadoc1() { } /** @@ -12,6 +13,7 @@ public GetterSetterJavadoc1() { * @return Sky is blue1 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -21,11 +23,13 @@ public int getFieldName() { * @param fieldName Hello, World1 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterSetterJavadoc1)) return false; @@ -35,11 +39,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterSetterJavadoc1; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -48,6 +54,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "GetterSetterJavadoc1(fieldName=" + this.getFieldName() + ")"; } @@ -63,6 +70,7 @@ class GetterSetterJavadoc2 { * @return Sky is blue2 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -72,6 +80,7 @@ public int getFieldName() { * @param fieldName Hello, World2 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @@ -86,6 +95,7 @@ class GetterSetterJavadoc3 { * @return Sky is blue3 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -94,6 +104,7 @@ public int getFieldName() { * @param fieldName Hello, World3 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @@ -105,20 +116,22 @@ class GetterSetterJavadoc4 { private int fieldName; /** * Some text - * + * * @return Sky is blue4 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int fieldName() { return this.fieldName; } /** * Some text - * + * * @param fieldName Hello, World4 * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public GetterSetterJavadoc4 fieldName(final int fieldName) { this.fieldName = fieldName; return this; @@ -134,6 +147,7 @@ class GetterSetterJavadoc5 { * @return Sky is blue5 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int fieldName() { return this.fieldName; } @@ -143,6 +157,7 @@ public int fieldName() { * @return Sky is blue5 */ @java.lang.SuppressWarnings("all") + @lombok.Generated public GetterSetterJavadoc5 fieldName(final int fieldName) { this.fieldName = fieldName; return this; diff --git a/test/transform/resource/after-delombok/GetterTypeAnnos.java b/test/transform/resource/after-delombok/GetterTypeAnnos.java index 4a22c822ad..02756ab278 100644 --- a/test/transform/resource/after-delombok/GetterTypeAnnos.java +++ b/test/transform/resource/after-delombok/GetterTypeAnnos.java @@ -13,6 +13,7 @@ class GetterTypeAnnos { List foo; @TA @java.lang.SuppressWarnings("all") + @lombok.Generated public List getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterWithDollar.java b/test/transform/resource/after-delombok/GetterWithDollar.java index 5643566548..117539eb70 100644 --- a/test/transform/resource/after-delombok/GetterWithDollar.java +++ b/test/transform/resource/after-delombok/GetterWithDollar.java @@ -1,6 +1,7 @@ class GetterWithDollar1 { int $i; @java.lang.SuppressWarnings("all") + @lombok.Generated public int get$i() { return this.$i; } @@ -9,10 +10,12 @@ class GetterWithDollar2 { int $i; int i; @java.lang.SuppressWarnings("all") + @lombok.Generated public int get$i() { return this.$i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java index 51ccfe630e..99d896289e 100644 --- a/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-delombok/GetterWithJavaBeansSpecCapitalization.java @@ -2,11 +2,13 @@ class GetterWithJavaBeansSpecCapitalization { int a; int aField; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getA() { return this.a; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getaField() { return this.aField; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java b/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java index 6cf390edf7..47aa0f9436 100644 --- a/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java +++ b/test/transform/resource/after-delombok/I2335_BuilderMultipleObtainVia.java @@ -18,18 +18,23 @@ public void setTheLong(Long theLong) { this.theLong = theLong; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class I2335_BuilderMultipleObtainViaBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String theString; @java.lang.SuppressWarnings("all") + @lombok.Generated private Long theLong; @java.lang.SuppressWarnings("all") + @lombok.Generated I2335_BuilderMultipleObtainViaBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theString(final String theString) { this.theString = theString; return this; @@ -38,25 +43,30 @@ public I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theS * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder theLong(final Long theLong) { this.theLong = theLong; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public I2335_BuilderMultipleObtainVia build() { return new I2335_BuilderMultipleObtainVia(this.theString, this.theLong); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder(theString=" + this.theString + ", theLong=" + this.theLong + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder builder() { return new I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public I2335_BuilderMultipleObtainVia.I2335_BuilderMultipleObtainViaBuilder toBuilder() { final String theString = this.getTheString(); final Long theLong = this.getTheLong(); diff --git a/test/transform/resource/after-delombok/InjectField.java b/test/transform/resource/after-delombok/InjectField.java index 98f9762b0c..fa395f8196 100644 --- a/test/transform/resource/after-delombok/InjectField.java +++ b/test/transform/resource/after-delombok/InjectField.java @@ -1,61 +1,52 @@ import java.util.logging.Level; - enum InjectField1 { A, B; - @java.lang.SuppressWarnings("all") - - + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName()); @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.lang.Object $LOCK = new java.lang.Object[0]; - private static final String LOG_MESSAGE = "static initializer"; - private String fieldA; - static { log.log(Level.FINE, LOG_MESSAGE); } - private String fieldB; - void generateLockField() { synchronized (this.$lock) { System.out.println("lock field"); } } - static void generateStaticLockField() { synchronized (InjectField1.$LOCK) { System.out.println("static lock field"); } } } - class InjectField2 { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName()); @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; - private static final String LOG_MESSAGE = "static initializer"; - static { log.log(Level.FINE, LOG_MESSAGE); } - void generateLockField() { synchronized (this.$lock) { System.out.println("lock field"); } } } - class InjectField3 { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName()); static { log.log(Level.FINE, "static initializer"); diff --git a/test/transform/resource/after-delombok/InnerClass.java b/test/transform/resource/after-delombok/InnerClass.java index 2e49b9ad80..1e457a5f81 100644 --- a/test/transform/resource/after-delombok/InnerClass.java +++ b/test/transform/resource/after-delombok/InnerClass.java @@ -3,6 +3,7 @@ class A { class B { String s; @java.lang.SuppressWarnings("all") + @lombok.Generated public B(final String s) { this.s = s; } @@ -16,15 +17,18 @@ A.B test(String s) { }; } @java.lang.SuppressWarnings("all") + @lombok.Generated public D(final A a) { this.a = a; } @java.lang.SuppressWarnings("all") + @lombok.Generated public A getA() { return this.a; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof C.D)) return false; @@ -36,6 +40,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -45,6 +50,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "C.D(a=" + this.getA() + ")"; } diff --git a/test/transform/resource/after-delombok/JacksonBuilderSingular.java b/test/transform/resource/after-delombok/JacksonBuilderSingular.java index b2bbfa5ae6..0426b01427 100644 --- a/test/transform/resource/after-delombok/JacksonBuilderSingular.java +++ b/test/transform/resource/after-delombok/JacksonBuilderSingular.java @@ -16,6 +16,7 @@ public class JacksonBuilderSingular { @JsonProperty("guava_v_a_l_u_e_s") private ImmutableList guavaValues; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonBuilderSingular(final Map any, final List values, final ImmutableMap guavaAny, final ImmutableList guavaValues) { this.any = any; this.values = values; @@ -23,23 +24,31 @@ public class JacksonBuilderSingular { this.guavaValues = guavaValues; } @java.lang.SuppressWarnings("all") + @lombok.Generated @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "", buildMethodName = "build") public static class JacksonBuilderSingularBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList any$key; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList any$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList values; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableMap.Builder guavaAny; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder guavaValues; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonBuilderSingularBuilder() { } @JsonAnySetter @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final String anyKey, final Object anyValue) { if (this.any$key == null) { this.any$key = new java.util.ArrayList(); @@ -50,6 +59,7 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final String any return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final java.util.Map any) { if (any == null) { throw new java.lang.NullPointerException("any cannot be null"); @@ -65,6 +75,7 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder any(final java.util. return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder clearAny() { if (this.any$key != null) { this.any$key.clear(); @@ -73,6 +84,7 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder clearAny() { return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder value(final String value) { if (this.values == null) this.values = new java.util.ArrayList(); this.values.add(value); @@ -80,6 +92,7 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder value(final String v } @JsonProperty("v_a_l_u_e_s") @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder values(final java.util.Collection values) { if (values == null) { throw new java.lang.NullPointerException("values cannot be null"); @@ -89,18 +102,21 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder values(final java.ut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder clearValues() { if (this.values != null) this.values.clear(); return this; } @JsonAnySetter @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final String key, final Object value) { if (this.guavaAny == null) this.guavaAny = com.google.common.collect.ImmutableMap.builder(); this.guavaAny.put(key, value); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final java.util.Map guavaAny) { if (guavaAny == null) { throw new java.lang.NullPointerException("guavaAny cannot be null"); @@ -110,11 +126,13 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaAny(final java. return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaAny() { this.guavaAny = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValue(final String guavaValue) { if (this.guavaValues == null) this.guavaValues = com.google.common.collect.ImmutableList.builder(); this.guavaValues.add(guavaValue); @@ -122,6 +140,7 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValue(final Str } @JsonProperty("guava_v_a_l_u_e_s") @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValues(final java.lang.Iterable guavaValues) { if (guavaValues == null) { throw new java.lang.NullPointerException("guavaValues cannot be null"); @@ -131,11 +150,13 @@ public JacksonBuilderSingular.JacksonBuilderSingularBuilder guavaValues(final ja return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular.JacksonBuilderSingularBuilder clearGuavaValues() { this.guavaValues = null; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonBuilderSingular build() { java.util.Map any; switch (this.any$key == null ? 0 : this.any$key.size()) { @@ -167,12 +188,14 @@ public JacksonBuilderSingular build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonBuilderSingular.JacksonBuilderSingularBuilder(any$key=" + this.any$key + ", any$value=" + this.any$value + ", values=" + this.values + ", guavaAny=" + this.guavaAny + ", guavaValues=" + this.guavaValues + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonBuilderSingular.JacksonBuilderSingularBuilder builder() { return new JacksonBuilderSingular.JacksonBuilderSingularBuilder(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/JacksonJsonProperty.java b/test/transform/resource/after-delombok/JacksonJsonProperty.java index 7bb17dfdf5..844062b124 100644 --- a/test/transform/resource/after-delombok/JacksonJsonProperty.java +++ b/test/transform/resource/after-delombok/JacksonJsonProperty.java @@ -7,14 +7,18 @@ public class JacksonJsonProperty { @JsonSetter(nulls = Nulls.SKIP) public String kebabCaseProp; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonJsonProperty(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class JacksonJsonPropertyBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String kebabCaseProp; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonJsonPropertyBuilder() { } /** @@ -23,28 +27,33 @@ public static class JacksonJsonPropertyBuilder { @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonJsonProperty.JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonJsonProperty build() { return new JacksonJsonProperty(this.kebabCaseProp); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonJsonProperty.JacksonJsonPropertyBuilder(kebabCaseProp=" + this.kebabCaseProp + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonJsonProperty.JacksonJsonPropertyBuilder builder() { return new JacksonJsonProperty.JacksonJsonPropertyBuilder(); } @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") + @lombok.Generated public void setKebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java b/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java index ed0ca9e765..067e105f63 100644 --- a/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java +++ b/test/transform/resource/after-delombok/JacksonizedBuilderComplex.java @@ -6,23 +6,30 @@ class JacksonizedBuilderComplex { private static void testVoidWithGenerics(T number, int arg2, String arg3, JacksonizedBuilderComplex selfRef) { } @java.lang.SuppressWarnings("all") + @lombok.Generated @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "with", buildMethodName = "execute") public static class TestVoidName { @java.lang.SuppressWarnings("all") + @lombok.Generated private T number; @java.lang.SuppressWarnings("all") + @lombok.Generated private int arg2; @java.lang.SuppressWarnings("all") + @lombok.Generated private String arg3; @java.lang.SuppressWarnings("all") + @lombok.Generated private JacksonizedBuilderComplex selfRef; @java.lang.SuppressWarnings("all") + @lombok.Generated TestVoidName() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderComplex.TestVoidName withNumber(final T number) { this.number = number; return this; @@ -31,6 +38,7 @@ public JacksonizedBuilderComplex.TestVoidName withNumber(final T number) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderComplex.TestVoidName withArg2(final int arg2) { this.arg2 = arg2; return this; @@ -39,6 +47,7 @@ public JacksonizedBuilderComplex.TestVoidName withArg2(final int arg2) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderComplex.TestVoidName withArg3(final String arg3) { this.arg3 = arg3; return this; @@ -47,22 +56,26 @@ public JacksonizedBuilderComplex.TestVoidName withArg3(final String arg3) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderComplex.TestVoidName withSelfRef(final JacksonizedBuilderComplex selfRef) { this.selfRef = selfRef; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void execute() { JacksonizedBuilderComplex.testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonizedBuilderComplex.TestVoidName(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonizedBuilderComplex.TestVoidName builder() { return new JacksonizedBuilderComplex.TestVoidName(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java b/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java index cb8390d24d..8ab09506b9 100644 --- a/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java +++ b/test/transform/resource/after-delombok/JacksonizedBuilderSimple.java @@ -9,25 +9,31 @@ class JacksonizedBuilderSimple { private List also; private int $butNotMe; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonizedBuilderSimple(final int yes, final List also) { this.yes = yes; this.also = also; } @java.lang.SuppressWarnings("all") + @lombok.Generated @JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "", buildMethodName = "build") protected static class JacksonizedBuilderSimpleBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") + @lombok.Generated private List also; @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonizedBuilderSimpleBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; @@ -36,21 +42,25 @@ public JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder yes(final int * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedBuilderSimple build() { return new JacksonizedBuilderSimple(this.yes, this.also); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected static JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder builder() { return new JacksonizedBuilderSimple.JacksonizedBuilderSimpleBuilder(); } diff --git a/test/transform/resource/after-delombok/JacksonizedOnRecord.java b/test/transform/resource/after-delombok/JacksonizedOnRecord.java index af7d961c0e..0798d01cd4 100644 --- a/test/transform/resource/after-delombok/JacksonizedOnRecord.java +++ b/test/transform/resource/after-delombok/JacksonizedOnRecord.java @@ -4,43 +4,44 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; - @JsonIgnoreProperties @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = JacksonizedOnRecord.JacksonizedOnRecordBuilder.class) public record JacksonizedOnRecord(@JsonProperty("test") @Nullable String string, @JsonAnySetter List values) { - @java.lang.SuppressWarnings("all") + @lombok.Generated @JsonIgnoreProperties @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "", buildMethodName = "build") public static class JacksonizedOnRecordBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String string; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList values; - @java.lang.SuppressWarnings("all") + @lombok.Generated JacksonizedOnRecordBuilder() { } - /** * @return {@code this}. */ @JsonProperty("test") @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedOnRecord.JacksonizedOnRecordBuilder string(@Nullable final String string) { this.string = string; return this; } - @JsonAnySetter @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedOnRecord.JacksonizedOnRecordBuilder value(final String value) { if (this.values == null) this.values = new java.util.ArrayList(); this.values.add(value); return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedOnRecord.JacksonizedOnRecordBuilder values(final java.util.Collection values) { if (values == null) { throw new java.lang.NullPointerException("values cannot be null"); @@ -49,14 +50,14 @@ public JacksonizedOnRecord.JacksonizedOnRecordBuilder values(final java.util.Col this.values.addAll(values); return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedOnRecord.JacksonizedOnRecordBuilder clearValues() { if (this.values != null) this.values.clear(); return this; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedOnRecord build() { java.util.List values; switch (this.values == null ? 0 : this.values.size()) { @@ -71,15 +72,15 @@ public JacksonizedOnRecord build() { } return new JacksonizedOnRecord(this.string, values); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonizedOnRecord.JacksonizedOnRecordBuilder(string=" + this.string + ", values=" + this.values + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonizedOnRecord.JacksonizedOnRecordBuilder builder() { return new JacksonizedOnRecord.JacksonizedOnRecordBuilder(); } diff --git a/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java b/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java index a07d9dfcfc..3d147e2a85 100644 --- a/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java +++ b/test/transform/resource/after-delombok/JacksonizedSuperBuilderSimple.java @@ -5,50 +5,62 @@ public class JacksonizedSuperBuilderSimple { public static class Parent { int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final int field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonizedSuperBuilderSimple.Parent.ParentBuilder(field1=" + this.field1 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true) @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "", buildMethodName = "build") static final class ParentBuilderImpl extends JacksonizedSuperBuilderSimple.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedSuperBuilderSimple.Parent build() { return new JacksonizedSuperBuilderSimple.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final JacksonizedSuperBuilderSimple.Parent.ParentBuilder b) { this.field1 = b.field1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonizedSuperBuilderSimple.Parent.ParentBuilder builder() { return new JacksonizedSuperBuilderSimple.Parent.ParentBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java b/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java index 307537aea0..d851a184b7 100644 --- a/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java +++ b/test/transform/resource/after-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java @@ -3,49 +3,61 @@ public class JacksonizedSuperBuilderWithJsonDeserialize { int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class JacksonizedSuperBuilderWithJsonDeserializeBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final int field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder(field1=" + this.field1 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl extends JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public JacksonizedSuperBuilderWithJsonDeserialize build() { return new JacksonizedSuperBuilderWithJsonDeserialize(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected JacksonizedSuperBuilderWithJsonDeserialize(final JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder b) { this.field1 = b.field1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilder builder() { return new JacksonizedSuperBuilderWithJsonDeserialize.JacksonizedSuperBuilderWithJsonDeserializeBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/JavadocMultiline.java b/test/transform/resource/after-delombok/JavadocMultiline.java index cc8b1148c8..e53a197bfa 100644 --- a/test/transform/resource/after-delombok/JavadocMultiline.java +++ b/test/transform/resource/after-delombok/JavadocMultiline.java @@ -7,7 +7,6 @@ class JavadocMultiline { * This is a list of booleans. */ private java.util.List booleans2; - /** * This is a list of booleans. * @@ -15,18 +14,18 @@ class JavadocMultiline { * enough to wrap to multiple lines. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public java.util.List getBooleans() { return this.booleans; } - /** * This is a list of booleans. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public java.util.List getBooleans2() { return this.booleans2; } - /** * This is a list of booleans. * @@ -34,10 +33,10 @@ public java.util.List getBooleans2() { * long enough to wrap to multiple lines. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setBooleans(final java.util.List booleans) { this.booleans = booleans; } - /** * This is a list of booleans. * @@ -45,7 +44,8 @@ public void setBooleans(final java.util.List booleans) { * long enough to wrap to multiple lines. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setBooleans2(final java.util.List booleans2) { this.booleans2 = booleans2; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LockedInInitializer.java b/test/transform/resource/after-delombok/LockedInInitializer.java index a4b687fca6..f1577a0749 100644 --- a/test/transform/resource/after-delombok/LockedInInitializer.java +++ b/test/transform/resource/after-delombok/LockedInInitializer.java @@ -1,6 +1,7 @@ public class LockedInInitializer { public static final Runnable LOCKED = new Runnable() { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); @Override public void run() { @@ -14,6 +15,7 @@ public void run() { }; public static final Runnable LOCKED_READ = new Runnable() { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); @Override public void run() { @@ -27,6 +29,7 @@ public void run() { }; public static final Runnable LOCKED_WRITE = new Runnable() { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); @Override public void run() { diff --git a/test/transform/resource/after-delombok/LockedPlain.java b/test/transform/resource/after-delombok/LockedPlain.java index bdc4e2a493..c6ac1c0faf 100644 --- a/test/transform/resource/after-delombok/LockedPlain.java +++ b/test/transform/resource/after-delombok/LockedPlain.java @@ -1,5 +1,6 @@ class LockedPlain { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); void test() { this.$lock.lock(); @@ -20,6 +21,7 @@ void test2() { } class LockedPlainStatic { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.concurrent.locks.Lock $LOCK = new java.util.concurrent.locks.ReentrantLock(); static void test() { LockedPlainStatic.$LOCK.lock(); @@ -40,6 +42,7 @@ static void test2() { } class LockedPlainRead { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.concurrent.locks.ReadWriteLock $LOCK = new java.util.concurrent.locks.ReentrantReadWriteLock(); static void test() { LockedPlainRead.$LOCK.readLock().lock(); @@ -60,6 +63,7 @@ static void test2() { } class LockedPlainWrite { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); void test() { this.$lock.writeLock().lock(); diff --git a/test/transform/resource/after-delombok/LockedStaticMix.java b/test/transform/resource/after-delombok/LockedStaticMix.java index e546124876..c1ab5e77b9 100644 --- a/test/transform/resource/after-delombok/LockedStaticMix.java +++ b/test/transform/resource/after-delombok/LockedStaticMix.java @@ -1,5 +1,6 @@ class LockedGeneratedStaticMismatch { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.concurrent.locks.Lock $LOCK = new java.util.concurrent.locks.ReentrantLock(); static void test() { LockedGeneratedStaticMismatch.$LOCK.lock(); diff --git a/test/transform/resource/after-delombok/LockedTypeMismatch.java b/test/transform/resource/after-delombok/LockedTypeMismatch.java index eb0a4b19e1..e41f9e35ab 100644 --- a/test/transform/resource/after-delombok/LockedTypeMismatch.java +++ b/test/transform/resource/after-delombok/LockedTypeMismatch.java @@ -1,5 +1,6 @@ class LockedGeneratedTypeMismatch { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); void test() { this.$lock.lock(); diff --git a/test/transform/resource/after-delombok/LoggerCommons.java b/test/transform/resource/after-delombok/LoggerCommons.java index 4b943da7fa..9336c0b01e 100644 --- a/test/transform/resource/after-delombok/LoggerCommons.java +++ b/test/transform/resource/after-delombok/LoggerCommons.java @@ -1,17 +1,21 @@ class LoggerCommons { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class); } class LoggerCommonsWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class); } class LoggerCommonsWithDifferentName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("DifferentName"); } class LoggerCommonsWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithStaticField.TOPIC); static final String TOPIC = "StaticField"; -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerConfig.java b/test/transform/resource/after-delombok/LoggerConfig.java index d0944126b9..29bd330dc1 100644 --- a/test/transform/resource/after-delombok/LoggerConfig.java +++ b/test/transform/resource/after-delombok/LoggerConfig.java @@ -1,4 +1,5 @@ class LoggerWithConfig { @java.lang.SuppressWarnings("all") + @lombok.Generated private final org.slf4j.Logger myLogger = org.slf4j.LoggerFactory.getLogger(LoggerWithConfig.class); } diff --git a/test/transform/resource/after-delombok/LoggerCustom.java b/test/transform/resource/after-delombok/LoggerCustom.java index 4a33e8a9ac..184b1440ce 100644 --- a/test/transform/resource/after-delombok/LoggerCustom.java +++ b/test/transform/resource/after-delombok/LoggerCustom.java @@ -1,13 +1,12 @@ class LoggerCustomLog { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final MyLogger log = MyLoggerFactory.create(LoggerCustomLog.class); } - class MyLoggerFactory { static MyLogger create(Class clazz) { return null; } } - class MyLogger { -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerCustomWithPackage.java b/test/transform/resource/after-delombok/LoggerCustomWithPackage.java index 45e741c2b1..065369cc69 100644 --- a/test/transform/resource/after-delombok/LoggerCustomWithPackage.java +++ b/test/transform/resource/after-delombok/LoggerCustomWithPackage.java @@ -1,14 +1,13 @@ package before; class LoggerCustomLog { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final before.MyLogger log = before.MyLoggerFactory.create(LoggerCustomLog.class); } - class MyLoggerFactory { static MyLogger create(Class clazz) { return null; } } - class MyLogger { -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerCustomWithTopicAndName.java b/test/transform/resource/after-delombok/LoggerCustomWithTopicAndName.java index 4db02cc1d9..f6d7fae194 100644 --- a/test/transform/resource/after-delombok/LoggerCustomWithTopicAndName.java +++ b/test/transform/resource/after-delombok/LoggerCustomWithTopicAndName.java @@ -1,16 +1,16 @@ class LoggerCustomLog { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final MyLoggerFactory log = MyLoggerFactory.create(LoggerCustomLog.class.getName(), "t", null, LoggerCustomLog.class, "t"); } - class LoggerCustomLogWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final MyLoggerFactory log = MyLoggerFactory.create(LoggerCustomLogWithStaticField.class.getName(), LoggerCustomLogWithStaticField.TOPIC, null, LoggerCustomLogWithStaticField.class, LoggerCustomLogWithStaticField.TOPIC); static final String TOPIC = "StaticField"; } - class MyLoggerFactory { static MyLoggerFactory create(String name, String t1, Object o, Class clazz, String t2) { return null; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerFlogger.java b/test/transform/resource/after-delombok/LoggerFlogger.java index 0fe8083ad9..0636fd7276 100644 --- a/test/transform/resource/after-delombok/LoggerFlogger.java +++ b/test/transform/resource/after-delombok/LoggerFlogger.java @@ -1,26 +1,31 @@ class LoggerFlogger { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } class LoggerFloggerWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } class LoggerFloggerOuter { static class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } } enum LoggerFloggerWithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } class LoggerFloggerWithInnerEnum { enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } } diff --git a/test/transform/resource/after-delombok/LoggerFloggerRecord.java b/test/transform/resource/after-delombok/LoggerFloggerRecord.java index 98ad3c7c86..d2c9570849 100644 --- a/test/transform/resource/after-delombok/LoggerFloggerRecord.java +++ b/test/transform/resource/after-delombok/LoggerFloggerRecord.java @@ -2,6 +2,7 @@ class LoggerFloggerRecord { public record Inner(String x) { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerJBossLog.java b/test/transform/resource/after-delombok/LoggerJBossLog.java index 1f2a240ff0..2a242adcf7 100644 --- a/test/transform/resource/after-delombok/LoggerJBossLog.java +++ b/test/transform/resource/after-delombok/LoggerJBossLog.java @@ -1,37 +1,42 @@ class LoggerJBossLog { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLog.class); } class LoggerJBossLogWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithImport.class); } class LoggerJBossLogOuter { static class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); } } enum LoggerJBossLogWithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithEnum.class); } class LoggerJBossLogWithInnerEnum { enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); } } - class LoggerJBossLogWithDifferentLoggerName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger("DifferentLogger"); } - class LoggerJBossLogWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithStaticField.TOPIC); static final String TOPIC = "StaticField"; -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerJul.java b/test/transform/resource/after-delombok/LoggerJul.java index 471e614c67..98b919c8c7 100644 --- a/test/transform/resource/after-delombok/LoggerJul.java +++ b/test/transform/resource/after-delombok/LoggerJul.java @@ -1,30 +1,35 @@ class LoggerJul { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName()); } class LoggerJulWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName()); } class LoggerJulWithDifferentName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("DifferentName"); } class LoggerJulWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithStaticField.TOPIC); static final String TOPIC = "StaticField"; } enum LoggerJulWithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithEnum.class.getName()); } class LoggerJulWithInnerEnum { - enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(Inner.class.getName()); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerLog4j.java b/test/transform/resource/after-delombok/LoggerLog4j.java index c07e14fa2d..4e3083c4bd 100644 --- a/test/transform/resource/after-delombok/LoggerLog4j.java +++ b/test/transform/resource/after-delombok/LoggerLog4j.java @@ -1,30 +1,35 @@ class LoggerLog4j { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class); } class LoggerLog4jWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class); } class LoggerLog4jWithDifferentName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("DifferentName"); } class LoggerLog4jWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithStaticField.TOPIC); static final String TOPIC = "StaticField"; } enum LoggerLog4jWithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithEnum.class); } class LoggerLog4jWithInnerEnum { - enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(Inner.class); } } diff --git a/test/transform/resource/after-delombok/LoggerLog4j2.java b/test/transform/resource/after-delombok/LoggerLog4j2.java index 5db281be94..f2c79cf1fa 100644 --- a/test/transform/resource/after-delombok/LoggerLog4j2.java +++ b/test/transform/resource/after-delombok/LoggerLog4j2.java @@ -1,31 +1,36 @@ //version 8: class LoggerLog4j2 { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class); } class LoggerLog4j2WithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class); } class LoggerLog4j2WithDifferentName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger("DifferentName"); } class LoggerLog4j2WithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithStaticField.TOPIC); static final String TOPIC = "StaticField"; } enum LoggerLog4j2WithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithEnum.class); } class LoggerLog4j2WithInnerEnum { - enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(Inner.class); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/LoggerSlf4j.java b/test/transform/resource/after-delombok/LoggerSlf4j.java index 099a65ad1d..7b5b5945e8 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4j.java +++ b/test/transform/resource/after-delombok/LoggerSlf4j.java @@ -1,43 +1,48 @@ class LoggerSlf4j { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); } class LoggerSlf4jWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class); } enum LoggerSlf4jWithEnum { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithEnum.class); } class LoggerSlf4jWithInnerEnum { enum Inner { CONSTANT; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } class LoggerSlf4jOuter { static class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } - class LoggerSlf4jWithDifferentLoggerName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("DifferentLogger"); } - class LoggerSlf4jWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithStaticField.TOPIC); static final String TOPIC = "StaticField"; } - class LoggerSlf4jWithTwoStaticFields { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithTwoStaticFields.TOPIC + LoggerSlf4jWithTwoStaticFields.TOPIC); static final String TOPIC = "StaticField"; } diff --git a/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java b/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java index 831ac357e7..079896f34b 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java @@ -1,5 +1,6 @@ // version 16: the SuppressWarnings is not emitted in java14/15 to work around a javac bug. public record LoggerSlf4jOnRecord(String a, String b) { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class); } diff --git a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java index 6730e8058a..1d738279c0 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java @@ -5,16 +5,19 @@ interface LoggerSlf4jTypesInterface { enum LoggerSlf4jTypesEnum { ; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class); } enum LoggerSlf4jTypesEnumWithElement { FOO; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class); } interface LoggerSlf4jTypesInterfaceOuter { class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java index b82ed6ec35..bc29a7bed1 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java @@ -1,11 +1,13 @@ package before; class LoggerSlf4jWithPackage { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class); } class LoggerSlf4jWithPackageOuter { static class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } diff --git a/test/transform/resource/after-delombok/LoggerXSlf4j.java b/test/transform/resource/after-delombok/LoggerXSlf4j.java index ba0ec3f824..102dc06281 100644 --- a/test/transform/resource/after-delombok/LoggerXSlf4j.java +++ b/test/transform/resource/after-delombok/LoggerXSlf4j.java @@ -1,17 +1,21 @@ class LoggerXSlf4j { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4j.class); } class LoggerXSlf4jWithImport { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithImport.class); } class LoggerXSlf4jWithDifferentName { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger("DifferentName"); } class LoggerXSlf4jWithStaticField { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithStaticField.TOPIC); static final String TOPIC = "StaticField"; -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/MultiFieldGetter.java b/test/transform/resource/after-delombok/MultiFieldGetter.java index 3586a7e60a..8e5971a626 100644 --- a/test/transform/resource/after-delombok/MultiFieldGetter.java +++ b/test/transform/resource/after-delombok/MultiFieldGetter.java @@ -2,10 +2,12 @@ class MultiFieldGetter { int x; int y; @java.lang.SuppressWarnings("all") + @lombok.Generated protected int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected int getY() { return this.y; } @@ -14,10 +16,12 @@ class MultiFieldGetter2 { int x; int y; @java.lang.SuppressWarnings("all") + @lombok.Generated int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated int getY() { return this.y; } diff --git a/test/transform/resource/after-delombok/NoArgsConstructorForce.java b/test/transform/resource/after-delombok/NoArgsConstructorForce.java index d4bfcda29d..5df396815f 100644 --- a/test/transform/resource/after-delombok/NoArgsConstructorForce.java +++ b/test/transform/resource/after-delombok/NoArgsConstructorForce.java @@ -1,11 +1,10 @@ - public class NoArgsConstructorForce { private final int[] i; private final Object[] o; private final java.util.List[] fullQualifiedList; private final String alreadyInitialized = "yes"; - @java.lang.SuppressWarnings("all") + @lombok.Generated public NoArgsConstructorForce() { this.i = null; this.o = null; diff --git a/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java b/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java index b354a85d51..cce2b0b3b1 100644 --- a/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java +++ b/test/transform/resource/after-delombok/NoPrivateNoArgsConstructor.java @@ -2,15 +2,18 @@ public class NoPrivateNoArgsConstructor { public static class NoPrivateNoArgsConstructorData { private final int i; @java.lang.SuppressWarnings("all") + @lombok.Generated public NoPrivateNoArgsConstructorData(final int i) { this.i = i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData)) return false; @@ -20,11 +23,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -33,6 +38,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorData(i=" + this.getI() + ")"; } @@ -40,15 +46,18 @@ public java.lang.String toString() { public static final class NoPrivateNoArgsConstructorValue { private final int i; @java.lang.SuppressWarnings("all") + @lombok.Generated public NoPrivateNoArgsConstructorValue(final int i) { this.i = i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue)) return false; @@ -58,6 +67,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -66,8 +76,9 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "NoPrivateNoArgsConstructor.NoPrivateNoArgsConstructorValue(i=" + this.getI() + ")"; } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java b/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java index dec9126171..46f5cb6a7c 100644 --- a/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java +++ b/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java @@ -2,6 +2,7 @@ import lombok.NonNull; public record NonNullExistingConstructorOnRecord(@NonNull String a, @NonNull String b) { @java.lang.SuppressWarnings("all") + @lombok.Generated public NonNullExistingConstructorOnRecord { if (a == null) { throw new java.lang.NullPointerException("a is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/NonNullOnRecordSimple.java b/test/transform/resource/after-delombok/NonNullOnRecordSimple.java index 2a772c9322..5346b51384 100644 --- a/test/transform/resource/after-delombok/NonNullOnRecordSimple.java +++ b/test/transform/resource/after-delombok/NonNullOnRecordSimple.java @@ -2,6 +2,7 @@ import lombok.NonNull; public record NonNullOnRecordSimple(@NonNull String a, @NonNull String b) { @java.lang.SuppressWarnings("all") + @lombok.Generated public NonNullOnRecordSimple { if (a == null) { throw new java.lang.NullPointerException("a is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/NonNullOnRecordTypeUse.java b/test/transform/resource/after-delombok/NonNullOnRecordTypeUse.java index e5b78f1c9c..cac07cd1b0 100644 --- a/test/transform/resource/after-delombok/NonNullOnRecordTypeUse.java +++ b/test/transform/resource/after-delombok/NonNullOnRecordTypeUse.java @@ -2,6 +2,7 @@ import lombok.NonNull; public record NonNullOnRecordTypeUse(@NonNull int[] a, int @NonNull [] b, int[] @NonNull [] c) { @java.lang.SuppressWarnings("all") + @lombok.Generated public NonNullOnRecordTypeUse { if (a == null) { throw new java.lang.NullPointerException("a is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/NonNullPlain.java b/test/transform/resource/after-delombok/NonNullPlain.java index 9fc2904272..68fbf0723b 100644 --- a/test/transform/resource/after-delombok/NonNullPlain.java +++ b/test/transform/resource/after-delombok/NonNullPlain.java @@ -12,6 +12,7 @@ class NonNullPlain { public @interface NotNull { } @java.lang.SuppressWarnings("all") + @lombok.Generated public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) { if (s == null) { throw new java.lang.NullPointerException("s is marked non-null but is null"); @@ -21,23 +22,28 @@ public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) } @lombok.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public int getI() { return this.i; } @lombok.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public String getS() { return this.s; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Object getO() { return this.o; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setI(@lombok.NonNull final int i) { this.i = i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setS(@lombok.NonNull final String s) { if (s == null) { throw new java.lang.NullPointerException("s is marked non-null but is null"); @@ -45,6 +51,7 @@ public void setS(@lombok.NonNull final String s) { this.s = s; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setO(final Object o) { this.o = o; } diff --git a/test/transform/resource/after-delombok/NonNullWithAlternateException.java b/test/transform/resource/after-delombok/NonNullWithAlternateException.java index e76feca204..bff03ee3a2 100644 --- a/test/transform/resource/after-delombok/NonNullWithAlternateException.java +++ b/test/transform/resource/after-delombok/NonNullWithAlternateException.java @@ -9,6 +9,7 @@ public void testMethod(@lombok.NonNull String arg) { System.out.println(arg); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setTest(@lombok.NonNull final String test) { if (test == null) { throw new java.lang.IllegalArgumentException("test is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/NonNullWithAssertion.java b/test/transform/resource/after-delombok/NonNullWithAssertion.java index 318d85b93c..99d8770348 100644 --- a/test/transform/resource/after-delombok/NonNullWithAssertion.java +++ b/test/transform/resource/after-delombok/NonNullWithAssertion.java @@ -8,10 +8,11 @@ public void testMethod(@lombok.NonNull String arg) { } public void testMethodWithIf(@lombok.NonNull String arg) { if (arg == null) throw new NullPointerException("Oops"); - } + } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setTest(@lombok.NonNull final String test) { assert test != null : "test is marked non-null but is null"; this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/NonNullWithGuava.java b/test/transform/resource/after-delombok/NonNullWithGuava.java index efa5878e70..9283203253 100644 --- a/test/transform/resource/after-delombok/NonNullWithGuava.java +++ b/test/transform/resource/after-delombok/NonNullWithGuava.java @@ -29,8 +29,9 @@ public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { test = checkNotNull(test); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setTest(@lombok.NonNull final String test) { com.google.common.base.Preconditions.checkNotNull(test, "test is marked non-null but is null"); this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/NonNullWithJdk.java b/test/transform/resource/after-delombok/NonNullWithJdk.java index 725d90c7d6..58d2ea0e44 100644 --- a/test/transform/resource/after-delombok/NonNullWithJdk.java +++ b/test/transform/resource/after-delombok/NonNullWithJdk.java @@ -29,8 +29,9 @@ public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { test = requireNonNull(test); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setTest(@lombok.NonNull final String test) { java.util.Objects.requireNonNull(test, "test is marked non-null but is null"); this.test = test; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/NullAnnotatedCheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/NullAnnotatedCheckerFrameworkSuperBuilder.java index ae2bcdfd2d..77821e5348 100644 --- a/test/transform/resource/after-delombok/NullAnnotatedCheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-delombok/NullAnnotatedCheckerFrameworkSuperBuilder.java @@ -1,75 +1,77 @@ //version 8: //CONF: lombok.addNullAnnotations = checkerframework import java.util.List; - class NullAnnotatedCheckerFrameworkSuperBuilder { - public static class Parent { int x; int y; int z; List names; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$x() { return 5; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean x$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int x$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int y; @java.lang.SuppressWarnings("all") + @lombok.Generated private int z; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList names; - /** * @return {@code this}. */ @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B x(final int x) { this.x$value = x; x$set = true; return self(); } - /** * @return {@code this}. */ @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B y(final int y) { this.y = y; return self(); } - /** * @return {@code this}. */ @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B z(final int z) { this.z = z; return self(); } - @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B name(final String name) { if (this.names == null) this.names = new java.util.ArrayList(); this.names.add(name); return self(); } - @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B names(final java.util.@org.checkerframework.checker.nullness.qual.NonNull Collection names) { if (names == null) { throw new java.lang.NullPointerException("names cannot be null"); @@ -78,48 +80,48 @@ public B names(final java.util.@org.checkerframework.checker.nullness.qual.NonNu this.names.addAll(names); return self(); } - @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearNames() { if (this.names != null) this.names.clear(); return self(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return "NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value + ", y=" + this.y + ", z=" + this.z + ", names=" + this.names + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull Parent build() { return new NullAnnotatedCheckerFrameworkSuperBuilder.Parent(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilder b) { if (b.x$set) this.x = b.x$value; else this.x = NullAnnotatedCheckerFrameworkSuperBuilder.Parent.$default$x(); @@ -138,98 +140,98 @@ protected Parent(final NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBu } this.names = names; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static NullAnnotatedCheckerFrameworkSuperBuilder.Parent.@org.checkerframework.checker.nullness.qual.NonNull ParentBuilder builder() { return new NullAnnotatedCheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } } - - public static class ZChild extends Parent { int a; int b; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static int $default$a() { return 1; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ZChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean a$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private int a$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private int b; - /** * @return {@code this}. */ @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B a(final int a) { this.a$value = a; a$set = true; return self(); } - /** * @return {@code this}. */ @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public B b(final int b) { this.b = b; return self(); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.@org.checkerframework.checker.nullness.qual.NonNull String toString() { return "NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder(super=" + super.toString() + ", a$value=" + this.a$value + ", b=" + this.b + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ZChildBuilderImpl extends NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ZChildBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public NullAnnotatedCheckerFrameworkSuperBuilder.@org.checkerframework.checker.nullness.qual.NonNull ZChild build() { return new NullAnnotatedCheckerFrameworkSuperBuilder.ZChild(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected ZChild(final NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilder b) { super(b); if (b.a$set) this.a = b.a$value; else this.a = NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.$default$a(); this.b = b.b; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.@org.checkerframework.checker.nullness.qual.NonNull ZChildBuilder builder() { return new NullAnnotatedCheckerFrameworkSuperBuilder.ZChild.ZChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/NullLibrary1.java b/test/transform/resource/after-delombok/NullLibrary1.java index e299be3d54..ca55c8e2d3 100644 --- a/test/transform/resource/after-delombok/NullLibrary1.java +++ b/test/transform/resource/after-delombok/NullLibrary1.java @@ -3,6 +3,7 @@ public class NullLibrary1 { String foo; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.@org.eclipse.jdt.annotation.Nullable Object o) { if (o == this) return true; if (!(o instanceof NullLibrary1)) return false; @@ -14,11 +15,13 @@ public boolean equals(final java.lang.@org.eclipse.jdt.annotation.Nullable Objec return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.@org.eclipse.jdt.annotation.Nullable Object other) { return other instanceof NullLibrary1; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -28,10 +31,12 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.@org.eclipse.jdt.annotation.NonNull String toString() { return "NullLibrary1(foo=" + this.foo + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary1(final String foo) { this.foo = foo; } @@ -40,6 +45,7 @@ public NullLibrary1(final String foo) { */ @org.eclipse.jdt.annotation.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary1 withFoo(final String foo) { return this.foo == foo ? this : new NullLibrary1(foo); } diff --git a/test/transform/resource/after-delombok/NullLibrary2.java b/test/transform/resource/after-delombok/NullLibrary2.java index fec143c2db..190b653ebc 100644 --- a/test/transform/resource/after-delombok/NullLibrary2.java +++ b/test/transform/resource/after-delombok/NullLibrary2.java @@ -3,6 +3,7 @@ public class NullLibrary2 { String foo; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(@org.springframework.lang.Nullable final java.lang.Object o) { if (o == this) return true; if (!(o instanceof NullLibrary2)) return false; @@ -14,11 +15,13 @@ public boolean equals(@org.springframework.lang.Nullable final java.lang.Object return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(@org.springframework.lang.Nullable final java.lang.Object other) { return other instanceof NullLibrary2; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -29,10 +32,12 @@ public int hashCode() { @org.springframework.lang.NonNull @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "NullLibrary2(foo=" + this.foo + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary2(final String foo) { this.foo = foo; } @@ -41,6 +46,7 @@ public NullLibrary2(final String foo) { */ @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary2 withFoo(final String foo) { return this.foo == foo ? this : new NullLibrary2(foo); } diff --git a/test/transform/resource/after-delombok/NullLibrary3.java b/test/transform/resource/after-delombok/NullLibrary3.java index ee7c529633..51c3c501a7 100644 --- a/test/transform/resource/after-delombok/NullLibrary3.java +++ b/test/transform/resource/after-delombok/NullLibrary3.java @@ -1,9 +1,9 @@ public class NullLibrary3 { @jakarta.annotation.Nonnull String foo; - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(@jakarta.annotation.Nullable final java.lang.Object o) { if (o == this) return true; if (!(o instanceof NullLibrary3)) return false; @@ -14,14 +14,14 @@ public boolean equals(@jakarta.annotation.Nullable final java.lang.Object o) { if (this$foo == null ? other$foo != null : !this$foo.equals(other$foo)) return false; return true; } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(@jakarta.annotation.Nullable final java.lang.Object other) { return other instanceof NullLibrary3; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -29,31 +29,31 @@ public int hashCode() { result = result * PRIME + ($foo == null ? 43 : $foo.hashCode()); return result; } - @jakarta.annotation.Nonnull @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "NullLibrary3(foo=" + this.foo + ")"; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary3(@jakarta.annotation.Nonnull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); } this.foo = foo; } - /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @jakarta.annotation.Nonnull @java.lang.SuppressWarnings("all") + @lombok.Generated public NullLibrary3 withFoo(@jakarta.annotation.Nonnull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); } return this.foo == foo ? this : new NullLibrary3(foo); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/OnXJava8Style.java b/test/transform/resource/after-delombok/OnXJava8Style.java index 18fc668603..3e99c63819 100644 --- a/test/transform/resource/after-delombok/OnXJava8Style.java +++ b/test/transform/resource/after-delombok/OnXJava8Style.java @@ -6,7 +6,6 @@ public class OnXJava8Style { @interface Bar { String stuff() default ""; } - @interface Array { String[] value() default {}; } @@ -21,48 +20,54 @@ public class OnXJava8Style { String i; @Foo @java.lang.SuppressWarnings("all") + @lombok.Generated public String getA() { return this.a; } @Foo @java.lang.SuppressWarnings("all") + @lombok.Generated public void setB(final String b) { this.b = b; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setC(@Foo("a") final String c) { this.c = c; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setD(@Bar(stuff = "b") final String d) { this.d = d; } @Foo("c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") + @lombok.Generated public String getE() { return this.e; } @Array @java.lang.SuppressWarnings("all") + @lombok.Generated public String getF() { return this.f; } - @Array @java.lang.SuppressWarnings("all") + @lombok.Generated public String getG() { return this.g; } - @Array({}) @java.lang.SuppressWarnings("all") + @lombok.Generated public String getH() { return this.h; } - @Array({"a", "b"}) @java.lang.SuppressWarnings("all") + @lombok.Generated public String getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java b/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java index cf3b0a15d5..db24b5779c 100644 --- a/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java +++ b/test/transform/resource/after-delombok/PrivateNoArgsConstructor.java @@ -4,15 +4,18 @@ private static class Base { public static class PrivateNoArgsConstructorNotOnExtends extends Base { private final int a; @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorNotOnExtends(final int a) { this.a = a; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getA() { return this.a; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends)) return false; @@ -23,11 +26,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = super.hashCode(); @@ -36,6 +41,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorNotOnExtends(a=" + this.getA() + ")"; } @@ -43,19 +49,23 @@ public java.lang.String toString() { public static class PrivateNoArgsConstructorOnExtendsObject extends Object { private final int b; @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorOnExtendsObject(final int b) { this.b = b; } @java.lang.SuppressWarnings("all") + @lombok.Generated private PrivateNoArgsConstructorOnExtendsObject() { this.b = 0; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getB() { return this.b; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject)) return false; @@ -65,11 +75,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -78,6 +90,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorOnExtendsObject(b=" + this.getB() + ")"; } @@ -85,15 +98,18 @@ public java.lang.String toString() { public static class PrivateNoArgsConstructorExplicitBefore { private final int c; @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorExplicitBefore() { this.c = 0; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getC() { return this.c; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore)) return false; @@ -103,11 +119,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -116,10 +134,12 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitBefore(c=" + this.getC() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorExplicitBefore(final int c) { this.c = c; } @@ -127,11 +147,13 @@ public PrivateNoArgsConstructorExplicitBefore(final int c) { public static class PrivateNoArgsConstructorExplicitAfter { private final int d; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getD() { return this.d; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter)) return false; @@ -141,11 +163,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -154,14 +178,17 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitAfter(d=" + this.getD() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorExplicitAfter() { this.d = 0; } @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorExplicitAfter(final int d) { this.d = d; } @@ -169,11 +196,13 @@ public PrivateNoArgsConstructorExplicitAfter(final int d) { public static class PrivateNoArgsConstructorExplicitNone { private final int e; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getE() { return this.e; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone)) return false; @@ -183,11 +212,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -196,20 +227,24 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorExplicitNone(e=" + this.getE() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorExplicitNone(final int e) { this.e = e; } } public static class PrivateNoArgsConstructorNoFields { @java.lang.SuppressWarnings("all") + @lombok.Generated public PrivateNoArgsConstructorNoFields() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields)) return false; @@ -218,17 +253,20 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "PrivateNoArgsConstructor.PrivateNoArgsConstructorNoFields()"; } diff --git a/test/transform/resource/after-delombok/SetterAccessLevel.java b/test/transform/resource/after-delombok/SetterAccessLevel.java index 51a58e8e99..b35b07971d 100644 --- a/test/transform/resource/after-delombok/SetterAccessLevel.java +++ b/test/transform/resource/after-delombok/SetterAccessLevel.java @@ -6,22 +6,27 @@ class SetterAccessLevel { boolean isPublic; boolean value; @java.lang.SuppressWarnings("all") + @lombok.Generated private void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @java.lang.SuppressWarnings("all") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected void setProtected(final boolean isProtected) { this.isProtected = isProtected; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setValue(final boolean value) { this.value = value; } diff --git a/test/transform/resource/after-delombok/SetterAlreadyExists.java b/test/transform/resource/after-delombok/SetterAlreadyExists.java index a62f20da7f..e8584ecb8a 100644 --- a/test/transform/resource/after-delombok/SetterAlreadyExists.java +++ b/test/transform/resource/after-delombok/SetterAlreadyExists.java @@ -23,6 +23,7 @@ class Setter5 { void setFoo() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFoo(final String foo) { this.foo = foo; } @@ -32,6 +33,7 @@ class Setter6 { void setFoo(String foo, int x) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFoo(final String foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java b/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java index 7831e42c06..c2241f0bf5 100644 --- a/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java +++ b/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java @@ -16,6 +16,7 @@ class SetterAndWithMethodJavadoc { * @param the new value */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setI(final int i) { this.i = i; } @@ -25,6 +26,7 @@ public void setI(final int i) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public SetterAndWithMethodJavadoc withI(final int i) { return this.i == i ? this : new SetterAndWithMethodJavadoc(i, this.j); } @@ -33,6 +35,7 @@ public SetterAndWithMethodJavadoc withI(final int i) { * @param the new other value */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setJ(final int j) { this.j = j; } @@ -42,6 +45,7 @@ public void setJ(final int j) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public SetterAndWithMethodJavadoc withJ(final int j) { return this.j == j ? this : new SetterAndWithMethodJavadoc(this.i, j); } diff --git a/test/transform/resource/after-delombok/SetterDeprecated.java b/test/transform/resource/after-delombok/SetterDeprecated.java index cc52413b46..c35ff24e1b 100644 --- a/test/transform/resource/after-delombok/SetterDeprecated.java +++ b/test/transform/resource/after-delombok/SetterDeprecated.java @@ -7,6 +7,7 @@ class SetterDeprecated { int javadoc; @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public void setAnnotation(final int annotation) { this.annotation = annotation; } @@ -15,6 +16,7 @@ public void setAnnotation(final int annotation) { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public void setJavadoc(final int javadoc) { this.javadoc = javadoc; } diff --git a/test/transform/resource/after-delombok/SetterInAnonymousClass.java b/test/transform/resource/after-delombok/SetterInAnonymousClass.java index ced2be523a..d1ab955be7 100644 --- a/test/transform/resource/after-delombok/SetterInAnonymousClass.java +++ b/test/transform/resource/after-delombok/SetterInAnonymousClass.java @@ -1,10 +1,9 @@ public class SetterInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public void setString(final String string) { this.string = string; } diff --git a/test/transform/resource/after-delombok/SetterOnClass.java b/test/transform/resource/after-delombok/SetterOnClass.java index d95a280f25..317b0b4426 100644 --- a/test/transform/resource/after-delombok/SetterOnClass.java +++ b/test/transform/resource/after-delombok/SetterOnClass.java @@ -3,6 +3,7 @@ class SetterOnClass1 { boolean isNone; boolean isPublic; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @@ -12,10 +13,12 @@ class SetterOnClass2 { boolean isProtected; boolean isPackage; @java.lang.SuppressWarnings("all") + @lombok.Generated protected void setProtected(final boolean isProtected) { this.isProtected = isProtected; } @java.lang.SuppressWarnings("all") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @@ -24,6 +27,7 @@ class SetterOnClass3 { boolean isNone; boolean isPackage; @java.lang.SuppressWarnings("all") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @@ -32,6 +36,7 @@ class SetterOnClass4 { boolean isNone; boolean isPrivate; @java.lang.SuppressWarnings("all") + @lombok.Generated private void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @@ -40,6 +45,7 @@ class SetterOnClass5 { boolean isNone; boolean isPublic; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @@ -49,10 +55,12 @@ class SetterOnClass6 { @lombok.NonNull String nonNull; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setCouldBeNull(final String couldBeNull) { this.couldBeNull = couldBeNull; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setNonNull(@lombok.NonNull final String nonNull) { if (nonNull == null) { throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); diff --git a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java index 555bf6986a..e2f66eed7c 100644 --- a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java +++ b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java @@ -6,18 +6,21 @@ class SetterOnMethodOnParam { } @Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public void setI(final int i) { this.i = i; } @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") + @lombok.Generated public void setJ(@Test final int j) { this.j = j; } @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") + @lombok.Generated public void setK(@Test final int k) { this.k = k; } diff --git a/test/transform/resource/after-delombok/SetterOnStatic.java b/test/transform/resource/after-delombok/SetterOnStatic.java index 7ef6836261..505b62e268 100644 --- a/test/transform/resource/after-delombok/SetterOnStatic.java +++ b/test/transform/resource/after-delombok/SetterOnStatic.java @@ -2,10 +2,12 @@ class Setter { static boolean foo; static int bar; @java.lang.SuppressWarnings("all") + @lombok.Generated public static void setFoo(final boolean foo) { Setter.foo = foo; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static void setBar(final int bar) { Setter.bar = bar; } diff --git a/test/transform/resource/after-delombok/SetterPlain.java b/test/transform/resource/after-delombok/SetterPlain.java index 0ec9ca1b2d..5db01074ea 100644 --- a/test/transform/resource/after-delombok/SetterPlain.java +++ b/test/transform/resource/after-delombok/SetterPlain.java @@ -2,10 +2,12 @@ class SetterPlain { int i; int foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setI(final int i) { this.i = i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFoo(final int foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/SetterTypeAnnos.java b/test/transform/resource/after-delombok/SetterTypeAnnos.java index 77ddf9ce88..98a4d4a46f 100644 --- a/test/transform/resource/after-delombok/SetterTypeAnnos.java +++ b/test/transform/resource/after-delombok/SetterTypeAnnos.java @@ -12,6 +12,7 @@ class SetterTypeAnnos { @TB List foo; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setFoo(@TA final List foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/SetterWithDollar.java b/test/transform/resource/after-delombok/SetterWithDollar.java index 8d116e99a6..6fad972a1d 100644 --- a/test/transform/resource/after-delombok/SetterWithDollar.java +++ b/test/transform/resource/after-delombok/SetterWithDollar.java @@ -1,9 +1,7 @@ class SetterWithDollar1 { int $i; - @java.lang.SuppressWarnings("all") - - + @lombok.Generated public void set$i(final int $i) { this.$i = $i; } @@ -11,14 +9,13 @@ class SetterWithDollar1 { class SetterWithDollar2 { int $i; int i; - @java.lang.SuppressWarnings("all") - - + @lombok.Generated public void set$i(final int $i) { this.$i = $i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setI(final int i) { this.i = i; } diff --git a/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java index de68ee60ae..0e54353be9 100644 --- a/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-delombok/SetterWithJavaBeansSpecCapitalization.java @@ -2,10 +2,12 @@ class SetterWithJavaBeansSpecCapitalization { int a; int aField; @java.lang.SuppressWarnings("all") + @lombok.Generated public void setA(final int a) { this.a = a; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setaField(final int aField) { this.aField = aField; } diff --git a/test/transform/resource/after-delombok/SimpleTypeResolution.java b/test/transform/resource/after-delombok/SimpleTypeResolution.java index c6e08d70b8..0340e1d598 100644 --- a/test/transform/resource/after-delombok/SimpleTypeResolution.java +++ b/test/transform/resource/after-delombok/SimpleTypeResolution.java @@ -5,6 +5,7 @@ class SimpleTypeResolutionFail { class SimpleTypeResolutionSuccess { private int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/SingularCleanupForDelombok.java b/test/transform/resource/after-delombok/SingularCleanupForDelombok.java index ff67af594a..c7878ca23a 100644 --- a/test/transform/resource/after-delombok/SingularCleanupForDelombok.java +++ b/test/transform/resource/after-delombok/SingularCleanupForDelombok.java @@ -11,29 +11,36 @@ public Book(String name, Set authors) { this(name, authors, authors.size()); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static class BookBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList authors; @java.lang.SuppressWarnings("all") + @lombok.Generated BookBuilder() { } /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public Book.BookBuilder name(final String name) { this.name = name; return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Book.BookBuilder author(final String author) { if (this.authors == null) this.authors = new java.util.ArrayList(); this.authors.add(author); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Book.BookBuilder authors(final java.util.Collection authors) { if (authors == null) { throw new java.lang.NullPointerException("authors cannot be null"); @@ -43,11 +50,13 @@ public Book.BookBuilder authors(final java.util.Collection aut return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Book.BookBuilder clearAuthors() { if (this.authors != null) this.authors.clear(); return this; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Book build() { java.util.Set authors; switch (this.authors == null ? 0 : this.authors.size()) { @@ -66,15 +75,18 @@ public Book build() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Book.BookBuilder(name=" + this.name + ", authors=" + this.authors + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static Book.BookBuilder builder() { return new Book.BookBuilder(); } @java.lang.SuppressWarnings("all") + @lombok.Generated Book(@NonNull final String name, @NonNull final Set authors, final int numberOfAuthors) { if (name == null) { throw new java.lang.NullPointerException("name is marked non-null but is null"); @@ -88,12 +100,14 @@ public static Book.BookBuilder builder() { } @NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public String name() { return this.name; } @NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public Set authors() { return this.authors; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SkipSuppressWarnings.java b/test/transform/resource/after-delombok/SkipSuppressWarnings.java index 77bfdcc463..2b4c444c57 100644 --- a/test/transform/resource/after-delombok/SkipSuppressWarnings.java +++ b/test/transform/resource/after-delombok/SkipSuppressWarnings.java @@ -1,12 +1,12 @@ class SkipSuppressWarnings { private String field = ""; private final java.util.concurrent.atomic.AtomicReference field2 = new java.util.concurrent.atomic.AtomicReference(); - + @lombok.Generated public String getField() { return this.field; } - @java.lang.SuppressWarnings({"unchecked"}) + @lombok.Generated public String getField2() { java.lang.Object $value = this.field2.get(); if ($value == null) { @@ -21,4 +21,4 @@ public String getField2() { } return (String) ($value == this.field2 ? null : $value); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/StandardExceptions.java b/test/transform/resource/after-delombok/StandardExceptions.java index d60fcaf21d..af2edf6b77 100644 --- a/test/transform/resource/after-delombok/StandardExceptions.java +++ b/test/transform/resource/after-delombok/StandardExceptions.java @@ -1,17 +1,21 @@ class EmptyException extends Exception { @java.lang.SuppressWarnings("all") + @lombok.Generated public EmptyException() { this(null, null); } @java.lang.SuppressWarnings("all") + @lombok.Generated public EmptyException(final java.lang.String message) { this(message, null); } @java.lang.SuppressWarnings("all") + @lombok.Generated public EmptyException(final java.lang.Throwable cause) { this(cause != null ? cause.getMessage() : null, cause); } @java.lang.SuppressWarnings("all") + @lombok.Generated public EmptyException(final java.lang.String message, final java.lang.Throwable cause) { super(message); if (cause != null) super.initCause(cause); @@ -21,16 +25,19 @@ class NoArgsException extends Exception { public NoArgsException() { } @java.lang.SuppressWarnings("all") + @lombok.Generated protected NoArgsException(final java.lang.String message) { this(message, null); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected NoArgsException(final java.lang.Throwable cause) { this(cause != null ? cause.getMessage() : null, cause); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected NoArgsException(final java.lang.String message, final java.lang.Throwable cause) { super(message); if (cause != null) super.initCause(cause); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/StaticConstructor.java b/test/transform/resource/after-delombok/StaticConstructor.java index 4de6dbe53e..088a2da51e 100644 --- a/test/transform/resource/after-delombok/StaticConstructor.java +++ b/test/transform/resource/after-delombok/StaticConstructor.java @@ -2,12 +2,14 @@ public class StaticConstructor { String name; @java.lang.SuppressWarnings("all") + @lombok.Generated private StaticConstructor(final String name) { this.name = name; } @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public static StaticConstructor of(final String name) { return new StaticConstructor(name); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstract.java b/test/transform/resource/after-delombok/SuperBuilderAbstract.java index f92eede262..c1735d4197 100644 --- a/test/transform/resource/after-delombok/SuperBuilderAbstract.java +++ b/test/transform/resource/after-delombok/SuperBuilderAbstract.java @@ -2,48 +2,60 @@ public class SuperBuilderAbstract { public static class Parent { int parentField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int parentField; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B parentField(final int parentField) { this.parentField = parentField; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderAbstract.Parent.ParentBuilder(parentField=" + this.parentField + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderAbstract.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderAbstract.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstract.Parent build() { return new SuperBuilderAbstract.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderAbstract.Parent.ParentBuilder b) { this.parentField = b.parentField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderAbstract.Parent.ParentBuilder builder() { return new SuperBuilderAbstract.Parent.ParentBuilderImpl(); } @@ -51,30 +63,37 @@ protected Parent(final SuperBuilderAbstract.Parent.ParentBuilder b) { public static abstract class Child extends Parent { double childField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double childField; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B childField(final double childField) { this.childField = childField; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderAbstract.Child.ChildBuilder(super=" + super.toString() + ", childField=" + this.childField + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderAbstract.Child.ChildBuilder b) { super(b); this.childField = b.childField; @@ -83,51 +102,63 @@ protected Child(final SuperBuilderAbstract.Child.ChildBuilder b) { public static class GrandChild extends Child { String grandChildField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class GrandChildBuilder> extends Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String grandChildField; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B grandChildField(final String grandChildField) { this.grandChildField = grandChildField; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderAbstract.GrandChild.GrandChildBuilder(super=" + super.toString() + ", grandChildField=" + this.grandChildField + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class GrandChildBuilderImpl extends SuperBuilderAbstract.GrandChild.GrandChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private GrandChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstract.GrandChild build() { return new SuperBuilderAbstract.GrandChild(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected GrandChild(final SuperBuilderAbstract.GrandChild.GrandChildBuilder b) { super(b); this.grandChildField = b.grandChildField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderAbstract.GrandChild.GrandChildBuilder builder() { return new SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java index c9ed6ad722..4d67c94e2f 100644 --- a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java @@ -2,15 +2,19 @@ public class SuperBuilderAbstractToBuilder { public static class Parent { int parentField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int parentField; @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { SuperBuilderAbstractToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Parent instance, final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { b.parentField(instance.parentField); } @@ -18,45 +22,56 @@ public static abstract class ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstractToBuilder.Parent build() { return new SuperBuilderAbstractToBuilder.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder b) { this.parentField = b.parentField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderAbstractToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstractToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } @@ -64,17 +79,21 @@ protected Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder public static abstract class Child extends Parent { double childField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double childField; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderAbstractToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Child instance, final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) { b.childField(instance.childField); } @@ -82,23 +101,28 @@ public static abstract class ChildBuilder b) { super(b); this.childField = b.childField; @@ -107,17 +131,21 @@ protected Child(final SuperBuilderAbstractToBuilder.Child.ChildBuilder b) public static class GrandChild extends Child { String grandChildField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class GrandChildBuilder> extends Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String grandChildField; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.GrandChild instance, final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { b.grandChildField(instance.grandChildField); } @@ -125,48 +153,59 @@ public static abstract class GrandChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private GrandChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstractToBuilder.GrandChild build() { return new SuperBuilderAbstractToBuilder.GrandChild(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected GrandChild(final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder b) { super(b); this.grandChildField = b.grandChildField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder builder() { return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder toBuilder() { return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl().$fillValuesFrom(this); } diff --git a/test/transform/resource/after-delombok/SuperBuilderBasic.java b/test/transform/resource/after-delombok/SuperBuilderBasic.java index 31b6692da9..2e3ccc0af1 100644 --- a/test/transform/resource/after-delombok/SuperBuilderBasic.java +++ b/test/transform/resource/after-delombok/SuperBuilderBasic.java @@ -4,26 +4,32 @@ public static class Parent { int field1; List items; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final int field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -33,37 +39,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderBasic.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderBasic.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderBasic.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasic.Parent build() { return new SuperBuilderBasic.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.List items; @@ -80,6 +95,7 @@ protected Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderBasic.Parent.ParentBuilder builder() { return new SuperBuilderBasic.Parent.ParentBuilderImpl(); } @@ -87,51 +103,63 @@ protected Parent(final SuperBuilderBasic.Parent.ParentBuilder b) { public static class Child extends SuperBuilderBasic.Parent { double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends SuperBuilderBasic.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final double field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderBasic.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderBasic.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderBasic.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasic.Child build() { return new SuperBuilderBasic.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderBasic.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderBasic.Child.ChildBuilder builder() { return new SuperBuilderBasic.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java index f57937ec17..835c58f136 100644 --- a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java @@ -13,23 +13,31 @@ private static String staticMethod(Parent instance) { return "staticMethod"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private int obtainViaField; @java.lang.SuppressWarnings("all") + @lombok.Generated private int obtainViaMethod; @java.lang.SuppressWarnings("all") + @lombok.Generated private String obtainViaStaticMethod; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { SuperBuilderBasicToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Parent instance, final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { b.field1(instance.field1); b.obtainViaField(instance.field1); @@ -41,6 +49,7 @@ public static abstract class ParentBuilder(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -85,37 +99,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderBasicToBuilder.Parent.ParentBuilder(field1=" + this.field1 + ", obtainViaField=" + this.obtainViaField + ", obtainViaMethod=" + this.obtainViaMethod + ", obtainViaStaticMethod=" + this.obtainViaStaticMethod + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderBasicToBuilder.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasicToBuilder.Parent build() { return new SuperBuilderBasicToBuilder.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) { this.field1 = b.field1; this.obtainViaField = b.obtainViaField; @@ -135,10 +158,12 @@ protected Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderBasicToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasicToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } @@ -146,17 +171,21 @@ protected Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder b) public static class Child extends Parent { private double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderBasicToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Child instance, final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { b.field3(instance.field3); } @@ -164,48 +193,59 @@ public static abstract class ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderBasicToBuilder.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasicToBuilder.Child build() { return new SuperBuilderBasicToBuilder.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderBasicToBuilder.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderBasicToBuilder.Child.ChildBuilder builder() { return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderBasicToBuilder.Child.ChildBuilder toBuilder() { return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this); } diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomName.java b/test/transform/resource/after-delombok/SuperBuilderCustomName.java index cad2716c9b..edcac512cc 100644 --- a/test/transform/resource/after-delombok/SuperBuilderCustomName.java +++ b/test/transform/resource/after-delombok/SuperBuilderCustomName.java @@ -2,49 +2,61 @@ class SuperBuilderCustomName { private final int field; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class SimpleTestBuilder, B extends SuperBuilderCustomName.SimpleTestBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field(final int field) { this.field = field; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderCustomName.SimpleTestBuilder(field=" + this.field + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class SimpleTestBuilderImpl extends SuperBuilderCustomName.SimpleTestBuilder, SuperBuilderCustomName.SimpleTestBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private SimpleTestBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderCustomName.SimpleTestBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderCustomName build() { return new SuperBuilderCustomName(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderCustomName(final SuperBuilderCustomName.SimpleTestBuilder b) { this.field = b.field; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderCustomName.SimpleTestBuilder builder() { return new SuperBuilderCustomName.SimpleTestBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomized.java b/test/transform/resource/after-delombok/SuperBuilderCustomized.java index 5f41cdde9e..d34935dd65 100644 --- a/test/transform/resource/after-delombok/SuperBuilderCustomized.java +++ b/test/transform/resource/after-delombok/SuperBuilderCustomized.java @@ -3,6 +3,7 @@ public class SuperBuilderCustomized { public static class Parent { public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; public B resetToDefault() { field1 = 0; @@ -13,11 +14,14 @@ public B field1(int field1) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderCustomized.Parent.ParentBuilder(field1=" + this.field1 + ")"; } @@ -31,17 +35,21 @@ protected Parent(ParentBuilder b) { return new SuperBuilderCustomized.Parent.ParentBuilderImpl().field1(field1); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderCustomized.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderCustomized.Parent build() { return new SuperBuilderCustomized.Parent(this); } @@ -55,10 +63,12 @@ public Child build() { return new Child(this); } @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderCustomized.Child.ChildBuilderImpl self() { return this; } @@ -68,30 +78,37 @@ protected SuperBuilderCustomized.Child.ChildBuilderImpl self() { return new ChildBuilderImpl().field2(10.0); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field2; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field2(final double field2) { this.field2 = field2; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderCustomized.Child.ChildBuilder(super=" + super.toString() + ", field2=" + this.field2 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderCustomized.Child.ChildBuilder b) { super(b); this.field2 = b.field2; diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomizedWithSetterPrefix.java b/test/transform/resource/after-delombok/SuperBuilderCustomizedWithSetterPrefix.java index cee5ac89c3..b9897f3192 100644 --- a/test/transform/resource/after-delombok/SuperBuilderCustomizedWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/SuperBuilderCustomizedWithSetterPrefix.java @@ -3,43 +3,53 @@ public class SuperBuilderCustomizedWithSetterPrefix { public static class Parent { public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; public B setField1(int field1) { this.field1 = field1 + 1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder(field1=" + this.field1 + ")"; } } int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderCustomizedWithSetterPrefix.Parent build() { return new SuperBuilderCustomizedWithSetterPrefix.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder b) { this.field1 = b.field1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder builder() { return new SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderInitializer.java b/test/transform/resource/after-delombok/SuperBuilderInitializer.java index 19ed0c6892..b43abbf4e1 100644 --- a/test/transform/resource/after-delombok/SuperBuilderInitializer.java +++ b/test/transform/resource/after-delombok/SuperBuilderInitializer.java @@ -1,72 +1,68 @@ class SuperBuilderInitializer { - public static class One { private String world; - { world = "Hello"; } - private static final String world2; - static { world2 = "Hello"; } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class OneBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private String world; - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B world(final String world) { this.world = world; return self(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderInitializer.One.OneBuilder(world=" + this.world + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class OneBuilderImpl extends SuperBuilderInitializer.One.OneBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private OneBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderInitializer.One.OneBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderInitializer.One build() { return new SuperBuilderInitializer.One(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected One(final SuperBuilderInitializer.One.OneBuilder b) { this.world = b.world; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderInitializer.One.OneBuilder builder() { return new SuperBuilderInitializer.One.OneBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderJavadoc.java b/test/transform/resource/after-delombok/SuperBuilderJavadoc.java index 0944db2cf7..5655ac2691 100644 --- a/test/transform/resource/after-delombok/SuperBuilderJavadoc.java +++ b/test/transform/resource/after-delombok/SuperBuilderJavadoc.java @@ -1,5 +1,4 @@ import java.util.List; - public abstract class SuperBuilderJavadoc { /** * basic gets only a builder setter. @@ -23,23 +22,23 @@ public abstract class SuperBuilderJavadoc { * @return tag remains on the field. */ private final int predefWithJavadoc; - - public static abstract class SuperBuilderJavadocBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int basic; @java.lang.SuppressWarnings("all") + @lombok.Generated private int getsetwith; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predef; @java.lang.SuppressWarnings("all") + @lombok.Generated private int predefWithJavadoc; - public B predef(final int x) { this.predef = x * 10; return self(); } - /** * This javadoc remains untouched. * @param x 1/100 of the thing @@ -49,7 +48,6 @@ public B predefWithJavadoc(final int x) { this.predefWithJavadoc = x * 100; return self(); } - /** * basic gets only a builder setter. * @see #getsetwith @@ -57,66 +55,67 @@ public B predefWithJavadoc(final int x) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B basic(final int basic) { this.basic = basic; return self(); } - /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @param tag is moved to the setters and wither. * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B getsetwith(final int getsetwith) { this.getsetwith = getsetwith; return self(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderJavadoc.SuperBuilderJavadocBuilder(basic=" + this.basic + ", getsetwith=" + this.getsetwith + ", predef=" + this.predef + ", predefWithJavadoc=" + this.predefWithJavadoc + ")"; } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderJavadoc(final SuperBuilderJavadoc.SuperBuilderJavadocBuilder b) { this.basic = b.basic; this.getsetwith = b.getsetwith; this.predef = b.predef; this.predefWithJavadoc = b.predefWithJavadoc; } - /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @return tag is moved to the getter. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public int getGetsetwith() { return this.getsetwith; } - /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @param tag is moved to the setters and wither. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public void setGetsetwith(final int getsetwith) { this.getsetwith = getsetwith; } - /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. * @param tag is moved to the setters and wither. * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract SuperBuilderJavadoc withGetsetwith(final int getsetwith); } diff --git a/test/transform/resource/after-delombok/SuperBuilderNameClashes.java b/test/transform/resource/after-delombok/SuperBuilderNameClashes.java index 5b0db13596..545f0536a5 100644 --- a/test/transform/resource/after-delombok/SuperBuilderNameClashes.java +++ b/test/transform/resource/after-delombok/SuperBuilderNameClashes.java @@ -1,74 +1,94 @@ public class SuperBuilderNameClashes { public static class GenericsClash { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class GenericsClashBuilder, B2 extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B2 self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C3 build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class GenericsClashBuilderImpl extends SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder, SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private GenericsClashBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderNameClashes.GenericsClash build() { return new SuperBuilderNameClashes.GenericsClash(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected GenericsClash(final SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder b) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderNameClashes.GenericsClash.GenericsClashBuilder builder() { return new SuperBuilderNameClashes.GenericsClash.GenericsClashBuilderImpl(); } } public static class B { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class BBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B2 self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNameClashes.B.BBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class BBuilderImpl extends SuperBuilderNameClashes.B.BBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private BBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderNameClashes.B.BBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderNameClashes.B build() { return new SuperBuilderNameClashes.B(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected B(final SuperBuilderNameClashes.B.BBuilder b) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderNameClashes.B.BBuilder builder() { return new SuperBuilderNameClashes.B.BBuilderImpl(); } @@ -78,48 +98,60 @@ public static class C2 { public static class C { C2 c2; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class CBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private C2 c2; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B c2(final C2 c2) { this.c2 = c2; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C3 build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNameClashes.C.CBuilder(c2=" + this.c2 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class CBuilderImpl extends SuperBuilderNameClashes.C.CBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private CBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderNameClashes.C.CBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderNameClashes.C build() { return new SuperBuilderNameClashes.C(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected C(final SuperBuilderNameClashes.C.CBuilder b) { this.c2 = b.c2; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderNameClashes.C.CBuilder builder() { return new SuperBuilderNameClashes.C.CBuilderImpl(); } @@ -132,40 +164,50 @@ interface B3 { } public static class ExtendsClauseCollision extends B implements B2.B4, B3 { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ExtendsClauseCollisionBuilder> extends B.BBuilder { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B4 self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder(super=" + super.toString() + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ExtendsClauseCollisionBuilderImpl extends SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ExtendsClauseCollisionBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderNameClashes.ExtendsClauseCollision build() { return new SuperBuilderNameClashes.ExtendsClauseCollision(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected ExtendsClauseCollision(final SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder b) { super(b); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder builder() { return new SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderNestedGenericTypes.java b/test/transform/resource/after-delombok/SuperBuilderNestedGenericTypes.java index fadc05800f..519acf996b 100644 --- a/test/transform/resource/after-delombok/SuperBuilderNestedGenericTypes.java +++ b/test/transform/resource/after-delombok/SuperBuilderNestedGenericTypes.java @@ -1,37 +1,47 @@ public class SuperBuilderNestedGenericTypes { public static abstract class Generic> { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class GenericBuilder, C extends SuperBuilderNestedGenericTypes.Generic, B extends SuperBuilderNestedGenericTypes.Generic.GenericBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNestedGenericTypes.Generic.GenericBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Generic(final SuperBuilderNestedGenericTypes.Generic.GenericBuilder b) { } } public static abstract class NestedGeneric> extends Generic>> { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class NestedGenericBuilder, C extends SuperBuilderNestedGenericTypes.NestedGeneric, B extends SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder> extends Generic.GenericBuilder>, C, B> { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder(super=" + super.toString() + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected NestedGeneric(final SuperBuilderNestedGenericTypes.NestedGeneric.NestedGenericBuilder b) { super(b); } diff --git a/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java b/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java index 6e2fdca2ba..4b42235940 100644 --- a/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java @@ -11,14 +11,19 @@ class SuperBuilderSingularAnnotatedTypes { private Set<@MyAnnotation @NonNull String> foos; private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class SuperBuilderSingularAnnotatedTypesBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> foos; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; @java.lang.SuppressWarnings("all") + @lombok.Generated public B foo(@MyAnnotation @NonNull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); @@ -28,6 +33,7 @@ public B foo(@MyAnnotation @NonNull final String foo) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B foos(final java.util.Collection foos) { if (foos == null) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -37,11 +43,13 @@ public B foos(final java.util.Collection bars) { if (bars == null) { throw new java.lang.NullPointerException("bars cannot be null"); @@ -73,6 +82,7 @@ public B bars(final java.util.Map { @java.lang.SuppressWarnings("all") + @lombok.Generated private SuperBuilderSingularAnnotatedTypesBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularAnnotatedTypes build() { return new SuperBuilderSingularAnnotatedTypes(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder b) { java.util.Set<@MyAnnotation @NonNull String> foos; switch (b.foos == null ? 0 : b.foos.size()) { @@ -138,7 +156,8 @@ protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotated this.bars = bars; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder builder() { return new SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderSingularCustomized.java b/test/transform/resource/after-delombok/SuperBuilderSingularCustomized.java index 1f07c44854..b9a06ab162 100644 --- a/test/transform/resource/after-delombok/SuperBuilderSingularCustomized.java +++ b/test/transform/resource/after-delombok/SuperBuilderSingularCustomized.java @@ -3,17 +3,20 @@ class SuperBuilderSingularCustomized { private Set foos; public static abstract class SuperBuilderSingularCustomizedBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList foos; public B custom(final String value) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B foo(final String foo) { if (this.foos == null) this.foos = new java.util.ArrayList(); this.foos.add(foo); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B foos(final java.util.Collection foos) { if (foos == null) { throw new java.lang.NullPointerException("foos cannot be null"); @@ -23,37 +26,46 @@ public B foos(final java.util.Collection foos) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearFoos() { if (this.foos != null) this.foos.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder(foos=" + this.foos + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class SuperBuilderSingularCustomizedBuilderImpl extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private SuperBuilderSingularCustomizedBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularCustomized build() { return new SuperBuilderSingularCustomized(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularCustomized(final SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder b) { java.util.Set foos; switch (b.foos == null ? 0 : b.foos.size()) { @@ -71,7 +83,8 @@ protected SuperBuilderSingularCustomized(final SuperBuilderSingularCustomized.Su this.foos = foos; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder builder() { return new SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderSingularToBuilderGuava.java b/test/transform/resource/after-delombok/SuperBuilderSingularToBuilderGuava.java index 685f3f8511..66fbad3bee 100644 --- a/test/transform/resource/after-delombok/SuperBuilderSingularToBuilderGuava.java +++ b/test/transform/resource/after-delombok/SuperBuilderSingularToBuilderGuava.java @@ -7,23 +7,31 @@ public static class Parent { private com.google.common.collect.ImmutableSortedSet passes; private com.google.common.collect.ImmutableTable users; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder cards; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder frogs; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSet.Builder rawSet; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableSortedSet.Builder passes; @java.lang.SuppressWarnings("all") + @lombok.Generated private com.google.common.collect.ImmutableTable.Builder users; @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Parent instance, final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { b.cards(instance.cards == null ? com.google.common.collect.ImmutableList.of() : instance.cards); b.frogs(instance.frogs == null ? com.google.common.collect.ImmutableList.of() : instance.frogs); @@ -32,12 +40,14 @@ public static abstract class ParentBuilderof() : instance.users); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B card(final T card) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B cards(final java.lang.Iterable cards) { if (cards == null) { throw new java.lang.NullPointerException("cards cannot be null"); @@ -47,17 +57,20 @@ public B cards(final java.lang.Iterable cards) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearCards() { this.cards = null; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B frog(final Number frog) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B frogs(final java.lang.Iterable frogs) { if (frogs == null) { throw new java.lang.NullPointerException("frogs cannot be null"); @@ -67,17 +80,20 @@ public B frogs(final java.lang.Iterable frogs) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearFrogs() { this.frogs = null; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B rawSet(final java.lang.Iterable rawSet) { if (rawSet == null) { throw new java.lang.NullPointerException("rawSet cannot be null"); @@ -87,17 +103,20 @@ public B rawSet(final java.lang.Iterable rawSet) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearRawSet() { this.rawSet = null; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B pass(final String pass) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B passes(final java.lang.Iterable passes) { if (passes == null) { throw new java.lang.NullPointerException("passes cannot be null"); @@ -107,17 +126,20 @@ public B passes(final java.lang.Iterable passes) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearPasses() { this.passes = null; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B 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 self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B users(final com.google.common.collect.Table users) { if (users == null) { throw new java.lang.NullPointerException("users cannot be null"); @@ -127,37 +149,46 @@ public B users(final com.google.common.collect.Table extends SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder, SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularToBuilderGuava.Parent build() { return new SuperBuilderSingularToBuilderGuava.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder b) { com.google.common.collect.ImmutableList cards = b.cards == null ? com.google.common.collect.ImmutableList.of() : b.cards.build(); this.cards = cards; @@ -171,10 +202,12 @@ protected Parent(final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder builder() { return new SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder toBuilder() { return new SuperBuilderSingularToBuilderGuava.Parent.ParentBuilderImpl().$fillValuesFrom(this); } @@ -182,17 +215,21 @@ protected Parent(final SuperBuilderSingularToBuilderGuava.Parent.ParentBuilder extends Parent { private double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder, B extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderSingularToBuilderGuava.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderSingularToBuilderGuava.Child instance, final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { b.field3(instance.field3); } @@ -200,48 +237,59 @@ public static abstract class ChildBuilder extends SuperBuilderSingularToBuilderGuava.Child.ChildBuilder, SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularToBuilderGuava.Child build() { return new SuperBuilderSingularToBuilderGuava.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderSingularToBuilderGuava.Child.ChildBuilder builder() { return new SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderSingularToBuilderGuava.Child.ChildBuilder toBuilder() { return new SuperBuilderSingularToBuilderGuava.Child.ChildBuilderImpl().$fillValuesFrom(this); } @@ -249,4 +297,4 @@ protected Child(final SuperBuilderSingularToBuilderGuava.Child.ChildBuilder x = Child.builder().card(1).build().toBuilder().build(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderWithAnnotatedTypeParam.java b/test/transform/resource/after-delombok/SuperBuilderWithAnnotatedTypeParam.java index f7ffe2fdec..451ca86133 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithAnnotatedTypeParam.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithAnnotatedTypeParam.java @@ -14,48 +14,60 @@ public class SuperBuilderWithAnnotatedTypeParam { public static class Parent { A field1; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field1; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final A field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder(field1=" + this.field1 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder, SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithAnnotatedTypeParam.Parent build() { return new SuperBuilderWithAnnotatedTypeParam.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder b) { this.field1 = b.field1; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder builder() { return new SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilderImpl(); } @@ -63,51 +75,63 @@ protected Parent(final SuperBuilderWithAnnotatedTypeParam.Parent.ParentBuilder { double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder<@MyAnnotation String, C, B> { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final double field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithAnnotatedTypeParam.Child build() { return new SuperBuilderWithAnnotatedTypeParam.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilder builder() { return new SuperBuilderWithAnnotatedTypeParam.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java index 2d9498dbc0..6a8a5399c1 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java @@ -1,79 +1,99 @@ class SuperBuilderWithCustomBuilderClassName { static class SuperClass { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class Builder> { @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithCustomBuilderClassName.SuperClass.Builder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SuperClass.Builder { @java.lang.SuppressWarnings("all") + @lombok.Generated private BuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithCustomBuilderClassName.SuperClass build() { return new SuperBuilderWithCustomBuilderClassName.SuperClass(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperClass(final SuperBuilderWithCustomBuilderClassName.SuperClass.Builder b) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithCustomBuilderClassName.SuperClass.Builder builder() { return new SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl(); } } static class SubClass extends SuperClass { @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class Builder> extends SuperClass.Builder { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithCustomBuilderClassName.SubClass.Builder(super=" + super.toString() + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SubClass.Builder { @java.lang.SuppressWarnings("all") + @lombok.Generated private BuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithCustomBuilderClassName.SubClass build() { return new SuperBuilderWithCustomBuilderClassName.SubClass(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SubClass(final SuperBuilderWithCustomBuilderClassName.SubClass.Builder b) { super(b); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithCustomBuilderClassName.SubClass.Builder builder() { return new SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java index a2f3231d18..ec47facbbf 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java @@ -5,26 +5,32 @@ public static class Parent { A field1; List items; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final A field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -34,37 +40,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder, SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithCustomBuilderMethod.Parent build() { return new SuperBuilderWithCustomBuilderMethod.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.List items; @@ -81,6 +96,7 @@ protected Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder< this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder builder() { return new SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl(); } @@ -91,46 +107,57 @@ public static class Child extends Parent { return new ChildBuilderImpl().item("default item"); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder, B extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final double field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder, SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithCustomBuilderMethod.Child build() { return new SuperBuilderWithCustomBuilderMethod.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder b) { super(b); this.field3 = b.field3; diff --git a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java index 3fc47f027d..69169ebd5b 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java @@ -4,27 +4,35 @@ public static class Parent { private long millis; private N numberField; @java.lang.SuppressWarnings("all") + @lombok.Generated private static long $default$millis() { return System.currentTimeMillis(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static N $default$numberField() { return null; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithDefaults.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean millis$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private long millis$value; @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean numberField$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private N numberField$value; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B millis(final long millis) { this.millis$value = millis; millis$set = true; @@ -34,38 +42,47 @@ public B millis(final long millis) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B numberField(final N numberField) { this.numberField$value = numberField; numberField$set = true; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithDefaults.Parent.ParentBuilder(millis$value=" + this.millis$value + ", numberField$value=" + this.numberField$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithDefaults.Parent.ParentBuilder, SuperBuilderWithDefaults.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithDefaults.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithDefaults.Parent build() { return new SuperBuilderWithDefaults.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder b) { if (b.millis$set) this.millis = b.millis$value; else this.millis = SuperBuilderWithDefaults.Parent.$default$millis(); @@ -73,6 +90,7 @@ protected Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder b) else this.numberField = SuperBuilderWithDefaults.Parent.$default$numberField(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithDefaults.Parent.ParentBuilder builder() { return new SuperBuilderWithDefaults.Parent.ParentBuilderImpl(); } @@ -80,19 +98,24 @@ protected Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder b) public static class Child extends Parent { private double doubleField; @java.lang.SuppressWarnings("all") + @lombok.Generated private static double $default$doubleField() { return Math.PI; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean doubleField$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private double doubleField$value; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B doubleField(final double doubleField) { this.doubleField$value = doubleField; doubleField$set = true; @@ -100,39 +123,48 @@ public B doubleField(final double doubleField) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithDefaults.Child.ChildBuilder(super=" + super.toString() + ", doubleField$value=" + this.doubleField$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithDefaults.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithDefaults.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithDefaults.Child build() { return new SuperBuilderWithDefaults.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithDefaults.Child.ChildBuilder b) { super(b); if (b.doubleField$set) this.doubleField = b.doubleField$value; else this.doubleField = SuperBuilderWithDefaults.Child.$default$doubleField(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithDefaults.Child.ChildBuilder builder() { return new SuperBuilderWithDefaults.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithDefaultsAndTargetTyping.java b/test/transform/resource/after-delombok/SuperBuilderWithDefaultsAndTargetTyping.java index 9a67573dc3..05f997ecf9 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithDefaultsAndTargetTyping.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithDefaultsAndTargetTyping.java @@ -1,153 +1,150 @@ import java.util.Arrays; - public class SuperBuilderWithDefaultsAndTargetTyping { - public static class Parent { private String foo; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean foo$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private String foo$value; - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B foo(final String foo) { this.foo$value = foo; foo$set = true; return self(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder(foo$value=" + this.foo$value + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithDefaultsAndTargetTyping.Parent build() { return new SuperBuilderWithDefaultsAndTargetTyping.Parent(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder b) { if (b.foo$set) this.foo = b.foo$value; else this.foo = SuperBuilderWithDefaultsAndTargetTyping.Parent.$default$foo(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilder builder() { return new SuperBuilderWithDefaultsAndTargetTyping.Parent.ParentBuilderImpl(); } } - - public static class Child extends Parent { private String foo; - @java.lang.SuppressWarnings("all") + @lombok.Generated private static String $default$foo() { return doSth(Arrays.asList(1), Arrays.asList('a')); } - - @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean foo$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private String foo$value; - /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B foo(final String foo) { this.foo$value = foo; foo$set = true; return self(); } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder(super=" + super.toString() + ", foo$value=" + this.foo$value + ")"; } } - - @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilderImpl self() { return this; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithDefaultsAndTargetTyping.Child build() { return new SuperBuilderWithDefaultsAndTargetTyping.Child(this); } } - @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder b) { super(b); if (b.foo$set) this.foo = b.foo$value; else this.foo = SuperBuilderWithDefaultsAndTargetTyping.Child.$default$foo(); } - @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilder builder() { return new SuperBuilderWithDefaultsAndTargetTyping.Child.ChildBuilderImpl(); } } - static String doSth(java.util.List i, java.util.List c) { return null; } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithExistingConstructor.java b/test/transform/resource/after-delombok/SuperBuilderWithExistingConstructor.java index c6ab10721a..10c9c1f258 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithExistingConstructor.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithExistingConstructor.java @@ -2,38 +2,48 @@ public class SuperBuilderWithExistingConstructor { public SuperBuilderWithExistingConstructor() { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class SuperBuilderWithExistingConstructorBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder()"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class SuperBuilderWithExistingConstructorBuilderImpl extends SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private SuperBuilderWithExistingConstructorBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithExistingConstructor build() { return new SuperBuilderWithExistingConstructor(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithExistingConstructor(final SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder b) { } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilder builder() { return new SuperBuilderWithExistingConstructor.SuperBuilderWithExistingConstructorBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java index 0c00cdfc71..a85c4e8792 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java @@ -4,26 +4,32 @@ public static class Parent { A field1; List items; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithGenerics.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final A field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -33,37 +39,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithGenerics.Parent.ParentBuilder, SuperBuilderWithGenerics.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics.Parent build() { return new SuperBuilderWithGenerics.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.List items; @@ -80,6 +95,7 @@ protected Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder b) this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics.Parent.ParentBuilderImpl(); } @@ -87,51 +103,63 @@ protected Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder b) public static class Child extends Parent { double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder, B extends SuperBuilderWithGenerics.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final double field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithGenerics.Child.ChildBuilder, SuperBuilderWithGenerics.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics.Child build() { return new SuperBuilderWithGenerics.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithGenerics.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics.Child.ChildBuilder builder() { return new SuperBuilderWithGenerics.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java index 011604e9b9..5cbec49a0f 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java @@ -4,26 +4,32 @@ public static class Parent { A field1; List items; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithGenerics2.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field1(final A field1) { this.field1 = field1; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -33,37 +39,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics2.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithGenerics2.Parent.ParentBuilder, SuperBuilderWithGenerics2.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics2.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics2.Parent build() { return new SuperBuilderWithGenerics2.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.List items; @@ -80,6 +95,7 @@ protected Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder b this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics2.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics2.Parent.ParentBuilderImpl(); } @@ -87,51 +103,63 @@ protected Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder b public static class Child extends Parent { A field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder, B extends SuperBuilderWithGenerics2.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final A field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics2.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithGenerics2.Child.ChildBuilder, SuperBuilderWithGenerics2.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics2.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics2.Child build() { return new SuperBuilderWithGenerics2.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithGenerics2.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics2.Child.ChildBuilder builder2() { return new SuperBuilderWithGenerics2.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java index ac33d10f22..d8f2b14a4a 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java @@ -3,48 +3,60 @@ public class SuperBuilderWithGenerics3 { public static class Parent { private final String str; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithGenerics3.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private String str; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B str(final String str) { this.str = str; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics3.Parent.ParentBuilder(str=" + this.str + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithGenerics3.Parent.ParentBuilder, SuperBuilderWithGenerics3.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics3.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics3.Parent build() { return new SuperBuilderWithGenerics3.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithGenerics3.Parent.ParentBuilder b) { this.str = b.str; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics3.Parent.ParentBuilder builder() { return new SuperBuilderWithGenerics3.Parent.ParentBuilderImpl(); } @@ -54,53 +66,65 @@ public static class SomeInnerStaticClass { } double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field3(final double field3) { this.field3 = field3; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenerics3.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithGenerics3.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenerics3.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenerics3.Child build() { return new SuperBuilderWithGenerics3.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithGenerics3.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenerics3.Child.ChildBuilder builder() { return new SuperBuilderWithGenerics3.Child.ChildBuilderImpl(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java index b85e233c79..77bb57d2c8 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java @@ -4,19 +4,25 @@ public static class Parent { A field1; Map items; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private A field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items$key; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items$value; @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { b.field1(instance.field1); b.items(instance.items == null ? java.util.Collections.emptyMap() : instance.items); @@ -25,11 +31,13 @@ public static abstract class ParentBuilder(); @@ -40,6 +48,7 @@ public B item(final Integer itemKey, final String itemValue) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Map items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -55,6 +64,7 @@ public B items(final java.util.Map items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items$key != null) { this.items$key.clear(); @@ -63,32 +73,40 @@ public B clearItems() { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder(field1=" + this.field1 + ", items$key=" + this.items$key + ", items$value=" + this.items$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder, SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenericsAndToBuilder.Parent build() { return new SuperBuilderWithGenericsAndToBuilder.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.Map items; @@ -107,10 +125,12 @@ protected Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder builder() { return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder toBuilder() { return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this); } @@ -118,17 +138,21 @@ protected Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder public static class Child extends Parent { double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder, B extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Child instance, final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { b.field3(instance.field3); } @@ -136,48 +160,59 @@ public static abstract class ChildBuilder extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder, SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenericsAndToBuilder.Child build() { return new SuperBuilderWithGenericsAndToBuilder.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder builder() { return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder toBuilder() { return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java index f51b204dce..b12962f5d3 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java @@ -5,19 +5,24 @@ public static class Parent { @lombok.NonNull final String nonNullParentField; @java.lang.SuppressWarnings("all") + @lombok.Generated private static String $default$nonNullParentField() { return "default"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private boolean nonNullParentField$set; @java.lang.SuppressWarnings("all") + @lombok.Generated private String nonNullParentField$value; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B nonNullParentField(@lombok.NonNull final String nonNullParentField) { if (nonNullParentField == null) { throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); @@ -27,32 +32,40 @@ public B nonNullParentField(@lombok.NonNull final String nonNullParentField) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithNonNull.Parent.ParentBuilder(nonNullParentField$value=" + this.nonNullParentField$value + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithNonNull.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithNonNull.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithNonNull.Parent build() { return new SuperBuilderWithNonNull.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithNonNull.Parent.ParentBuilder b) { if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField$value; else this.nonNullParentField = SuperBuilderWithNonNull.Parent.$default$nonNullParentField(); @@ -61,6 +74,7 @@ protected Parent(final SuperBuilderWithNonNull.Parent.ParentBuilder b) { } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithNonNull.Parent.ParentBuilder builder() { return new SuperBuilderWithNonNull.Parent.ParentBuilderImpl(); } @@ -69,13 +83,16 @@ public static class Child extends Parent { @lombok.NonNull String nonNullChildField; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private String nonNullChildField; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B nonNullChildField(@lombok.NonNull final String nonNullChildField) { if (nonNullChildField == null) { throw new java.lang.NullPointerException("nonNullChildField is marked non-null but is null"); @@ -85,33 +102,41 @@ public B nonNullChildField(@lombok.NonNull final String nonNullChildField) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithNonNull.Child.ChildBuilder(super=" + super.toString() + ", nonNullChildField=" + this.nonNullChildField + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithNonNull.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithNonNull.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithNonNull.Child build() { return new SuperBuilderWithNonNull.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithNonNull.Child.ChildBuilder b) { super(b); this.nonNullChildField = b.nonNullChildField; @@ -120,6 +145,7 @@ protected Child(final SuperBuilderWithNonNull.Child.ChildBuilder b) { } } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithNonNull.Child.ChildBuilder builder() { return new SuperBuilderWithNonNull.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithOverloadedGeneratedMethods.java b/test/transform/resource/after-delombok/SuperBuilderWithOverloadedGeneratedMethods.java index 4c8b77a826..bc1657018b 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithOverloadedGeneratedMethods.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithOverloadedGeneratedMethods.java @@ -2,48 +2,60 @@ public class SuperBuilderWithOverloadedGeneratedMethods { public static class Parent { int self; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int self; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B self(final int self) { this.self = self; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder(self=" + this.self + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithOverloadedGeneratedMethods.Parent build() { return new SuperBuilderWithOverloadedGeneratedMethods.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder b) { this.self = b.self; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilder builder() { return new SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentBuilderImpl(); } @@ -51,51 +63,63 @@ protected Parent(final SuperBuilderWithOverloadedGeneratedMethods.Parent.ParentB public static class Child extends Parent { double build; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double build; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B build(final double build) { this.build = build; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder(super=" + super.toString() + ", build=" + this.build + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ChildBuilderImpl extends SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithOverloadedGeneratedMethods.Child build() { return new SuperBuilderWithOverloadedGeneratedMethods.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder b) { super(b); this.build = b.build; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilder builder() { return new SuperBuilderWithOverloadedGeneratedMethods.Child.ChildBuilderImpl(); } diff --git a/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java b/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java index 04c230516f..39a3485c82 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java @@ -3,17 +3,22 @@ class SuperBuilderWithPrefixes { int xOtherField; java.util.List mItems; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class SuperBuilderWithPrefixesBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field; @java.lang.SuppressWarnings("all") + @lombok.Generated private int otherField; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; /** * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B field(final int field) { this.field = field; return self(); @@ -22,17 +27,20 @@ public B field(final int field) { * @return {@code this}. */ @java.lang.SuppressWarnings("all") + @lombok.Generated public B otherField(final int otherField) { this.otherField = otherField; return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B items(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -42,37 +50,46 @@ public B items(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder(field=" + this.field + ", otherField=" + this.otherField + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class SuperBuilderWithPrefixesBuilderImpl extends SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private SuperBuilderWithPrefixesBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithPrefixes build() { return new SuperBuilderWithPrefixes(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithPrefixes(final SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder b) { this.mField = b.field; this.xOtherField = b.otherField; @@ -90,7 +107,8 @@ protected SuperBuilderWithPrefixes(final SuperBuilderWithPrefixes.SuperBuilderWi this.mItems = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder builder() { return new SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java index a82e2eac08..82c9c96a87 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java @@ -13,23 +13,31 @@ private static String staticMethod(Parent instance) { return "staticMethod"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ParentBuilder> { @java.lang.SuppressWarnings("all") + @lombok.Generated private int field1; @java.lang.SuppressWarnings("all") + @lombok.Generated private int obtainViaField; @java.lang.SuppressWarnings("all") + @lombok.Generated private int obtainViaMethod; @java.lang.SuppressWarnings("all") + @lombok.Generated private String obtainViaStaticMethod; @java.lang.SuppressWarnings("all") + @lombok.Generated private java.util.ArrayList items; @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { SuperBuilderWithSetterPrefix.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Parent instance, final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { b.withField1(instance.field1); b.withObtainViaField(instance.field1); @@ -41,6 +49,7 @@ public static abstract class ParentBuilder(); this.items.add(item); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B withItems(final java.util.Collection items) { if (items == null) { throw new java.lang.NullPointerException("items cannot be null"); @@ -85,37 +99,46 @@ public B withItems(final java.util.Collection items) { return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public B clearItems() { if (this.items != null) this.items.clear(); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated protected abstract B self(); @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract C build(); @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "SuperBuilderWithSetterPrefix.Parent.ParentBuilder(field1=" + this.field1 + ", obtainViaField=" + this.obtainViaField + ", obtainViaMethod=" + this.obtainViaMethod + ", obtainViaStaticMethod=" + this.obtainViaStaticMethod + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") + @lombok.Generated private static final class ParentBuilderImpl extends SuperBuilderWithSetterPrefix.Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithSetterPrefix.Parent build() { return new SuperBuilderWithSetterPrefix.Parent(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Parent(final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b) { this.field1 = b.field1; this.obtainViaField = b.obtainViaField; @@ -135,10 +158,12 @@ protected Parent(final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b this.items = items; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithSetterPrefix.Parent.ParentBuilder builder() { return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithSetterPrefix.Parent.ParentBuilder toBuilder() { return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl().$fillValuesFrom(this); } @@ -146,17 +171,21 @@ protected Parent(final SuperBuilderWithSetterPrefix.Parent.ParentBuilder b public static class Child extends Parent { private double field3; @java.lang.SuppressWarnings("all") + @lombok.Generated public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private double field3; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); SuperBuilderWithSetterPrefix.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } @java.lang.SuppressWarnings("all") + @lombok.Generated private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Child instance, final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { b.setField3(instance.field3); } @@ -164,48 +193,59 @@ public static abstract class ChildBuilder { @java.lang.SuppressWarnings("all") + @lombok.Generated private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated protected SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithSetterPrefix.Child build() { return new SuperBuilderWithSetterPrefix.Child(this); } } @java.lang.SuppressWarnings("all") + @lombok.Generated protected Child(final SuperBuilderWithSetterPrefix.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static SuperBuilderWithSetterPrefix.Child.ChildBuilder builder() { return new SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public SuperBuilderWithSetterPrefix.Child.ChildBuilder toBuilder() { return new SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl().$fillValuesFrom(this); } diff --git a/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java b/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java index 904487a317..69243cf1c5 100644 --- a/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java +++ b/test/transform/resource/after-delombok/SynchronizedInAnonymousClass.java @@ -1,10 +1,9 @@ public class SynchronizedInAnonymousClass { Object annonymous = new Object() { - class Inner { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; - public void foo() { synchronized (this.$lock) { String foo = "bar"; diff --git a/test/transform/resource/after-delombok/SynchronizedInInitializer.java b/test/transform/resource/after-delombok/SynchronizedInInitializer.java index c63f4e74bd..0a0491cbdc 100644 --- a/test/transform/resource/after-delombok/SynchronizedInInitializer.java +++ b/test/transform/resource/after-delombok/SynchronizedInInitializer.java @@ -1,6 +1,7 @@ public class SynchronizedInInitializer { public static final Runnable SYNCHRONIZED = new Runnable() { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; @Override public void run() { diff --git a/test/transform/resource/after-delombok/SynchronizedPlain.java b/test/transform/resource/after-delombok/SynchronizedPlain.java index f178aa4ee7..2c0735e61f 100644 --- a/test/transform/resource/after-delombok/SynchronizedPlain.java +++ b/test/transform/resource/after-delombok/SynchronizedPlain.java @@ -1,5 +1,6 @@ class SynchronizedPlain1 { @java.lang.SuppressWarnings("all") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; void test() { synchronized (this.$lock) { @@ -14,6 +15,7 @@ void test2() { } class SynchronizedPlain2 { @java.lang.SuppressWarnings("all") + @lombok.Generated private static final java.lang.Object $LOCK = new java.lang.Object[0]; static void test() { synchronized (SynchronizedPlain2.$LOCK) { diff --git a/test/transform/resource/after-delombok/ToStringArray.java b/test/transform/resource/after-delombok/ToStringArray.java index ffd614ad39..d44a26b52a 100644 --- a/test/transform/resource/after-delombok/ToStringArray.java +++ b/test/transform/resource/after-delombok/ToStringArray.java @@ -1,12 +1,11 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Target; - public class ToStringArray { int[] primitiveArray; Object[] objectArray; - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringArray(primitiveArray=" + java.util.Arrays.toString(this.primitiveArray) + ", objectArray=" + java.util.Arrays.deepToString(this.objectArray) + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringArrayTypeAnnotations.java b/test/transform/resource/after-delombok/ToStringArrayTypeAnnotations.java index b2104ffd6c..143ff4915c 100644 --- a/test/transform/resource/after-delombok/ToStringArrayTypeAnnotations.java +++ b/test/transform/resource/after-delombok/ToStringArrayTypeAnnotations.java @@ -1,7 +1,6 @@ //version 8: import java.lang.annotation.ElementType; import java.lang.annotation.Target; - public class ToStringArrayTypeAnnotations { @TA int[] primitiveArray1; @@ -9,14 +8,12 @@ public class ToStringArrayTypeAnnotations { @TA Object[] objectArray1; Object @TA [] objectArray2; - - @Target({ElementType.TYPE_USE}) @interface TA { } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringArrayTypeAnnotations(primitiveArray1=" + java.util.Arrays.toString(this.primitiveArray1) + ", primitiveArray2=" + java.util.Arrays.toString(this.primitiveArray2) + ", objectArray1=" + java.util.Arrays.deepToString(this.objectArray1) + ", objectArray2=" + java.util.Arrays.deepToString(this.objectArray2) + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringAutoExclude.java b/test/transform/resource/after-delombok/ToStringAutoExclude.java index 2beee75649..5bdf5b9147 100644 --- a/test/transform/resource/after-delombok/ToStringAutoExclude.java +++ b/test/transform/resource/after-delombok/ToStringAutoExclude.java @@ -4,6 +4,7 @@ class ToStringAutoExclude { transient String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringAutoExclude(x=" + this.x + ", b=" + this.b + ")"; } @@ -14,7 +15,8 @@ class ToStringAutoExclude2 { transient String b; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringAutoExclude2(x=" + this.x + ", $a=" + this.$a + ", b=" + this.b + ")"; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/ToStringAutoSuper.java b/test/transform/resource/after-delombok/ToStringAutoSuper.java index 1fe5958175..91d2caf4d1 100644 --- a/test/transform/resource/after-delombok/ToStringAutoSuper.java +++ b/test/transform/resource/after-delombok/ToStringAutoSuper.java @@ -1,14 +1,15 @@ class ToStringAutoSuperWithNoParent { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringAutoSuperWithNoParent()"; } } - class ToStringAutoSuperWithParent extends ToStringAutoSuperWithNoParent { @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringAutoSuperWithParent(super=" + super.toString() + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringConfiguration.java b/test/transform/resource/after-delombok/ToStringConfiguration.java index 6fa9111ec8..7700530d2a 100644 --- a/test/transform/resource/after-delombok/ToStringConfiguration.java +++ b/test/transform/resource/after-delombok/ToStringConfiguration.java @@ -2,10 +2,12 @@ class ToStringConfiguration { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration(" + this.x + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @@ -14,6 +16,7 @@ class ToStringConfiguration2 { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration2(x=" + this.x + ")"; } @@ -22,10 +25,12 @@ class ToStringConfiguration3 { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration3(" + this.getX() + ")"; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/ToStringEnum.java b/test/transform/resource/after-delombok/ToStringEnum.java index 9d852e1949..10adc1f382 100644 --- a/test/transform/resource/after-delombok/ToStringEnum.java +++ b/test/transform/resource/after-delombok/ToStringEnum.java @@ -2,6 +2,7 @@ enum ToStringEnum1 { CONSTANT; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringEnum1." + this.name(); } @@ -12,6 +13,7 @@ enum ToStringEnum2 { String name; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringEnum2." + this.name() + "(x=" + this.x + ", name=" + this.name + ")"; } @@ -21,8 +23,9 @@ enum MemberEnum { CONSTANT; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringEnum3.MemberEnum." + this.name(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/ToStringExplicitInclude.java b/test/transform/resource/after-delombok/ToStringExplicitInclude.java index e6b4c09a81..db445b0134 100644 --- a/test/transform/resource/after-delombok/ToStringExplicitInclude.java +++ b/test/transform/resource/after-delombok/ToStringExplicitInclude.java @@ -2,7 +2,8 @@ class ToStringExplicitInclude { int x; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringExplicitInclude()"; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/ToStringExplicitIncludeConf.java b/test/transform/resource/after-delombok/ToStringExplicitIncludeConf.java index c4962ed834..9e0954f6a1 100644 --- a/test/transform/resource/after-delombok/ToStringExplicitIncludeConf.java +++ b/test/transform/resource/after-delombok/ToStringExplicitIncludeConf.java @@ -3,6 +3,7 @@ class ToStringExplicitIncludeConf { int y; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringExplicitIncludeConf(y=" + this.y + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringInAnonymousClass.java b/test/transform/resource/after-delombok/ToStringInAnonymousClass.java index aa3651bb49..23755167c1 100644 --- a/test/transform/resource/after-delombok/ToStringInAnonymousClass.java +++ b/test/transform/resource/after-delombok/ToStringInAnonymousClass.java @@ -1,11 +1,10 @@ public class ToStringInAnonymousClass { Object annonymous = new Object() { - class Inner { private String string; - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Inner(string=" + this.string + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringInner.java b/test/transform/resource/after-delombok/ToStringInner.java index fe77fcfda1..cc48b9e8ff 100644 --- a/test/transform/resource/after-delombok/ToStringInner.java +++ b/test/transform/resource/after-delombok/ToStringInner.java @@ -5,6 +5,7 @@ class ToStringInner { int y; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringInner(y=" + this.y + ")"; } @@ -13,6 +14,7 @@ static class ToStringStaticInner { int y; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringStaticInner(y=" + this.y + ")"; } @@ -22,14 +24,15 @@ class ToStringMoreInner { String name; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name + ")"; } } } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter(x=" + this.x + ", name=" + this.name + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringNewStyle.java b/test/transform/resource/after-delombok/ToStringNewStyle.java index 0a54bd2498..91fe67fe30 100644 --- a/test/transform/resource/after-delombok/ToStringNewStyle.java +++ b/test/transform/resource/after-delombok/ToStringNewStyle.java @@ -12,6 +12,7 @@ int f() { int j; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToStringNewStyle(a=" + this.b + ", c=" + this.c + ", e=" + this.d + ", f=" + this.f() + ", g=" + this.g + ", i=" + this.i + ", h=" + this.h + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringPlain.java b/test/transform/resource/after-delombok/ToStringPlain.java index af9daf4fdd..c277b26cf2 100644 --- a/test/transform/resource/after-delombok/ToStringPlain.java +++ b/test/transform/resource/after-delombok/ToStringPlain.java @@ -3,6 +3,7 @@ class ToString1 { String name; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToString1(x=" + this.x + ", name=" + this.name + ")"; } @@ -12,6 +13,7 @@ class ToString2 { String name; @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ToString2(x=" + this.x + ", name=" + this.name + ")"; } diff --git a/test/transform/resource/after-delombok/Tolerate.java b/test/transform/resource/after-delombok/Tolerate.java index 2539f091ac..8ae38a3ab5 100644 --- a/test/transform/resource/after-delombok/Tolerate.java +++ b/test/transform/resource/after-delombok/Tolerate.java @@ -6,10 +6,12 @@ public void setPattern(String pattern) { setPattern(Pattern.compile(pattern)); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setPattern(final Pattern pattern) { this.pattern = pattern; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Pattern getPattern() { return this.pattern; } @@ -24,6 +26,7 @@ public Tolerate2 withPattern(String nameGlob, String extensionGlob) { return withPattern(nameGlob.replace("*", ".*") + "\\." + extensionGlob.replace("*", ".*")); } @java.lang.SuppressWarnings("all") + @lombok.Generated public Pattern getPattern() { return this.pattern; } @@ -31,10 +34,12 @@ public Pattern getPattern() { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public Tolerate2 withPattern(final Pattern pattern) { return this.pattern == pattern ? this : new Tolerate2(pattern); } @java.lang.SuppressWarnings("all") + @lombok.Generated public Tolerate2(final Pattern pattern) { this.pattern = pattern; } diff --git a/test/transform/resource/after-delombok/TypeUseAnnotations.java b/test/transform/resource/after-delombok/TypeUseAnnotations.java index 37c24c53cb..9b4b731c4b 100644 --- a/test/transform/resource/after-delombok/TypeUseAnnotations.java +++ b/test/transform/resource/after-delombok/TypeUseAnnotations.java @@ -9,16 +9,15 @@ class TypeUseAnnotations { List<@TA(x = 5) String> foo; List bar; - class Inner { } - @java.lang.SuppressWarnings("all") + @lombok.Generated public List<@TA(x = 5) String> getFoo() { return this.foo; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public List getBar() { return this.bar; } diff --git a/test/transform/resource/after-delombok/UtilityClass.java b/test/transform/resource/after-delombok/UtilityClass.java index 1d541b6e98..983fbc29c3 100644 --- a/test/transform/resource/after-delombok/UtilityClass.java +++ b/test/transform/resource/after-delombok/UtilityClass.java @@ -12,6 +12,7 @@ protected static class InnerStaticClass { private String innerInnerMember; } @java.lang.SuppressWarnings("all") + @lombok.Generated private UtilityClass() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -21,6 +22,7 @@ static class InnerInner { static final class InnerInnerInner { static int member; @java.lang.SuppressWarnings("all") + @lombok.Generated private InnerInnerInner() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -31,6 +33,7 @@ enum UtilityInsideEnum { static final class InsideEnum { static int member; @java.lang.SuppressWarnings("all") + @lombok.Generated private InsideEnum() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -40,6 +43,7 @@ interface UtilityInsideInterface { final class InsideInterface { static int member; @java.lang.SuppressWarnings("all") + @lombok.Generated private InsideInterface() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } diff --git a/test/transform/resource/after-delombok/UtilityClassGeneric.java b/test/transform/resource/after-delombok/UtilityClassGeneric.java index 469d2d019c..82bd1630a8 100644 --- a/test/transform/resource/after-delombok/UtilityClassGeneric.java +++ b/test/transform/resource/after-delombok/UtilityClassGeneric.java @@ -2,20 +2,17 @@ final class UtilityClassGeneric { static T convertValue(Class toValueType) { return null; } - static DTO convert(Object json) { return convertValue(DTO.class); } - static Object convert(DTO dto) { return null; } - static class DTO { } - @java.lang.SuppressWarnings("all") + @lombok.Generated private UtilityClassGeneric() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/UtilityClassInner.java b/test/transform/resource/after-delombok/UtilityClassInner.java index 72f1656a90..4c4c674377 100644 --- a/test/transform/resource/after-delombok/UtilityClassInner.java +++ b/test/transform/resource/after-delombok/UtilityClassInner.java @@ -1,8 +1,9 @@ class UtilityClassInner { static final class UtilClass { @java.lang.SuppressWarnings("all") + @lombok.Generated private UtilClass() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/ValueCallSuper.java b/test/transform/resource/after-delombok/ValueCallSuper.java index 5598779fbb..5e21ffec4d 100644 --- a/test/transform/resource/after-delombok/ValueCallSuper.java +++ b/test/transform/resource/after-delombok/ValueCallSuper.java @@ -2,10 +2,12 @@ class ValueParent { } final class ValueCallSuper extends ValueParent { @java.lang.SuppressWarnings("all") + @lombok.Generated public ValueCallSuper() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueCallSuper)) return false; @@ -15,17 +17,20 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof ValueCallSuper; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = super.hashCode(); return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ValueCallSuper()"; } diff --git a/test/transform/resource/after-delombok/ValueInAnonymousClass.java b/test/transform/resource/after-delombok/ValueInAnonymousClass.java index 5bab409312..5e776acd56 100644 --- a/test/transform/resource/after-delombok/ValueInAnonymousClass.java +++ b/test/transform/resource/after-delombok/ValueInAnonymousClass.java @@ -1,21 +1,20 @@ public class ValueInAnonymousClass { Object annonymous = new Object() { - final class Inner { private final String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner(final String string) { this.string = string; } - @java.lang.SuppressWarnings("all") + @lombok.Generated public String getString() { return this.string; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Inner)) return false; @@ -25,9 +24,9 @@ public boolean equals(final java.lang.Object o) { if (this$string == null ? other$string != null : !this$string.equals(other$string)) return false; return true; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -35,9 +34,9 @@ public int hashCode() { result = result * PRIME + ($string == null ? 43 : $string.hashCode()); return result; } - @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Inner(string=" + this.getString() + ")"; } diff --git a/test/transform/resource/after-delombok/ValuePlain.java b/test/transform/resource/after-delombok/ValuePlain.java index cf2c1142c3..db830f9ee1 100644 --- a/test/transform/resource/after-delombok/ValuePlain.java +++ b/test/transform/resource/after-delombok/ValuePlain.java @@ -2,20 +2,24 @@ final class Value1 { private final int x; private final String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Value1(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value1)) return false; @@ -28,6 +32,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -38,6 +43,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Value1(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -46,20 +52,24 @@ class Value2 { public final int x; private final String name; @java.lang.SuppressWarnings("all") + @lombok.Generated public Value2(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value2)) return false; @@ -72,11 +82,13 @@ public boolean equals(final java.lang.Object o) { return true; } @java.lang.SuppressWarnings("all") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Value2; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -87,6 +99,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Value2(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -95,20 +108,24 @@ final class Value3 { private int x; private final int y; @java.lang.SuppressWarnings("all") + @lombok.Generated public Value3(final int x, final int y) { this.x = x; this.y = y; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getY() { return this.y; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value3)) return false; @@ -119,6 +136,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -128,6 +146,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "Value3(x=" + this.getX() + ", y=" + this.getY() + ")"; } diff --git a/test/transform/resource/after-delombok/ValueStaticConstructorOf.java b/test/transform/resource/after-delombok/ValueStaticConstructorOf.java index e45646289e..2adcdf90d9 100644 --- a/test/transform/resource/after-delombok/ValueStaticConstructorOf.java +++ b/test/transform/resource/after-delombok/ValueStaticConstructorOf.java @@ -6,19 +6,23 @@ private ValueStaticConstructorOf(String name, Double price) { this.price = price; } @java.lang.SuppressWarnings("all") + @lombok.Generated public static ValueStaticConstructorOf of(final String name, final Double price) { return new ValueStaticConstructorOf(name, price); } @java.lang.SuppressWarnings("all") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Double getPrice() { return this.price; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueStaticConstructorOf)) return false; @@ -33,6 +37,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -44,6 +49,7 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ValueStaticConstructorOf(name=" + this.getName() + ", price=" + this.getPrice() + ")"; } diff --git a/test/transform/resource/after-delombok/ValueStaticField.java b/test/transform/resource/after-delombok/ValueStaticField.java index 3ba53faf73..713793acbc 100644 --- a/test/transform/resource/after-delombok/ValueStaticField.java +++ b/test/transform/resource/after-delombok/ValueStaticField.java @@ -2,10 +2,12 @@ final class ValueStaticField { static int x; static String PASSWORD = "Ken sent me"; @java.lang.SuppressWarnings("all") + @lombok.Generated public ValueStaticField() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueStaticField)) return false; @@ -13,12 +15,14 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int result = 1; return result; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ValueStaticField()"; } diff --git a/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java index 543481e84b..3d86ef7814 100644 --- a/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-delombok/ValueWithJavaBeansSpecCapitalization.java @@ -1,15 +1,18 @@ final class ValueWithJavaBeansSpecCapitalization { private final int aField; @java.lang.SuppressWarnings("all") + @lombok.Generated public ValueWithJavaBeansSpecCapitalization(final int aField) { this.aField = aField; } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getaField() { return this.aField; } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueWithJavaBeansSpecCapitalization)) return false; @@ -19,6 +22,7 @@ public boolean equals(final java.lang.Object o) { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -27,7 +31,8 @@ public int hashCode() { } @java.lang.Override @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String toString() { return "ValueWithJavaBeansSpecCapitalization(aField=" + this.getaField() + ")"; } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/WithAlreadyExists.java b/test/transform/resource/after-delombok/WithAlreadyExists.java index 6997deb91a..a96db1624b 100644 --- a/test/transform/resource/after-delombok/WithAlreadyExists.java +++ b/test/transform/resource/after-delombok/WithAlreadyExists.java @@ -36,6 +36,7 @@ void withFoo() { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public With5 withFoo(final String foo) { return this.foo == foo ? this : new With5(foo); } @@ -50,6 +51,7 @@ void withFoo(String foo, int x) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public With6 withFoo(final String foo) { return this.foo == foo ? this : new With6(foo); } diff --git a/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java index 4a88bb0e0c..31945699ba 100644 --- a/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java +++ b/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java @@ -5,6 +5,7 @@ class WithAndAllArgsConstructor { int y = 20; final int z; @java.lang.SuppressWarnings("all") + @lombok.Generated public WithAndAllArgsConstructor(final J test, final java.util.List test2, final int y, final int z) { this.test = test; this.test2 = test2; @@ -15,6 +16,7 @@ public WithAndAllArgsConstructor(final J test, final java.util.List test2, fi * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithAndAllArgsConstructor withTest(final J test) { return this.test == test ? this : new WithAndAllArgsConstructor(test, this.test2, this.y, this.z); } @@ -22,6 +24,7 @@ public WithAndAllArgsConstructor withTest(final J test) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithAndAllArgsConstructor withTest2(final java.util.List test2) { return this.test2 == test2 ? this : new WithAndAllArgsConstructor(this.test, test2, this.y, this.z); } diff --git a/test/transform/resource/after-delombok/WithByInAnonymousClass.java b/test/transform/resource/after-delombok/WithByInAnonymousClass.java index d84955b614..aeaaa2fa80 100644 --- a/test/transform/resource/after-delombok/WithByInAnonymousClass.java +++ b/test/transform/resource/after-delombok/WithByInAnonymousClass.java @@ -1,14 +1,12 @@ //version 8: public class WithByInAnonymousClass { Object annonymous = new Object() { - class Inner { private Inner(String string) { } - private String string; - @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner withStringBy(final java.util.function.Function transformer) { return new Inner(transformer.apply(this.string)); } diff --git a/test/transform/resource/after-delombok/WithByNullAnnos.java b/test/transform/resource/after-delombok/WithByNullAnnos.java index 04d64f16f4..e69bdafe68 100644 --- a/test/transform/resource/after-delombok/WithByNullAnnos.java +++ b/test/transform/resource/after-delombok/WithByNullAnnos.java @@ -3,11 +3,13 @@ public class WithByNullAnnos { final List test; @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByNullAnnos(final List test) { this.test = test; } @org.checkerframework.checker.nullness.qual.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByNullAnnos withTestBy(final java.util.function.@org.checkerframework.checker.nullness.qual.NonNull Function, ? extends List> transformer) { return new WithByNullAnnos(transformer.apply(this.test)); } diff --git a/test/transform/resource/after-delombok/WithByOnRecord.java b/test/transform/resource/after-delombok/WithByOnRecord.java index 4d1ccd0132..83b9f40dc1 100644 --- a/test/transform/resource/after-delombok/WithByOnRecord.java +++ b/test/transform/resource/after-delombok/WithByOnRecord.java @@ -1,10 +1,12 @@ // version 14: public record WithByOnRecord(String a, String b) { @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByOnRecord withABy(final java.util.function.Function transformer) { return new WithByOnRecord(transformer.apply(this.a), this.b); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByOnRecord withBBy(final java.util.function.Function transformer) { return new WithByOnRecord(this.a, transformer.apply(this.b)); } diff --git a/test/transform/resource/after-delombok/WithByOnRecordComponent.java b/test/transform/resource/after-delombok/WithByOnRecordComponent.java index 851c5560c8..81e1d55a75 100644 --- a/test/transform/resource/after-delombok/WithByOnRecordComponent.java +++ b/test/transform/resource/after-delombok/WithByOnRecordComponent.java @@ -1,6 +1,7 @@ // version 14: public record WithByOnRecordComponent(String a, String b) { @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByOnRecordComponent withABy(final java.util.function.Function transformer) { return new WithByOnRecordComponent(transformer.apply(this.a), this.b); } diff --git a/test/transform/resource/after-delombok/WithByTypes.java b/test/transform/resource/after-delombok/WithByTypes.java index f1f1ef5f00..d9ee4f64c9 100644 --- a/test/transform/resource/after-delombok/WithByTypes.java +++ b/test/transform/resource/after-delombok/WithByTypes.java @@ -13,6 +13,7 @@ public static void example() { new WithByTypes(0, 0, (short) 0, ' ', (byte) 0, 0.0, 0.0F, true, "").withHBy(x -> !x).withFBy(x -> x + 0.5); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes(final int a, final long b, final short c, final char d, final byte e, final double f, final float g, final boolean h, final T i) { this.a = a; this.b = b; @@ -25,39 +26,48 @@ public WithByTypes(final int a, final long b, final short c, final char d, final this.i = i; } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withABy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(transformer.applyAsInt(this.a), this.b, this.c, this.d, this.e, this.f, this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withBBy(final java.util.function.LongUnaryOperator transformer) { return new WithByTypes(this.a, transformer.applyAsLong(this.b), this.c, this.d, this.e, this.f, this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withCBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, (short) transformer.applyAsInt(this.c), this.d, this.e, this.f, this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withDBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, (char) transformer.applyAsInt(this.d), this.e, this.f, this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withEBy(final java.util.function.IntUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, (byte) transformer.applyAsInt(this.e), this.f, this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withFBy(final java.util.function.DoubleUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, transformer.applyAsDouble(this.f), this.g, this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withGBy(final java.util.function.DoubleUnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, (float) transformer.applyAsDouble(this.g), this.h, this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withHBy(final java.util.function.UnaryOperator transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, this.g, transformer.apply(this.h), this.i); } @java.lang.SuppressWarnings("all") + @lombok.Generated public WithByTypes withIBy(final java.util.function.Function transformer) { return new WithByTypes(this.a, this.b, this.c, this.d, this.e, this.f, this.g, this.h, transformer.apply(this.i)); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-delombok/WithInAnonymousClass.java b/test/transform/resource/after-delombok/WithInAnonymousClass.java index 0249053331..929ecbf2f9 100644 --- a/test/transform/resource/after-delombok/WithInAnonymousClass.java +++ b/test/transform/resource/after-delombok/WithInAnonymousClass.java @@ -1,16 +1,14 @@ public class WithInAnonymousClass { Object annonymous = new Object() { - class Inner { private Inner(String string) { } - private String string; - /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public Inner withString(final String string) { return this.string == string ? this : new Inner(string); } diff --git a/test/transform/resource/after-delombok/WithMethodAbstract.java b/test/transform/resource/after-delombok/WithMethodAbstract.java index 250330f7fc..68e0586be8 100644 --- a/test/transform/resource/after-delombok/WithMethodAbstract.java +++ b/test/transform/resource/after-delombok/WithMethodAbstract.java @@ -4,5 +4,6 @@ abstract class WithMethodAbstract { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public abstract WithMethodAbstract withFoo(final String foo); } diff --git a/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java b/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java index dad6ff9b3c..cc7fc1c89a 100644 --- a/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java +++ b/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java @@ -12,6 +12,7 @@ class WithMethodMarkedDeprecated { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public WithMethodMarkedDeprecated withAnnotation(final int annotation) { return this.annotation == annotation ? this : new WithMethodMarkedDeprecated(annotation, this.javadoc); } @@ -21,6 +22,7 @@ public WithMethodMarkedDeprecated withAnnotation(final int annotation) { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public WithMethodMarkedDeprecated withJavadoc(final int javadoc) { return this.javadoc == javadoc ? this : new WithMethodMarkedDeprecated(this.annotation, javadoc); } diff --git a/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java b/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java index 41139a0fda..a2f4561c37 100644 --- a/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java +++ b/test/transform/resource/after-delombok/WithMethodMarkedDeprecatedAnnOnly.java @@ -8,6 +8,7 @@ class WithMethodMarkedDeprecatedAnnOnly { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") + @lombok.Generated public WithMethodMarkedDeprecatedAnnOnly withAnnotation(final int annotation) { return this.annotation == annotation ? this : new WithMethodMarkedDeprecatedAnnOnly(annotation); } diff --git a/test/transform/resource/after-delombok/WithNested.java b/test/transform/resource/after-delombok/WithNested.java index b186dabfd1..c6e460648d 100644 --- a/test/transform/resource/after-delombok/WithNested.java +++ b/test/transform/resource/after-delombok/WithNested.java @@ -2,6 +2,7 @@ public interface WithNested { class IAmStaticReally { final String x; @java.lang.SuppressWarnings("all") + @lombok.Generated public IAmStaticReally(final String x) { this.x = x; } @@ -9,6 +10,7 @@ public IAmStaticReally(final String x) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithNested.IAmStaticReally withX(final String x) { return this.x == x ? this : new WithNested.IAmStaticReally(x); } diff --git a/test/transform/resource/after-delombok/WithOnClass.java b/test/transform/resource/after-delombok/WithOnClass.java index 0fa973eb45..6b85e6fa14 100644 --- a/test/transform/resource/after-delombok/WithOnClass.java +++ b/test/transform/resource/after-delombok/WithOnClass.java @@ -8,6 +8,7 @@ class WithOnClass1 { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnClass1 withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WithOnClass1(this.isNone, isPublic); } @@ -22,6 +23,7 @@ class WithOnClass2 { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated protected WithOnClass2 withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WithOnClass2(this.isNone, isProtected, this.isPackage); } @@ -29,6 +31,7 @@ protected WithOnClass2 withProtected(final boolean isProtected) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated WithOnClass2 withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WithOnClass2(this.isNone, this.isProtected, isPackage); } @@ -43,6 +46,7 @@ class WithOnClass3 { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnClass3 withCouldBeNull(final String couldBeNull) { return this.couldBeNull == couldBeNull ? this : new WithOnClass3(couldBeNull, this.nonNull); } @@ -50,6 +54,7 @@ public WithOnClass3 withCouldBeNull(final String couldBeNull) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnClass3 withNonNull(@lombok.NonNull final String nonNull) { if (nonNull == null) { throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); @@ -67,6 +72,7 @@ class WithOnClass4 { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnClass4 withY(final int fY) { return this.fY == fY ? this : new WithOnClass4(fY); } diff --git a/test/transform/resource/after-delombok/WithOnNestedRecord.java b/test/transform/resource/after-delombok/WithOnNestedRecord.java index 89a7547818..8a82212692 100644 --- a/test/transform/resource/after-delombok/WithOnNestedRecord.java +++ b/test/transform/resource/after-delombok/WithOnNestedRecord.java @@ -1,19 +1,19 @@ // version 14: public record WithOnNestedRecord() { - public record Nested(String a, String b) { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnNestedRecord.Nested withA(final String a) { return this.a == a ? this : new WithOnNestedRecord.Nested(a, this.b); } - /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnNestedRecord.Nested withB(final String b) { return this.b == b ? this : new WithOnNestedRecord.Nested(this.a, b); } diff --git a/test/transform/resource/after-delombok/WithOnRecord.java b/test/transform/resource/after-delombok/WithOnRecord.java index 5c2f0a8f46..778d994026 100644 --- a/test/transform/resource/after-delombok/WithOnRecord.java +++ b/test/transform/resource/after-delombok/WithOnRecord.java @@ -4,6 +4,7 @@ public record WithOnRecord(String a, String b) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnRecord withA(final String a) { return this.a == a ? this : new WithOnRecord(a, this.b); } @@ -11,6 +12,7 @@ public WithOnRecord withA(final String a) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnRecord withB(final String b) { return this.b == b ? this : new WithOnRecord(this.a, b); } diff --git a/test/transform/resource/after-delombok/WithOnRecordComponent.java b/test/transform/resource/after-delombok/WithOnRecordComponent.java index 217da88af9..806e17a5e3 100644 --- a/test/transform/resource/after-delombok/WithOnRecordComponent.java +++ b/test/transform/resource/after-delombok/WithOnRecordComponent.java @@ -4,6 +4,7 @@ public record WithOnRecordComponent(String a, String b) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithOnRecordComponent withA(final String a) { return this.a == a ? this : new WithOnRecordComponent(a, this.b); } diff --git a/test/transform/resource/after-delombok/WithPlain.java b/test/transform/resource/after-delombok/WithPlain.java index 6a1c46e6c5..aff3eb7370 100644 --- a/test/transform/resource/after-delombok/WithPlain.java +++ b/test/transform/resource/after-delombok/WithPlain.java @@ -11,6 +11,7 @@ class WithPlain { */ @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public WithPlain withI(final int i) { return this.i == i ? this : new WithPlain(i, this.foo); } @@ -19,6 +20,7 @@ public WithPlain withI(final int i) { */ @org.springframework.lang.NonNull @java.lang.SuppressWarnings("all") + @lombok.Generated public WithPlain withFoo(final int foo) { return this.foo == foo ? this : new WithPlain(this.i, foo); } diff --git a/test/transform/resource/after-delombok/WithWithGenerics.java b/test/transform/resource/after-delombok/WithWithGenerics.java index d1cd3380bd..971da8832f 100644 --- a/test/transform/resource/after-delombok/WithWithGenerics.java +++ b/test/transform/resource/after-delombok/WithWithGenerics.java @@ -9,6 +9,7 @@ public WithWithGenerics(J test, java.util.List test2, java.util.List withTest(final J test) { return this.test == test ? this : new WithWithGenerics(test, this.test2, this.test3); } @@ -16,6 +17,7 @@ public WithWithGenerics withTest(final J test) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithWithGenerics withTest2(final java.util.List test2) { return this.test2 == test2 ? this : new WithWithGenerics(this.test, test2, this.test3); } @@ -23,6 +25,7 @@ public WithWithGenerics withTest2(final java.util.List test2) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithWithGenerics withTest3(final java.util.List test3) { return this.test3 == test3 ? this : new WithWithGenerics(this.test, this.test2, test3); } diff --git a/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java b/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java index e3737848a8..6bbbad1fe1 100644 --- a/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java +++ b/test/transform/resource/after-delombok/WithWithJavaBeansSpecCapitalization.java @@ -6,6 +6,7 @@ class WithWithJavaBeansSpecCapitalization { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithWithJavaBeansSpecCapitalization withaField(final int aField) { return this.aField == aField ? this : new WithWithJavaBeansSpecCapitalization(aField); } diff --git a/test/transform/resource/after-delombok/WithWithTypeAnnos.java b/test/transform/resource/after-delombok/WithWithTypeAnnos.java index 8bc1dc8825..724b40e68b 100644 --- a/test/transform/resource/after-delombok/WithWithTypeAnnos.java +++ b/test/transform/resource/after-delombok/WithWithTypeAnnos.java @@ -18,6 +18,7 @@ class WithWithTypeAnnos { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WithWithTypeAnnos withFoo(@TA final List foo) { return this.foo == foo ? this : new WithWithTypeAnnos(foo); } diff --git a/test/transform/resource/after-delombok/WitherAccessLevel.java b/test/transform/resource/after-delombok/WitherAccessLevel.java index eec79cb6ad..c2c820ea88 100644 --- a/test/transform/resource/after-delombok/WitherAccessLevel.java +++ b/test/transform/resource/after-delombok/WitherAccessLevel.java @@ -11,6 +11,7 @@ class WitherAccessLevel { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated private WitherAccessLevel withPrivate(final boolean isPrivate) { return this.isPrivate == isPrivate ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value); } @@ -18,6 +19,7 @@ private WitherAccessLevel withPrivate(final boolean isPrivate) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated WitherAccessLevel withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value); } @@ -25,6 +27,7 @@ WitherAccessLevel withPackage(final boolean isPackage) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated protected WitherAccessLevel withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value); } @@ -32,6 +35,7 @@ protected WitherAccessLevel withProtected(final boolean isProtected) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WitherAccessLevel withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value); } @@ -39,6 +43,7 @@ public WitherAccessLevel withPublic(final boolean isPublic) { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WitherAccessLevel withValue(final boolean value) { return this.value == value ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value); } diff --git a/test/transform/resource/after-delombok/WitherLegacyStar.java b/test/transform/resource/after-delombok/WitherLegacyStar.java index 90d55ceeac..5bb12fe7ba 100644 --- a/test/transform/resource/after-delombok/WitherLegacyStar.java +++ b/test/transform/resource/after-delombok/WitherLegacyStar.java @@ -7,6 +7,7 @@ class WitherLegacyStar { * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ @java.lang.SuppressWarnings("all") + @lombok.Generated public WitherLegacyStar withI(final int i) { return this.i == i ? this : new WitherLegacyStar(i); } From a561449135e2c80731c04f3701a22bb521cd006b Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:38:55 +0200 Subject: [PATCH 046/118] [tests] Continue with adjusting tests to reflect `lombok.Generated` defaulted: javac usually skipped tests. --- .../resource/after-delombok/OnXJava7Style.java | 12 +++++++++--- .../after-delombok/TrickyTypeResolution.java | 1 + .../after-delombok/ValDelegateMethodReference.java | 8 ++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/test/transform/resource/after-delombok/OnXJava7Style.java b/test/transform/resource/after-delombok/OnXJava7Style.java index 67f8c8c833..9dc0946b08 100644 --- a/test/transform/resource/after-delombok/OnXJava7Style.java +++ b/test/transform/resource/after-delombok/OnXJava7Style.java @@ -20,48 +20,54 @@ public class OnXJava7Style { String i; @Foo @java.lang.SuppressWarnings("all") + @lombok.Generated public String getA() { return this.a; } @Foo @java.lang.SuppressWarnings("all") + @lombok.Generated public void setB(final String b) { this.b = b; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setC(@Foo("a") final String c) { this.c = c; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setD(@Bar(stuff = "b") final String d) { this.d = d; } @Foo("c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") + @lombok.Generated public String getE() { return this.e; } @Array @java.lang.SuppressWarnings("all") + @lombok.Generated public String getF() { return this.f; } - @Array @java.lang.SuppressWarnings("all") + @lombok.Generated public String getG() { return this.g; } - @Array({}) @java.lang.SuppressWarnings("all") + @lombok.Generated public String getH() { return this.h; } - @Array({"a", "b"}) @java.lang.SuppressWarnings("all") + @lombok.Generated public String getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/TrickyTypeResolution.java b/test/transform/resource/after-delombok/TrickyTypeResolution.java index 9a5aae16d6..d8d4b56ca3 100644 --- a/test/transform/resource/after-delombok/TrickyTypeResolution.java +++ b/test/transform/resource/after-delombok/TrickyTypeResolution.java @@ -14,6 +14,7 @@ class TrickyDoNothing2 { class TrickySuccess { int x; @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/ValDelegateMethodReference.java b/test/transform/resource/after-delombok/ValDelegateMethodReference.java index c62edd660b..2a3f9b6627 100644 --- a/test/transform/resource/after-delombok/ValDelegateMethodReference.java +++ b/test/transform/resource/after-delombok/ValDelegateMethodReference.java @@ -20,21 +20,25 @@ class Entity { private MyDelegate innerDelegate; @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.String getValue() { return this.innerDelegate.getValue(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public java.lang.Boolean getABoolean() { return this.innerDelegate.getABoolean(); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setValue(final java.lang.String value) { this.innerDelegate.setValue(value); } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setABoolean(final java.lang.Boolean aBoolean) { this.innerDelegate.setABoolean(aBoolean); } @@ -45,21 +49,25 @@ class MyDelegate { private Boolean aBoolean; @java.lang.SuppressWarnings("all") + @lombok.Generated public String getValue() { return this.value; } @java.lang.SuppressWarnings("all") + @lombok.Generated public Boolean getABoolean() { return this.aBoolean; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setValue(final String value) { this.value = value; } @java.lang.SuppressWarnings("all") + @lombok.Generated public void setABoolean(final Boolean aBoolean) { this.aBoolean = aBoolean; } From 067efcd0f1eef6813c1bbd1d1660f3e54dfbf391 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:45:28 +0200 Subject: [PATCH 047/118] [fixes #3667] [changelog] --- doc/changelog.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 68bf748288..64572a71ed 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -3,6 +3,7 @@ Lombok Changelog ### v1.18.33 "Edgy Guinea Pig" * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). +* IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [https://github.com/projectlombok/lombok/issues/3667](https://github.com/projectlombok/lombok/issues/3638). ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. From 3ddd39bcdc0f035bad8f967126d76e61a3e14409 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Fri, 17 May 2024 12:34:03 +0200 Subject: [PATCH 048/118] Fix link name --- doc/changelog.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 64572a71ed..3502e18a41 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -3,7 +3,7 @@ Lombok Changelog ### v1.18.33 "Edgy Guinea Pig" * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). -* IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [https://github.com/projectlombok/lombok/issues/3667](https://github.com/projectlombok/lombok/issues/3638). +* IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3638). ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. From 44ee6abcc6006da39f7268b75c2a45ee0f44d7d2 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Fri, 17 May 2024 12:46:25 +0200 Subject: [PATCH 049/118] Use correct issue link --- doc/changelog.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 3502e18a41..6dd62f4d2b 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -3,7 +3,7 @@ Lombok Changelog ### v1.18.33 "Edgy Guinea Pig" * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). -* IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3638). +* IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3667). ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. From 1ccae0db6d6e73d0917fa12dbe619110aa934fb3 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 17:16:44 +0200 Subject: [PATCH 050/118] [tests] Fixing up a few tests --- test/core/src/lombok/AbstractRunTests.java | 2 +- test/transform/resource/after-delombok/MixGetterVal.java | 1 + test/transform/resource/after-ecj/LoggerFloggerRecord.java | 2 +- .../resource/messages-idempotent/NonNullPlain.java.messages | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java index 6877bcfadd..3397a61205 100644 --- a/test/core/src/lombok/AbstractRunTests.java +++ b/test/core/src/lombok/AbstractRunTests.java @@ -51,7 +51,7 @@ import lombok.transform.TestSourceFiles; public abstract class AbstractRunTests { - public final FileTester createTester(final DirectoryRunner.TestParams params, final File file, String platform, int version, boolean copyToSource) throws IOException { + public final FileTester createTester(final DirectoryRunner.TestParams params, final File file, String platform, int version, final boolean copyToSource) throws IOException { ConfigurationKeysLoader.LoaderLoader.loadAllConfigurationKeys(); AssertionError directiveFailure = null; LombokTestSource sourceDirectives = null; diff --git a/test/transform/resource/after-delombok/MixGetterVal.java b/test/transform/resource/after-delombok/MixGetterVal.java index a2b44ea099..2c1921c33d 100644 --- a/test/transform/resource/after-delombok/MixGetterVal.java +++ b/test/transform/resource/after-delombok/MixGetterVal.java @@ -9,6 +9,7 @@ public void test() { m(a); } @java.lang.SuppressWarnings("all") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-ecj/LoggerFloggerRecord.java b/test/transform/resource/after-ecj/LoggerFloggerRecord.java index 47bf4cc6e6..7db8aabebb 100644 --- a/test/transform/resource/after-ecj/LoggerFloggerRecord.java +++ b/test/transform/resource/after-ecj/LoggerFloggerRecord.java @@ -3,7 +3,7 @@ class LoggerFloggerRecord { public @Flogger record Inner(String x) { /* Implicit */ private final String x; - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } } diff --git a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages index 3a3a052dad..236f276d58 100644 --- a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages +++ b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages @@ -1,3 +1,3 @@ -3 @NonNull is meaningless on a primitive. -14 @NonNull is meaningless on a primitive. -36 @NonNull is meaningless on a primitive. +4 @NonNull is meaningless on a primitive. +16 @NonNull is meaningless on a primitive. +42 @NonNull is meaningless on a primitive. From 30e19e4cdc872892214bc92d88291385a29ebafb Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Fri, 17 May 2024 22:31:43 +0200 Subject: [PATCH 051/118] Add onX warning generation to changelog --- doc/changelog.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 6dd62f4d2b..acfcb21645 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -4,6 +4,7 @@ Lombok Changelog ### v1.18.33 "Edgy Guinea Pig" * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). * IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3667). +* IMPROBABLE BREAKING CHANGE: When `lombok.config` contains `lombok.onX.flagUsage = WARNING`, from now on warnings will actually be generated if onX is used.[Issue #2848](https://github.com/projectlombok/lombok/issues/2848) ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. From eabcc3fb4a3f2ecc760f85c3d0787b2319428a8d Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Tue, 21 May 2024 00:09:45 +0200 Subject: [PATCH 052/118] [fixes #933] Add javadoc for generated constructors --- .../lombok/core/handlers/HandlerUtil.java | 18 ++++++++++- .../eclipse/handlers/EclipseHandlerUtil.java | 6 +++- .../eclipse/handlers/HandleConstructor.java | 31 +++++++++++++++++-- .../javac/handlers/HandleConstructor.java | 27 ++++++++++++++++ .../after-delombok/BuilderJavadoc.java | 9 ++++++ .../after-delombok/BuilderWithDeprecated.java | 8 +++++ .../after-delombok/ConstructorJavadoc.java | 28 +++++++++++++++++ .../resource/after-ecj/BuilderJavadoc.java | 9 ++++++ .../after-ecj/BuilderWithDeprecated.java | 8 +++++ .../after-ecj/ConstructorJavadoc.java | 16 ++++++++++ .../resource/before/ConstructorJavadoc.java | 20 ++++++++++++ 11 files changed, 175 insertions(+), 5 deletions(-) create mode 100644 test/transform/resource/after-delombok/ConstructorJavadoc.java create mode 100644 test/transform/resource/after-ecj/ConstructorJavadoc.java create mode 100644 test/transform/resource/before/ConstructorJavadoc.java diff --git a/src/core/lombok/core/handlers/HandlerUtil.java b/src/core/lombok/core/handlers/HandlerUtil.java index 06bac16fdd..16274df9a4 100644 --- a/src/core/lombok/core/handlers/HandlerUtil.java +++ b/src/core/lombok/core/handlers/HandlerUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2022 The Project Lombok Authors. + * Copyright (C) 2013-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -981,4 +981,20 @@ public static String getParamJavadoc(String methodComment, String param) { } return null; } + + public static String getConstructorJavadocHeader(String typeName) { + return "Creates a new {@code " + typeName + "} instance.\n\n"; + } + + public static String getConstructorParameterJavadoc(String paramName, String fieldJavadoc) { + String fieldBaseJavadoc = stripSectionsFromJavadoc(fieldJavadoc); + + String paramJavadoc = getParamJavadoc(fieldBaseJavadoc, paramName); + if (paramJavadoc == null) { + paramJavadoc = stripLinesWithTagFromJavadoc(fieldBaseJavadoc, JavadocTag.PARAM); + paramJavadoc = stripLinesWithTagFromJavadoc(paramJavadoc, JavadocTag.RETURN); + } + + return paramJavadoc; + } } diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index af1aa0fd82..39e29e941e 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -2815,10 +2815,14 @@ public static String getDocComment(EclipseNode eclipseNode) { return null; } + public static void setDocComment(EclipseNode typeNode, EclipseNode eclipseNode, String doc) { + setDocComment((CompilationUnitDeclaration) eclipseNode.top().get(), (TypeDeclaration) typeNode.get(), eclipseNode.get(), doc); + } + public static void setDocComment(CompilationUnitDeclaration cud, EclipseNode eclipseNode, String doc) { setDocComment(cud, (TypeDeclaration) upToTypeNode(eclipseNode).get(), eclipseNode.get(), doc); } - + public static void setDocComment(CompilationUnitDeclaration cud, TypeDeclaration type, ASTNode node, String doc) { if (doc == null) return; diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java index 8d9c5f7be8..e60ca15f2b 100755 --- a/src/core/lombok/eclipse/handlers/HandleConstructor.java +++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java @@ -22,7 +22,7 @@ package lombok.eclipse.handlers; import static lombok.core.handlers.HandlerUtil.*; -import static lombok.eclipse.Eclipse.*; +import static lombok.eclipse.Eclipse.ECLIPSE_DO_NOT_TOUCH_FLAG; import static lombok.eclipse.handlers.EclipseHandlerUtil.*; import java.lang.reflect.Modifier; @@ -286,7 +286,8 @@ public void generate( ConstructorDeclaration constr = createConstructor( staticConstrRequired ? AccessLevel.PRIVATE : level, typeNode, fieldsToParam, forceDefaults, sourceNode, onConstructor); - injectMethod(typeNode, constr); + EclipseNode constructorNode = injectMethod(typeNode, constr); + generateConstructorJavadoc(typeNode, constructorNode, fieldsToParam); } generateStaticConstructor(staticConstrRequired, typeNode, staticName, level, fieldsToParam, source); } @@ -294,7 +295,8 @@ public void generate( private void generateStaticConstructor(boolean staticConstrRequired, EclipseNode typeNode, String staticName, AccessLevel level, Collection fields, ASTNode source) { if (staticConstrRequired) { MethodDeclaration staticConstr = createStaticConstructor(level, staticName, typeNode, fields, source); - injectMethod(typeNode, staticConstr); + EclipseNode constructorNode = injectMethod(typeNode, staticConstr); + generateConstructorJavadoc(typeNode, constructorNode, fields); } } @@ -584,4 +586,27 @@ public MethodDeclaration createStaticConstructor(AccessLevel level, String name, constructor.traverse(new SetGeneratedByVisitor(source), typeDecl.scope); return constructor; } + + private void generateConstructorJavadoc(EclipseNode typeNode, EclipseNode constructorNode, Collection fields) { + if (fields.isEmpty()) return; + + String constructorJavadoc = getConstructorJavadocHeader(typeNode.getName()); + boolean fieldDescriptionAdded = false; + for (EclipseNode fieldNode : fields) { + String paramName = String.valueOf(removePrefixFromField(fieldNode)); + String fieldJavadoc = getDocComment(fieldNode); + String paramJavadoc = getConstructorParameterJavadoc(paramName, fieldJavadoc); + + if (paramJavadoc == null) { + paramJavadoc = ""; + } else { + fieldDescriptionAdded = true; + } + + constructorJavadoc = addJavadocLine(constructorJavadoc, "@param " + paramName + " " + paramJavadoc); + } + if (fieldDescriptionAdded) { + setDocComment(typeNode, constructorNode, constructorJavadoc); + } + } } diff --git a/src/core/lombok/javac/handlers/HandleConstructor.java b/src/core/lombok/javac/handlers/HandleConstructor.java index 372bc57d21..27dba4a0c4 100644 --- a/src/core/lombok/javac/handlers/HandleConstructor.java +++ b/src/core/lombok/javac/handlers/HandleConstructor.java @@ -30,6 +30,7 @@ import com.sun.tools.javac.tree.JCTree.JCAnnotation; import com.sun.tools.javac.tree.JCTree.JCBlock; import com.sun.tools.javac.tree.JCTree.JCClassDecl; +import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; import com.sun.tools.javac.tree.JCTree.JCExpression; import com.sun.tools.javac.tree.JCTree.JCFieldAccess; import com.sun.tools.javac.tree.JCTree.JCMethodDecl; @@ -251,6 +252,7 @@ private void generate(JavacNode typeNode, AccessLevel level, List if (!(skipIfConstructorExists != SkipIfConstructorExists.NO && constructorExists(typeNode) != MemberExistsResult.NOT_EXISTS)) { JCMethodDecl constr = createConstructor(staticConstrRequired ? AccessLevel.PRIVATE : level, onConstructor, typeNode, fields, allToDefault, source); + generateConstructorJavadoc(constr, typeNode, fields); injectMethod(typeNode, constr); } generateStaticConstructor(staticConstrRequired, typeNode, staticName, level, allToDefault, fields, source); @@ -259,6 +261,7 @@ private void generate(JavacNode typeNode, AccessLevel level, List private void generateStaticConstructor(boolean staticConstrRequired, JavacNode typeNode, String staticName, AccessLevel level, boolean allToDefault, List fields, JavacNode source) { if (staticConstrRequired) { JCMethodDecl staticConstr = createStaticConstructor(staticName, level, typeNode, allToDefault ? List.nil() : fields, source); + generateConstructorJavadoc(staticConstr, typeNode, fields); injectMethod(typeNode, staticConstr); } } @@ -474,4 +477,28 @@ public JCMethodDecl createStaticConstructor(String name, AccessLevel level, Java createRelevantNonNullAnnotation(typeNode, methodDef); return recursiveSetGeneratedBy(methodDef, source); } + + private void generateConstructorJavadoc(JCMethodDecl constructor, JavacNode typeNode, List fields) { + if (fields.isEmpty()) return; + + JCCompilationUnit cu = ((JCCompilationUnit) typeNode.top().get()); + String constructorJavadoc = getConstructorJavadocHeader(typeNode.getName()); + boolean fieldDescriptionAdded = false; + for (JavacNode fieldNode : fields) { + String paramName = removePrefixFromField(fieldNode).toString(); + String fieldJavadoc = getDocComment(cu, fieldNode.get()); + String paramJavadoc = getConstructorParameterJavadoc(paramName, fieldJavadoc); + + if (paramJavadoc == null) { + paramJavadoc = ""; + } else { + fieldDescriptionAdded = true; + } + + constructorJavadoc = addJavadocLine(constructorJavadoc, "@param " + paramName + " " + paramJavadoc); + } + if (fieldDescriptionAdded) { + setDocComment(cu, constructor, constructorJavadoc); + } + } } diff --git a/test/transform/resource/after-delombok/BuilderJavadoc.java b/test/transform/resource/after-delombok/BuilderJavadoc.java index 34de4ab8a2..55e9db8c52 100644 --- a/test/transform/resource/after-delombok/BuilderJavadoc.java +++ b/test/transform/resource/after-delombok/BuilderJavadoc.java @@ -87,6 +87,15 @@ public java.lang.String toString() { return "BuilderJavadoc.BuilderJavadocBuilder(basic=" + this.basic + ", getsetwith=" + this.getsetwith + ", predef=" + this.predef + ", predefWithJavadoc=" + this.predefWithJavadoc + ")"; } } + /** + * Creates a new {@code BuilderJavadoc} instance. + * + * @param basic basic gets only a builder setter. + * @see #getsetwith + * @param getsetwith getsetwith gets a builder setter, an instance getter and setter, and a wither. + * @param predef Predef has a predefined builder setter with no javadoc, and the builder setter does not get this one. + * @param predefWithJavadoc predefWithJavadoc has a predefined builder setter with javadoc, so it keeps that one untouched. + */ @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc(final int basic, final int getsetwith, final int predef, final int predefWithJavadoc) { diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecated.java b/test/transform/resource/after-delombok/BuilderWithDeprecated.java index 26a02b44e9..1e2d4e8dbe 100644 --- a/test/transform/resource/after-delombok/BuilderWithDeprecated.java +++ b/test/transform/resource/after-delombok/BuilderWithDeprecated.java @@ -10,6 +10,14 @@ public class BuilderWithDeprecated { java.util.List strings; @Deprecated ImmutableList numbers; + /** + * Creates a new {@code BuilderWithDeprecated} instance. + * + * @param dep1 @deprecated since always + * @param dep2 + * @param strings + * @param numbers + */ @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List strings, final ImmutableList numbers) { diff --git a/test/transform/resource/after-delombok/ConstructorJavadoc.java b/test/transform/resource/after-delombok/ConstructorJavadoc.java new file mode 100644 index 0000000000..bd55b58554 --- /dev/null +++ b/test/transform/resource/after-delombok/ConstructorJavadoc.java @@ -0,0 +1,28 @@ +public class ConstructorJavadoc { + /** + * Some text + * + * @param fieldName Hello, World1 + * --- GETTER --- + * Getter section + * + * @return Sky is blue1 + */ + private int fieldName; + /** + * Sky is blue + */ + private int fieldName2; + /** + * Creates a new {@code ConstructorJavadoc} instance. + * + * @param fieldName Some text + * @param fieldName2 Sky is blue + */ + @java.lang.SuppressWarnings("all") + @lombok.Generated + public ConstructorJavadoc(final int fieldName, final int fieldName2) { + this.fieldName = fieldName; + this.fieldName2 = fieldName2; + } +} diff --git a/test/transform/resource/after-ecj/BuilderJavadoc.java b/test/transform/resource/after-ecj/BuilderJavadoc.java index 718b1c457c..75ac875a3b 100644 --- a/test/transform/resource/after-ecj/BuilderJavadoc.java +++ b/test/transform/resource/after-ecj/BuilderJavadoc.java @@ -46,6 +46,15 @@ public BuilderJavadocBuilder predefWithJavadoc(final int x) { private @lombok.Getter @lombok.Setter @lombok.experimental.Wither int getsetwith; private final int predef; private final int predefWithJavadoc; + /** + * Creates a new {@code BuilderJavadoc} instance. + * + * @param basic basic gets only a builder setter. + * @see #getsetwith + * @param getsetwith getsetwith gets a builder setter, an instance getter and setter, and a wither. + * @param predef Predef has a predefined builder setter with no javadoc, and the builder setter does not get this one. + * @param predefWithJavadoc predefWithJavadoc has a predefined builder setter with javadoc, so it keeps that one untouched. + */ @java.lang.SuppressWarnings("all") @lombok.Generated BuilderJavadoc(final int basic, final int getsetwith, final int predef, final int predefWithJavadoc) { super(); this.basic = basic; diff --git a/test/transform/resource/after-ecj/BuilderWithDeprecated.java b/test/transform/resource/after-ecj/BuilderWithDeprecated.java index 1d18360a9b..52f4372513 100644 --- a/test/transform/resource/after-ecj/BuilderWithDeprecated.java +++ b/test/transform/resource/after-ecj/BuilderWithDeprecated.java @@ -89,6 +89,14 @@ @Deprecated int dep2; @Singular @Deprecated java.util.List strings; @Singular @Deprecated ImmutableList numbers; + /** + * Creates a new {@code BuilderWithDeprecated} instance. + * + * @param dep1 @deprecated since always + * @param dep2 + * @param strings + * @param numbers + */ @java.lang.SuppressWarnings("all") @lombok.Generated BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List strings, final ImmutableList numbers) { super(); this.dep1 = dep1; diff --git a/test/transform/resource/after-ecj/ConstructorJavadoc.java b/test/transform/resource/after-ecj/ConstructorJavadoc.java new file mode 100644 index 0000000000..4b861ab7f6 --- /dev/null +++ b/test/transform/resource/after-ecj/ConstructorJavadoc.java @@ -0,0 +1,16 @@ +import lombok.AllArgsConstructor; +public @AllArgsConstructor class ConstructorJavadoc { + private int fieldName; + private int fieldName2; + /** + * Creates a new {@code ConstructorJavadoc} instance. + * + * @param fieldName Some text + * @param fieldName2 Sky is blue + */ + public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorJavadoc(final int fieldName, final int fieldName2) { + super(); + this.fieldName = fieldName; + this.fieldName2 = fieldName2; + } +} diff --git a/test/transform/resource/before/ConstructorJavadoc.java b/test/transform/resource/before/ConstructorJavadoc.java new file mode 100644 index 0000000000..feeabf724c --- /dev/null +++ b/test/transform/resource/before/ConstructorJavadoc.java @@ -0,0 +1,20 @@ +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public class ConstructorJavadoc { + /** + * Some text + * + * @param fieldName Hello, World1 + * --- GETTER --- + * Getter section + * + * @return Sky is blue1 + */ + private int fieldName; + + /** + * Sky is blue + */ + private int fieldName2; +} From c8657f15f62f094718c3657a36af4a5ae18bce6e Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sat, 2 Mar 2024 11:52:48 +0100 Subject: [PATCH 053/118] Mark injected fields as generated --- .../eclipse/handlers/HandleLockedUtil.java | 23 ++++++++++++++++++- .../lombok/eclipse/handlers/HandleLog.java | 6 ++--- .../eclipse/handlers/HandleSynchronized.java | 4 +--- .../resource/after-ecj/InjectField.java | 12 +++++----- .../after-ecj/LockedInInitializer.java | 6 ++--- .../resource/after-ecj/LockedInRecord.java | 2 +- .../resource/after-ecj/LockedPlain.java | 8 +++---- .../resource/after-ecj/LockedStaticMix.java | 2 +- .../after-ecj/LockedTypeMismatch.java | 2 +- .../resource/after-ecj/LoggerCommons.java | 10 ++++---- .../resource/after-ecj/LoggerConfig.java | 4 ++-- .../resource/after-ecj/LoggerCustom.java | 4 ++-- .../after-ecj/LoggerCustomWithPackage.java | 4 ++-- .../LoggerCustomWithTopicAndName.java | 4 ++-- .../resource/after-ecj/LoggerFlogger.java | 10 ++++---- .../after-ecj/LoggerFloggerRecord.java | 5 ++-- .../resource/after-ecj/LoggerJBossLog.java | 16 ++++++------- .../resource/after-ecj/LoggerJul.java | 14 +++++------ .../resource/after-ecj/LoggerLog4j.java | 14 +++++------ .../resource/after-ecj/LoggerLog4j2.java | 14 +++++------ .../resource/after-ecj/LoggerSlf4j.java | 18 +++++++-------- .../after-ecj/LoggerSlf4jOnRecord.java | 3 +-- .../resource/after-ecj/LoggerSlf4jTypes.java | 8 +++---- .../after-ecj/LoggerSlf4jWithPackage.java | 6 ++--- .../resource/after-ecj/LoggerXSlf4j.java | 8 +++---- .../SynchronizedInAnonymousClass.java | 2 +- .../after-ecj/SynchronizedInInitializer.java | 2 +- .../after-ecj/SynchronizedInRecord.java | 2 +- .../resource/after-ecj/SynchronizedPlain.java | 4 ++-- 29 files changed, 115 insertions(+), 102 deletions(-) diff --git a/src/core/lombok/eclipse/handlers/HandleLockedUtil.java b/src/core/lombok/eclipse/handlers/HandleLockedUtil.java index 64fe35914b..2e13fd86b5 100644 --- a/src/core/lombok/eclipse/handlers/HandleLockedUtil.java +++ b/src/core/lombok/eclipse/handlers/HandleLockedUtil.java @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2024 The Project Lombok Authors. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ /* Copyright (C) 2021-2023 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -117,7 +138,7 @@ private static char[] createLockField(String name, EclipseNode annotationNode, c lockAlloc.type = setGeneratedBy(new QualifiedTypeReference(lockImplClass, new long[] { 0, 0, 0, 0, 0 }), source); fieldDecl.type = setGeneratedBy(new QualifiedTypeReference(lockTypeClass, new long[] { 0, 0, 0, 0, 0 }), source); fieldDecl.initialization = lockAlloc; - injectField(annotationNode.up().up(), fieldDecl); + injectFieldAndMarkGenerated(annotationNode.up().up(), fieldDecl); } return lockName; diff --git a/src/core/lombok/eclipse/handlers/HandleLog.java b/src/core/lombok/eclipse/handlers/HandleLog.java index db9104ef36..2bbc300a8b 100644 --- a/src/core/lombok/eclipse/handlers/HandleLog.java +++ b/src/core/lombok/eclipse/handlers/HandleLog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2021 The Project Lombok Authors. + * Copyright (C) 2010-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -109,9 +109,7 @@ public static void processAnnotation(LoggingFramework framework, AnnotationValue ClassLiteralAccess loggingType = selfType(owner, source); FieldDeclaration fieldDeclaration = createField(framework, source, loggingType, logFieldName.getName(), useStatic, loggerTopic); fieldDeclaration.traverse(new SetGeneratedByVisitor(source), typeDecl.staticInitializerScope); - // TODO temporary workaround for issue 290. https://github.com/projectlombok/lombok/issues/290 - // injectFieldSuppressWarnings(owner, fieldDeclaration); - injectField(owner, fieldDeclaration); + injectFieldAndMarkGenerated(owner, fieldDeclaration); owner.rebuild(); break; default: diff --git a/src/core/lombok/eclipse/handlers/HandleSynchronized.java b/src/core/lombok/eclipse/handlers/HandleSynchronized.java index c5fbcf4fdc..fb30772ce1 100644 --- a/src/core/lombok/eclipse/handlers/HandleSynchronized.java +++ b/src/core/lombok/eclipse/handlers/HandleSynchronized.java @@ -129,9 +129,7 @@ public char[] createLockField(AnnotationValues annotation, Eclipse fieldDecl.type = new QualifiedTypeReference(TypeConstants.JAVA_LANG_OBJECT, new long[] { 0, 0, 0 }); setGeneratedBy(fieldDecl.type, source); fieldDecl.initialization = arrayAlloc; - // TODO temporary workaround for issue 290. https://github.com/projectlombok/lombok/issues/290 - // injectFieldSuppressWarnings(annotationNode.up().up(), fieldDecl); - injectField(annotationNode.up().up(), fieldDecl); + injectFieldAndMarkGenerated(annotationNode.up().up(), fieldDecl); } return lockName; diff --git a/test/transform/resource/after-ecj/InjectField.java b/test/transform/resource/after-ecj/InjectField.java index f9ea91425b..e937a5acbc 100644 --- a/test/transform/resource/after-ecj/InjectField.java +++ b/test/transform/resource/after-ecj/InjectField.java @@ -4,9 +4,9 @@ @Log enum InjectField1 { A(), B(), - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName()); - private final java.lang.Object $lock = new java.lang.Object[0]; - private static final java.lang.Object $LOCK = new java.lang.Object[0]; + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName()); + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Object $lock = new java.lang.Object[0]; + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Object $LOCK = new java.lang.Object[0]; private static final String LOG_MESSAGE = "static initializer"; private String fieldA; static { @@ -32,8 +32,8 @@ } } @Log class InjectField2 { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName()); - private final java.lang.Object $lock = new java.lang.Object[0]; + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName()); + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Object $lock = new java.lang.Object[0]; private static final String LOG_MESSAGE = "static initializer"; static { log.log(Level.FINE, LOG_MESSAGE); @@ -51,7 +51,7 @@ } } @Log class InjectField3 { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName()); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName()); static { log.log(Level.FINE, "static initializer"); } diff --git a/test/transform/resource/after-ecj/LockedInInitializer.java b/test/transform/resource/after-ecj/LockedInInitializer.java index aea88d0df0..31de61d47d 100644 --- a/test/transform/resource/after-ecj/LockedInInitializer.java +++ b/test/transform/resource/after-ecj/LockedInInitializer.java @@ -1,7 +1,7 @@ import lombok.Locked; public class LockedInInitializer { public static final Runnable LOCKED = new Runnable() { - private final java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); public @Override @Locked void run() { this.$lock.lock(); try @@ -15,7 +15,7 @@ public class LockedInInitializer { } }; public static final Runnable LOCKED_READ = new Runnable() { - private final java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); public @Override @Locked.Read void run() { this.$lock.readLock().lock(); try @@ -29,7 +29,7 @@ public class LockedInInitializer { } }; public static final Runnable LOCKED_WRITE = new Runnable() { - private final java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); public @Override @Locked.Write void run() { this.$lock.writeLock().lock(); try diff --git a/test/transform/resource/after-ecj/LockedInRecord.java b/test/transform/resource/after-ecj/LockedInRecord.java index 9c5d5ebd82..c453683d8d 100644 --- a/test/transform/resource/after-ecj/LockedInRecord.java +++ b/test/transform/resource/after-ecj/LockedInRecord.java @@ -2,7 +2,7 @@ public record LockedInRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - private final java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); public @Locked void foo() { String foo = "bar"; } diff --git a/test/transform/resource/after-ecj/LockedPlain.java b/test/transform/resource/after-ecj/LockedPlain.java index f311c193bd..5267f9b269 100644 --- a/test/transform/resource/after-ecj/LockedPlain.java +++ b/test/transform/resource/after-ecj/LockedPlain.java @@ -1,6 +1,6 @@ import lombok.Locked; class LockedPlain { - private final java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); LockedPlain() { super(); } @@ -28,7 +28,7 @@ class LockedPlain { } } class LockedPlainStatic { - private static final java.util.concurrent.locks.Lock $LOCK = new java.util.concurrent.locks.ReentrantLock(); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.locks.Lock $LOCK = new java.util.concurrent.locks.ReentrantLock(); () { } LockedPlainStatic() { @@ -58,7 +58,7 @@ class LockedPlainStatic { } } class LockedPlainRead { - private static final java.util.concurrent.locks.ReadWriteLock $LOCK = new java.util.concurrent.locks.ReentrantReadWriteLock(); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.locks.ReadWriteLock $LOCK = new java.util.concurrent.locks.ReentrantReadWriteLock(); () { } LockedPlainRead() { @@ -88,7 +88,7 @@ class LockedPlainRead { } } class LockedPlainWrite { - private final java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.locks.ReadWriteLock $lock = new java.util.concurrent.locks.ReentrantReadWriteLock(); LockedPlainWrite() { super(); } diff --git a/test/transform/resource/after-ecj/LockedStaticMix.java b/test/transform/resource/after-ecj/LockedStaticMix.java index 98c8e8044d..8005f798f9 100644 --- a/test/transform/resource/after-ecj/LockedStaticMix.java +++ b/test/transform/resource/after-ecj/LockedStaticMix.java @@ -1,5 +1,5 @@ class LockedGeneratedStaticMismatch { - private static final java.util.concurrent.locks.Lock $LOCK = new java.util.concurrent.locks.ReentrantLock(); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.locks.Lock $LOCK = new java.util.concurrent.locks.ReentrantLock(); () { } LockedGeneratedStaticMismatch() { diff --git a/test/transform/resource/after-ecj/LockedTypeMismatch.java b/test/transform/resource/after-ecj/LockedTypeMismatch.java index 390ec5727c..d81e01a5d3 100644 --- a/test/transform/resource/after-ecj/LockedTypeMismatch.java +++ b/test/transform/resource/after-ecj/LockedTypeMismatch.java @@ -1,5 +1,5 @@ class LockedGeneratedTypeMismatch { - private final java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.concurrent.locks.Lock $lock = new java.util.concurrent.locks.ReentrantLock(); LockedGeneratedTypeMismatch() { super(); } diff --git a/test/transform/resource/after-ecj/LoggerCommons.java b/test/transform/resource/after-ecj/LoggerCommons.java index b2ca055fb2..64d387c662 100644 --- a/test/transform/resource/after-ecj/LoggerCommons.java +++ b/test/transform/resource/after-ecj/LoggerCommons.java @@ -1,6 +1,6 @@ import lombok.extern.apachecommons.CommonsLog; @lombok.extern.apachecommons.CommonsLog class LoggerCommons { - private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class); () { } LoggerCommons() { @@ -8,7 +8,7 @@ } } @CommonsLog class LoggerCommonsWithImport { - private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class); () { } LoggerCommonsWithImport() { @@ -16,7 +16,7 @@ } } @CommonsLog(topic = "DifferentName") class LoggerCommonsWithDifferentName { - private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("DifferentName"); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("DifferentName"); () { } LoggerCommonsWithDifferentName() { @@ -24,11 +24,11 @@ } } @CommonsLog(topic = LoggerCommonsWithStaticField.TOPIC) class LoggerCommonsWithStaticField { - private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithStaticField.TOPIC); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithStaticField.TOPIC); static final String TOPIC = "StaticField"; () { } LoggerCommonsWithStaticField() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerConfig.java b/test/transform/resource/after-ecj/LoggerConfig.java index 907a716714..d1a7957186 100644 --- a/test/transform/resource/after-ecj/LoggerConfig.java +++ b/test/transform/resource/after-ecj/LoggerConfig.java @@ -1,6 +1,6 @@ @lombok.extern.slf4j.Slf4j class LoggerWithConfig { - private final org.slf4j.Logger myLogger = org.slf4j.LoggerFactory.getLogger(LoggerWithConfig.class); + private final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger myLogger = org.slf4j.LoggerFactory.getLogger(LoggerWithConfig.class); LoggerWithConfig() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerCustom.java b/test/transform/resource/after-ecj/LoggerCustom.java index 2f60b7b617..515a7fcd1b 100644 --- a/test/transform/resource/after-ecj/LoggerCustom.java +++ b/test/transform/resource/after-ecj/LoggerCustom.java @@ -1,5 +1,5 @@ @lombok.CustomLog class LoggerCustomLog { - private static final MyLogger log = MyLoggerFactory.create(LoggerCustomLog.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated MyLogger log = MyLoggerFactory.create(LoggerCustomLog.class); () { } LoggerCustomLog() { @@ -18,4 +18,4 @@ class MyLogger { MyLogger() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerCustomWithPackage.java b/test/transform/resource/after-ecj/LoggerCustomWithPackage.java index d1bc170472..896dac2baa 100644 --- a/test/transform/resource/after-ecj/LoggerCustomWithPackage.java +++ b/test/transform/resource/after-ecj/LoggerCustomWithPackage.java @@ -1,6 +1,6 @@ package before; @lombok.CustomLog class LoggerCustomLog { - private static final before.MyLogger log = before.MyLoggerFactory.create(LoggerCustomLog.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated before.MyLogger log = before.MyLoggerFactory.create(LoggerCustomLog.class); () { } LoggerCustomLog() { @@ -19,4 +19,4 @@ class MyLogger { MyLogger() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerCustomWithTopicAndName.java b/test/transform/resource/after-ecj/LoggerCustomWithTopicAndName.java index f6f857441e..5e42f4200a 100644 --- a/test/transform/resource/after-ecj/LoggerCustomWithTopicAndName.java +++ b/test/transform/resource/after-ecj/LoggerCustomWithTopicAndName.java @@ -1,5 +1,5 @@ @lombok.CustomLog(topic = "t") class LoggerCustomLog { - private static final MyLoggerFactory log = MyLoggerFactory.create(LoggerCustomLog.class.getName(), "t", null, LoggerCustomLog.class, "t"); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated MyLoggerFactory log = MyLoggerFactory.create(LoggerCustomLog.class.getName(), "t", null, LoggerCustomLog.class, "t"); () { } LoggerCustomLog() { @@ -7,7 +7,7 @@ } } @lombok.CustomLog(topic = LoggerCustomLogWithStaticField.TOPIC) class LoggerCustomLogWithStaticField { - private static final MyLoggerFactory log = MyLoggerFactory.create(LoggerCustomLogWithStaticField.class.getName(), LoggerCustomLogWithStaticField.TOPIC, null, LoggerCustomLogWithStaticField.class, LoggerCustomLogWithStaticField.TOPIC); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated MyLoggerFactory log = MyLoggerFactory.create(LoggerCustomLogWithStaticField.class.getName(), LoggerCustomLogWithStaticField.TOPIC, null, LoggerCustomLogWithStaticField.class, LoggerCustomLogWithStaticField.TOPIC); static final String TOPIC = "StaticField"; () { } diff --git a/test/transform/resource/after-ecj/LoggerFlogger.java b/test/transform/resource/after-ecj/LoggerFlogger.java index b97082ff54..976e031a04 100644 --- a/test/transform/resource/after-ecj/LoggerFlogger.java +++ b/test/transform/resource/after-ecj/LoggerFlogger.java @@ -1,6 +1,6 @@ import lombok.extern.flogger.Flogger; @lombok.extern.flogger.Flogger class LoggerFlogger { - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } LoggerFlogger() { @@ -8,7 +8,7 @@ } } @Flogger class LoggerFloggerWithImport { - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } LoggerFloggerWithImport() { @@ -17,7 +17,7 @@ } class LoggerFloggerOuter { static @lombok.extern.flogger.Flogger class Inner { - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } Inner() { @@ -30,7 +30,7 @@ class LoggerFloggerOuter { } @Flogger enum LoggerFloggerWithEnum { CONSTANT(), - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } LoggerFloggerWithEnum() { @@ -40,7 +40,7 @@ class LoggerFloggerOuter { class LoggerFloggerWithInnerEnum { @Flogger enum Inner { CONSTANT(), - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } Inner() { diff --git a/test/transform/resource/after-ecj/LoggerFloggerRecord.java b/test/transform/resource/after-ecj/LoggerFloggerRecord.java index 7db8aabebb..43ffda6d03 100644 --- a/test/transform/resource/after-ecj/LoggerFloggerRecord.java +++ b/test/transform/resource/after-ecj/LoggerFloggerRecord.java @@ -1,13 +1,12 @@ -// version 19: import lombok.extern.flogger.Flogger; class LoggerFloggerRecord { public @Flogger record Inner(String x) { /* Implicit */ private final String x; - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } } LoggerFloggerRecord() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerJBossLog.java b/test/transform/resource/after-ecj/LoggerJBossLog.java index 13d332a680..260f3d188d 100644 --- a/test/transform/resource/after-ecj/LoggerJBossLog.java +++ b/test/transform/resource/after-ecj/LoggerJBossLog.java @@ -1,6 +1,6 @@ import lombok.extern.jbosslog.JBossLog; @lombok.extern.jbosslog.JBossLog class LoggerJBossLog { - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLog.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLog.class); () { } LoggerJBossLog() { @@ -8,7 +8,7 @@ } } @JBossLog class LoggerJBossLogWithImport { - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithImport.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithImport.class); () { } LoggerJBossLogWithImport() { @@ -17,7 +17,7 @@ } class LoggerJBossLogOuter { static @lombok.extern.jbosslog.JBossLog class Inner { - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); () { } Inner() { @@ -30,7 +30,7 @@ class LoggerJBossLogOuter { } @JBossLog enum LoggerJBossLogWithEnum { CONSTANT(), - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithEnum.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithEnum.class); () { } LoggerJBossLogWithEnum() { @@ -40,7 +40,7 @@ class LoggerJBossLogOuter { class LoggerJBossLogWithInnerEnum { @JBossLog enum Inner { CONSTANT(), - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); () { } Inner() { @@ -52,7 +52,7 @@ class LoggerJBossLogWithInnerEnum { } } @JBossLog(topic = "DifferentLogger") class LoggerJBossLogWithDifferentLoggerName { - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger("DifferentLogger"); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger("DifferentLogger"); () { } LoggerJBossLogWithDifferentLoggerName() { @@ -60,11 +60,11 @@ class LoggerJBossLogWithInnerEnum { } } @JBossLog(topic = LoggerJBossLogWithStaticField.TOPIC) class LoggerJBossLogWithStaticField { - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithStaticField.TOPIC); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithStaticField.TOPIC); static final String TOPIC = "StaticField"; () { } LoggerJBossLogWithStaticField() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerJul.java b/test/transform/resource/after-ecj/LoggerJul.java index d1408245df..0166bf5a15 100644 --- a/test/transform/resource/after-ecj/LoggerJul.java +++ b/test/transform/resource/after-ecj/LoggerJul.java @@ -1,6 +1,6 @@ import lombok.extern.java.Log; @lombok.extern.java.Log class LoggerJul { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName()); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName()); () { } LoggerJul() { @@ -8,7 +8,7 @@ } } @Log class LoggerJulWithImport { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName()); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName()); () { } LoggerJulWithImport() { @@ -16,7 +16,7 @@ } } @Log(topic = "DifferentName") class LoggerJulWithDifferentName { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("DifferentName"); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger("DifferentName"); () { } LoggerJulWithDifferentName() { @@ -24,7 +24,7 @@ } } @Log(topic = LoggerJulWithStaticField.TOPIC) class LoggerJulWithStaticField { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithStaticField.TOPIC); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithStaticField.TOPIC); static final String TOPIC = "StaticField"; () { } @@ -34,7 +34,7 @@ } @Log enum LoggerJulWithEnum { CONSTANT(), - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithEnum.class.getName()); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithEnum.class.getName()); () { } LoggerJulWithEnum() { @@ -44,7 +44,7 @@ class LoggerJulWithInnerEnum { @Log enum Inner { CONSTANT(), - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(Inner.class.getName()); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.util.logging.Logger log = java.util.logging.Logger.getLogger(Inner.class.getName()); () { } Inner() { @@ -54,4 +54,4 @@ class LoggerJulWithInnerEnum { LoggerJulWithInnerEnum() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerLog4j.java b/test/transform/resource/after-ecj/LoggerLog4j.java index 4d67b13359..d3cced02ac 100644 --- a/test/transform/resource/after-ecj/LoggerLog4j.java +++ b/test/transform/resource/after-ecj/LoggerLog4j.java @@ -1,6 +1,6 @@ import lombok.extern.log4j.Log4j; @lombok.extern.log4j.Log4j class LoggerLog4j { - private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class); () { } LoggerLog4j() { @@ -8,7 +8,7 @@ } } @Log4j class LoggerLog4jWithImport { - private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class); () { } LoggerLog4jWithImport() { @@ -16,7 +16,7 @@ } } @Log4j(topic = "DifferentName") class LoggerLog4jWithDifferentName { - private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("DifferentName"); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("DifferentName"); () { } LoggerLog4jWithDifferentName() { @@ -24,7 +24,7 @@ } } @Log4j(topic = LoggerLog4jWithStaticField.TOPIC) class LoggerLog4jWithStaticField { - private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithStaticField.TOPIC); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithStaticField.TOPIC); static final String TOPIC = "StaticField"; () { } @@ -34,7 +34,7 @@ } @Log4j enum LoggerLog4jWithEnum { CONSTANT(), - private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithEnum.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithEnum.class); () { } LoggerLog4jWithEnum() { @@ -44,7 +44,7 @@ class LoggerLog4jWithInnerEnum { @Log4j enum Inner { CONSTANT(), - private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(Inner.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(Inner.class); () { } Inner() { @@ -54,4 +54,4 @@ class LoggerLog4jWithInnerEnum { LoggerLog4jWithInnerEnum() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerLog4j2.java b/test/transform/resource/after-ecj/LoggerLog4j2.java index 72d4ff5fd8..95baf9189c 100644 --- a/test/transform/resource/after-ecj/LoggerLog4j2.java +++ b/test/transform/resource/after-ecj/LoggerLog4j2.java @@ -1,6 +1,6 @@ import lombok.extern.log4j.Log4j2; @lombok.extern.log4j.Log4j2 class LoggerLog4j2 { - private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class); () { } LoggerLog4j2() { @@ -8,7 +8,7 @@ } } @Log4j2 class LoggerLog4j2WithImport { - private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class); () { } LoggerLog4j2WithImport() { @@ -16,7 +16,7 @@ } } @Log4j2(topic = "DifferentName") class LoggerLog4j2WithDifferentName { - private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger("DifferentName"); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger("DifferentName"); () { } LoggerLog4j2WithDifferentName() { @@ -24,7 +24,7 @@ } } @Log4j2(topic = LoggerLog4j2WithStaticField.TOPIC) class LoggerLog4j2WithStaticField { - private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithStaticField.TOPIC); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithStaticField.TOPIC); static final String TOPIC = "StaticField"; () { } @@ -34,7 +34,7 @@ } @Log4j2 enum LoggerLog4j2WithEnum { CONSTANT(), - private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithEnum.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithEnum.class); () { } LoggerLog4j2WithEnum() { @@ -44,7 +44,7 @@ class LoggerLog4j2WithInnerEnum { @Log4j2 enum Inner { CONSTANT(), - private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(Inner.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(Inner.class); () { } Inner() { @@ -54,4 +54,4 @@ class LoggerLog4j2WithInnerEnum { LoggerLog4j2WithInnerEnum() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerSlf4j.java b/test/transform/resource/after-ecj/LoggerSlf4j.java index 85e491865e..d3e549e2d7 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4j.java +++ b/test/transform/resource/after-ecj/LoggerSlf4j.java @@ -1,6 +1,6 @@ import lombok.extern.slf4j.Slf4j; @lombok.extern.slf4j.Slf4j class LoggerSlf4j { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); () { } LoggerSlf4j() { @@ -8,7 +8,7 @@ } } @Slf4j class LoggerSlf4jWithImport { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class); () { } LoggerSlf4jWithImport() { @@ -17,7 +17,7 @@ } @Slf4j enum LoggerSlf4jWithEnum { CONSTANT(), - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithEnum.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithEnum.class); () { } LoggerSlf4jWithEnum() { @@ -27,7 +27,7 @@ class LoggerSlf4jWithInnerEnum { @Slf4j enum Inner { CONSTANT(), - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); () { } Inner() { @@ -40,7 +40,7 @@ class LoggerSlf4jWithInnerEnum { } class LoggerSlf4jOuter { static @lombok.extern.slf4j.Slf4j class Inner { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); () { } Inner() { @@ -51,18 +51,16 @@ class LoggerSlf4jOuter { super(); } } - @Slf4j(topic = "DifferentLogger") class LoggerSlf4jWithDifferentLoggerName { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("DifferentLogger"); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("DifferentLogger"); () { } LoggerSlf4jWithDifferentLoggerName() { super(); } } - @Slf4j(topic = LoggerSlf4jWithStaticField.TOPIC) class LoggerSlf4jWithStaticField { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithStaticField.TOPIC); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithStaticField.TOPIC); static final String TOPIC = "StaticField"; () { } @@ -71,7 +69,7 @@ class LoggerSlf4jOuter { } } @Slf4j(topic = (LoggerSlf4jWithTwoStaticFields.TOPIC + LoggerSlf4jWithTwoStaticFields.TOPIC)) class LoggerSlf4jWithTwoStaticFields { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger((LoggerSlf4jWithTwoStaticFields.TOPIC + LoggerSlf4jWithTwoStaticFields.TOPIC)); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger((LoggerSlf4jWithTwoStaticFields.TOPIC + LoggerSlf4jWithTwoStaticFields.TOPIC)); static final String TOPIC = "StaticField"; () { } diff --git a/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java b/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java index c7502563fb..f4440cbdc0 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java @@ -1,9 +1,8 @@ -// version 14: import lombok.extern.slf4j.Slf4j; public @Slf4j record LoggerSlf4jOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class); () { } } diff --git a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java index 95ed1ebfb2..792a613067 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java @@ -3,7 +3,7 @@ @lombok.extern.slf4j.Slf4j @interface LoggerSlf4jTypesAnnotation { } @lombok.extern.slf4j.Slf4j enum LoggerSlf4jTypesEnum { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class); () { } LoggerSlf4jTypesEnum() { @@ -12,7 +12,7 @@ } @lombok.extern.slf4j.Slf4j enum LoggerSlf4jTypesEnumWithElement { FOO(), - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class); () { } LoggerSlf4jTypesEnumWithElement() { @@ -21,11 +21,11 @@ } interface LoggerSlf4jTypesInterfaceOuter { @lombok.extern.slf4j.Slf4j class Inner { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); () { } Inner() { super(); } } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java index 6d395db83e..d4ccd2a1f4 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java @@ -1,6 +1,6 @@ package before; @lombok.extern.slf4j.Slf4j class LoggerSlf4jWithPackage { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class); () { } LoggerSlf4jWithPackage() { @@ -9,7 +9,7 @@ } class LoggerSlf4jWithPackageOuter { static @lombok.extern.slf4j.Slf4j class Inner { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); () { } Inner() { @@ -19,4 +19,4 @@ class LoggerSlf4jWithPackageOuter { LoggerSlf4jWithPackageOuter() { super(); } -} \ No newline at end of file +} diff --git a/test/transform/resource/after-ecj/LoggerXSlf4j.java b/test/transform/resource/after-ecj/LoggerXSlf4j.java index 04acdd7768..f3103491ef 100644 --- a/test/transform/resource/after-ecj/LoggerXSlf4j.java +++ b/test/transform/resource/after-ecj/LoggerXSlf4j.java @@ -1,6 +1,6 @@ import lombok.extern.slf4j.XSlf4j; @lombok.extern.slf4j.XSlf4j class LoggerXSlf4j { - private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4j.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4j.class); () { } LoggerXSlf4j() { @@ -8,7 +8,7 @@ } } @XSlf4j class LoggerXSlf4jWithImport { - private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithImport.class); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithImport.class); () { } LoggerXSlf4jWithImport() { @@ -16,7 +16,7 @@ } } @XSlf4j(topic = "DifferentName") class LoggerXSlf4jWithDifferentName { - private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger("DifferentName"); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger("DifferentName"); () { } LoggerXSlf4jWithDifferentName() { @@ -24,7 +24,7 @@ } } @XSlf4j(topic = LoggerXSlf4jWithStaticField.TOPIC) class LoggerXSlf4jWithStaticField { - private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithStaticField.TOPIC); + private static final @java.lang.SuppressWarnings("all") @lombok.Generated org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithStaticField.TOPIC); static final String TOPIC = "StaticField"; () { } diff --git a/test/transform/resource/after-ecj/SynchronizedInAnonymousClass.java b/test/transform/resource/after-ecj/SynchronizedInAnonymousClass.java index 77013f2fbd..787dd38f02 100644 --- a/test/transform/resource/after-ecj/SynchronizedInAnonymousClass.java +++ b/test/transform/resource/after-ecj/SynchronizedInAnonymousClass.java @@ -2,7 +2,7 @@ public class SynchronizedInAnonymousClass { Object annonymous = new Object() { class Inner { - private final java.lang.Object $lock = new java.lang.Object[0]; + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Object $lock = new java.lang.Object[0]; Inner() { super(); } diff --git a/test/transform/resource/after-ecj/SynchronizedInInitializer.java b/test/transform/resource/after-ecj/SynchronizedInInitializer.java index dad6ff8de2..2f26d96393 100644 --- a/test/transform/resource/after-ecj/SynchronizedInInitializer.java +++ b/test/transform/resource/after-ecj/SynchronizedInInitializer.java @@ -1,7 +1,7 @@ import lombok.Synchronized; public class SynchronizedInInitializer { public static final Runnable SYNCHRONIZED = new Runnable() { - private final java.lang.Object $lock = new java.lang.Object[0]; + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Object $lock = new java.lang.Object[0]; public @Override @Synchronized void run() { synchronized (this.$lock) { diff --git a/test/transform/resource/after-ecj/SynchronizedInRecord.java b/test/transform/resource/after-ecj/SynchronizedInRecord.java index f555f5e834..3298cbd055 100644 --- a/test/transform/resource/after-ecj/SynchronizedInRecord.java +++ b/test/transform/resource/after-ecj/SynchronizedInRecord.java @@ -2,7 +2,7 @@ public record SynchronizedInRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - private final java.lang.Object $lock = new java.lang.Object[0]; + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Object $lock = new java.lang.Object[0]; public @Synchronized void foo() { String foo = "bar"; } diff --git a/test/transform/resource/after-ecj/SynchronizedPlain.java b/test/transform/resource/after-ecj/SynchronizedPlain.java index 6856f0ec50..1cef2826c2 100644 --- a/test/transform/resource/after-ecj/SynchronizedPlain.java +++ b/test/transform/resource/after-ecj/SynchronizedPlain.java @@ -1,6 +1,6 @@ import lombok.Synchronized; class SynchronizedPlain1 { - private final java.lang.Object $lock = new java.lang.Object[0]; + private final @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Object $lock = new java.lang.Object[0]; SynchronizedPlain1() { super(); } @@ -18,7 +18,7 @@ class SynchronizedPlain1 { } } class SynchronizedPlain2 { - private static final java.lang.Object $LOCK = new java.lang.Object[0]; + private static final @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Object $LOCK = new java.lang.Object[0]; () { } SynchronizedPlain2() { From 52283d71ccf3c944fc1f4e0d5ecf954a405fc048 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Fri, 24 May 2024 00:47:08 +0200 Subject: [PATCH 054/118] [fixes #3665] Add cast for null arguments --- .../handlers/HandleStandardException.java | 10 +++++--- .../handlers/HandleStandardException.java | 10 +++++--- .../StandardExceptionWithConstructor.java | 25 +++++++++++++++++++ .../StandardExceptionWithConstructor.java | 20 +++++++++++++++ .../after-ecj/StandardExceptions.java | 6 ++--- .../StandardExceptionWithConstructor.java | 7 ++++++ ...dardExceptionWithConstructor.java.messages | 1 + 7 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 test/transform/resource/after-delombok/StandardExceptionWithConstructor.java create mode 100644 test/transform/resource/after-ecj/StandardExceptionWithConstructor.java create mode 100644 test/transform/resource/before/StandardExceptionWithConstructor.java create mode 100644 test/transform/resource/messages-ecj/StandardExceptionWithConstructor.java.messages diff --git a/src/core/lombok/eclipse/handlers/HandleStandardException.java b/src/core/lombok/eclipse/handlers/HandleStandardException.java index def6e495e2..4672555cf8 100755 --- a/src/core/lombok/eclipse/handlers/HandleStandardException.java +++ b/src/core/lombok/eclipse/handlers/HandleStandardException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 The Project Lombok Authors. + * Copyright (C) 2021-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -70,8 +70,10 @@ private void generateNoArgsConstructor(EclipseNode typeNode, AccessLevel level, if (hasConstructor(typeNode) != MemberExistsResult.NOT_EXISTS) return; int pS = source.get().sourceStart, pE = source.get().sourceEnd; + Expression messageArgument = new CastExpression(new NullLiteral(pS, pE), generateQualifiedTypeRef(source.get(), TypeConstants.JAVA_LANG_STRING)); + Expression causeArgument = new CastExpression(new NullLiteral(pS, pE), generateQualifiedTypeRef(source.get(), TypeConstants.JAVA_LANG_THROWABLE)); ExplicitConstructorCall explicitCall = new ExplicitConstructorCall(ExplicitConstructorCall.This); - explicitCall.arguments = new Expression[] {new NullLiteral(pS, pE), new NullLiteral(pS, pE)}; + explicitCall.arguments = new Expression[] {messageArgument, causeArgument}; ConstructorDeclaration constructor = createConstructor(level, typeNode, false, false, source, explicitCall, null); injectMethod(typeNode, constructor); } @@ -81,8 +83,10 @@ private void generateMsgOnlyConstructor(EclipseNode typeNode, AccessLevel level, int pS = source.get().sourceStart, pE = source.get().sourceEnd; long p = (long) pS << 32 | pE; + Expression messageArgument = new SingleNameReference(MESSAGE, p); + Expression causeArgument = new CastExpression(new NullLiteral(pS, pE), generateQualifiedTypeRef(source.get(), TypeConstants.JAVA_LANG_THROWABLE)); ExplicitConstructorCall explicitCall = new ExplicitConstructorCall(ExplicitConstructorCall.This); - explicitCall.arguments = new Expression[] {new SingleNameReference(MESSAGE, p), new NullLiteral(pS, pE)}; + explicitCall.arguments = new Expression[] {messageArgument, causeArgument}; ConstructorDeclaration constructor = createConstructor(level, typeNode, true, false, source, explicitCall, null); injectMethod(typeNode, constructor); } diff --git a/src/core/lombok/javac/handlers/HandleStandardException.java b/src/core/lombok/javac/handlers/HandleStandardException.java index dd764233c2..56bf8905e8 100644 --- a/src/core/lombok/javac/handlers/HandleStandardException.java +++ b/src/core/lombok/javac/handlers/HandleStandardException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 The Project Lombok Authors. + * Copyright (C) 2021-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -81,7 +81,9 @@ private void generateNoArgsConstructor(JavacNode typeNode, AccessLevel level, Ja if (hasConstructor(typeNode) != MemberExistsResult.NOT_EXISTS) return; JavacTreeMaker maker = typeNode.getTreeMaker(); - List args = List.of(maker.Literal(CTC_BOT, null), maker.Literal(CTC_BOT, null)); + JCExpression stringArgument = maker.TypeCast(genJavaLangTypeRef(typeNode, "String"), maker.Literal(CTC_BOT, null)); + JCExpression throwableArgument = maker.TypeCast(genJavaLangTypeRef(typeNode, "Throwable"), maker.Literal(CTC_BOT, null)); + List args = List.of(stringArgument, throwableArgument); JCStatement thisCall = maker.Exec(maker.Apply(List.nil(), maker.Ident(typeNode.toName("this")), args)); JCMethodDecl constr = createConstructor(level, typeNode, false, false, source, List.of(thisCall)); injectMethod(typeNode, constr); @@ -91,7 +93,9 @@ private void generateMsgOnlyConstructor(JavacNode typeNode, AccessLevel level, J if (hasConstructor(typeNode, String.class) != MemberExistsResult.NOT_EXISTS) return; JavacTreeMaker maker = typeNode.getTreeMaker(); - List args = List.of(maker.Ident(typeNode.toName("message")), maker.Literal(CTC_BOT, null)); + JCExpression stringArgument = maker.Ident(typeNode.toName("message")); + JCExpression throwableArgument = maker.TypeCast(genJavaLangTypeRef(typeNode, "Throwable"), maker.Literal(CTC_BOT, null)); + List args = List.of(stringArgument, throwableArgument); JCStatement thisCall = maker.Exec(maker.Apply(List.nil(), maker.Ident(typeNode.toName("this")), args)); JCMethodDecl constr = createConstructor(level, typeNode, true, false, source, List.of(thisCall)); injectMethod(typeNode, constr); diff --git a/test/transform/resource/after-delombok/StandardExceptionWithConstructor.java b/test/transform/resource/after-delombok/StandardExceptionWithConstructor.java new file mode 100644 index 0000000000..3e1cf3e430 --- /dev/null +++ b/test/transform/resource/after-delombok/StandardExceptionWithConstructor.java @@ -0,0 +1,25 @@ +public class StandardExceptionWithConstructor extends Exception { + public StandardExceptionWithConstructor(Integer x, Integer y) { + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public StandardExceptionWithConstructor() { + this((java.lang.String) null, (java.lang.Throwable) null); + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public StandardExceptionWithConstructor(final java.lang.String message) { + this(message, (java.lang.Throwable) null); + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public StandardExceptionWithConstructor(final java.lang.Throwable cause) { + this(cause != null ? cause.getMessage() : null, cause); + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public StandardExceptionWithConstructor(final java.lang.String message, final java.lang.Throwable cause) { + super(message); + if (cause != null) super.initCause(cause); + } +} diff --git a/test/transform/resource/after-ecj/StandardExceptionWithConstructor.java b/test/transform/resource/after-ecj/StandardExceptionWithConstructor.java new file mode 100644 index 0000000000..22f73e639d --- /dev/null +++ b/test/transform/resource/after-ecj/StandardExceptionWithConstructor.java @@ -0,0 +1,20 @@ +import lombok.experimental.StandardException; +public @StandardException class StandardExceptionWithConstructor extends Exception { + public StandardExceptionWithConstructor(Integer x, Integer y) { + super(); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated StandardExceptionWithConstructor() { + this((java.lang.String) null, (java.lang.Throwable) null); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated StandardExceptionWithConstructor(final java.lang.String message) { + this(message, (java.lang.Throwable) null); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated StandardExceptionWithConstructor(final java.lang.Throwable cause) { + this(((cause != null) ? cause.getMessage() : null), cause); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated StandardExceptionWithConstructor(final java.lang.String message, final java.lang.Throwable cause) { + super(message); + if ((cause != null)) + super.initCause(cause); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/StandardExceptions.java b/test/transform/resource/after-ecj/StandardExceptions.java index b5e0f85801..2ba3c02ce0 100644 --- a/test/transform/resource/after-ecj/StandardExceptions.java +++ b/test/transform/resource/after-ecj/StandardExceptions.java @@ -2,10 +2,10 @@ import lombok.experimental.StandardException; @StandardException class EmptyException extends Exception { public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException() { - this(null, null); + this((java.lang.String) null, (java.lang.Throwable) null); } public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException(final java.lang.String message) { - this(message, null); + this(message, (java.lang.Throwable) null); } public @java.lang.SuppressWarnings("all") @lombok.Generated EmptyException(final java.lang.Throwable cause) { this(((cause != null) ? cause.getMessage() : null), cause); @@ -21,7 +21,7 @@ public NoArgsException() { super(); } protected @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsException(final java.lang.String message) { - this(message, null); + this(message, (java.lang.Throwable) null); } protected @java.lang.SuppressWarnings("all") @lombok.Generated NoArgsException(final java.lang.Throwable cause) { this(((cause != null) ? cause.getMessage() : null), cause); diff --git a/test/transform/resource/before/StandardExceptionWithConstructor.java b/test/transform/resource/before/StandardExceptionWithConstructor.java new file mode 100644 index 0000000000..111cadd837 --- /dev/null +++ b/test/transform/resource/before/StandardExceptionWithConstructor.java @@ -0,0 +1,7 @@ +import lombok.experimental.StandardException; + +@StandardException +public class StandardExceptionWithConstructor extends Exception { + public StandardExceptionWithConstructor(Integer x, Integer y) { + } +} \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/StandardExceptionWithConstructor.java.messages b/test/transform/resource/messages-ecj/StandardExceptionWithConstructor.java.messages new file mode 100644 index 0000000000..0896e9cfc0 --- /dev/null +++ b/test/transform/resource/messages-ecj/StandardExceptionWithConstructor.java.messages @@ -0,0 +1 @@ +4 The serializable class StandardExceptionWithConstructor does not declare a static final serialVersionUID field of type long \ No newline at end of file From 4c3ede2e6b3d5f5d80d828355c99a2fd885e23ff Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Fri, 24 May 2024 18:40:10 +0200 Subject: [PATCH 055/118] Add missing test file --- .../resource/after-delombok/StandardExceptions.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/transform/resource/after-delombok/StandardExceptions.java b/test/transform/resource/after-delombok/StandardExceptions.java index af2edf6b77..ecfabb417c 100644 --- a/test/transform/resource/after-delombok/StandardExceptions.java +++ b/test/transform/resource/after-delombok/StandardExceptions.java @@ -2,12 +2,12 @@ class EmptyException extends Exception { @java.lang.SuppressWarnings("all") @lombok.Generated public EmptyException() { - this(null, null); + this((java.lang.String) null, (java.lang.Throwable) null); } @java.lang.SuppressWarnings("all") @lombok.Generated public EmptyException(final java.lang.String message) { - this(message, null); + this(message, (java.lang.Throwable) null); } @java.lang.SuppressWarnings("all") @lombok.Generated @@ -27,7 +27,7 @@ public NoArgsException() { @java.lang.SuppressWarnings("all") @lombok.Generated protected NoArgsException(final java.lang.String message) { - this(message, null); + this(message, (java.lang.Throwable) null); } @java.lang.SuppressWarnings("all") @lombok.Generated From 26c8271b3e9873a9b886373b448f544a1edfad9c Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Mon, 6 Sep 2021 23:25:11 +0200 Subject: [PATCH 056/118] [#2934] Copy last param javadoc, copy param javadoc in eclipse --- .../lombok/core/handlers/HandlerUtil.java | 2 +- .../eclipse/handlers/EclipseHandlerUtil.java | 13 +++++++++++- .../eclipse/handlers/HandleBuilder.java | 4 ++-- .../BuilderConstructorJavadoc.java | 20 ++++++++++++++++--- .../after-ecj/BuilderConstructorJavadoc.java | 19 +++++++++++++++--- .../before/BuilderConstructorJavadoc.java | 3 ++- 6 files changed, 50 insertions(+), 11 deletions(-) diff --git a/src/core/lombok/core/handlers/HandlerUtil.java b/src/core/lombok/core/handlers/HandlerUtil.java index 16274df9a4..b6124670b7 100644 --- a/src/core/lombok/core/handlers/HandlerUtil.java +++ b/src/core/lombok/core/handlers/HandlerUtil.java @@ -974,7 +974,7 @@ public static String addJavadocLine(String in, String line) { public static String getParamJavadoc(String methodComment, String param) { if (methodComment == null || methodComment.isEmpty()) return methodComment; - Pattern pattern = Pattern.compile("@param " + param + " (\\S|\\s)+?(?=^ ?@)", Pattern.MULTILINE | Pattern.CASE_INSENSITIVE); + Pattern pattern = Pattern.compile("@param " + param + " (\\S|\\s)+?(?=^ ?@|\\z)", Pattern.MULTILINE | Pattern.CASE_INSENSITIVE); Matcher matcher = pattern.matcher(methodComment); if (matcher.find()) { return matcher.group(); diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 39e29e941e..31554a8691 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -2800,10 +2800,21 @@ public static Annotation[][] getRecordFieldAnnotations(TypeDeclaration typeDecla public static String getDocComment(EclipseNode eclipseNode) { if (eclipseNode.getAst().getSource() == null) return null; + int start = -1; + int end = -1; + final ASTNode node = eclipseNode.get(); if (node instanceof FieldDeclaration) { FieldDeclaration fieldDeclaration = (FieldDeclaration) node; - char[] rawContent = CharOperation.subarray(eclipseNode.getAst().getSource(), fieldDeclaration.declarationSourceStart, fieldDeclaration.declarationSourceEnd); + start = fieldDeclaration.declarationSourceStart; + end = fieldDeclaration.declarationSourceEnd; + } else if (node instanceof AbstractMethodDeclaration) { + AbstractMethodDeclaration abstractMethodDeclaration = (AbstractMethodDeclaration) node; + start = abstractMethodDeclaration.declarationSourceStart; + end = abstractMethodDeclaration.declarationSourceEnd; + } + if (start != -1 && end != -1) { + char[] rawContent = CharOperation.subarray(eclipseNode.getAst().getSource(), start, end); String rawContentString = new String(rawContent); int startIndex = rawContentString.indexOf("/**"); int endIndex = rawContentString.indexOf("*/"); diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index 0a6b3447be..a63d3b36b9 100755 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2021 The Project Lombok Authors. + * Copyright (C) 2013-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -1053,7 +1053,7 @@ private void makePrefixedSetterMethodForBuilder(BuilderJob job, BuilderFieldData MethodDeclaration setter = HandleSetter.createSetter(td, deprecate, fieldNode, setterName, bfd.name, bfd.nameOfSetFlag, job.oldChain, toEclipseModifier(job.accessInners), job.sourceNode, methodAnnsList, bfd.annotations != null ? Arrays.asList(copyAnnotations(source, bfd.annotations)) : Collections.emptyList()); if (job.sourceNode.up().getKind() == Kind.METHOD) { - copyJavadocFromParam(bfd.originalFieldNode.up(), setter, td, bfd.name.toString()); + copyJavadocFromParam(bfd.originalFieldNode.up(), setter, td, new String(bfd.name)); } else { copyJavadoc(bfd.originalFieldNode, setter, td, CopyJavadoc.SETTER, true); } diff --git a/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java b/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java index 4746de45fc..71bf1a7c33 100644 --- a/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java +++ b/test/transform/resource/after-delombok/BuilderConstructorJavadoc.java @@ -9,8 +9,9 @@ class BuilderConstructorJavadoc { * {@code @code} or tags * @param predef don't copy this one * @param predefWithJavadoc don't copy this one + * @param last also copy last param */ - BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc) { + BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc, int last) { } public static class BuilderConstructorJavadocBuilder { @java.lang.SuppressWarnings("all") @@ -25,6 +26,9 @@ public static class BuilderConstructorJavadocBuilder { @java.lang.SuppressWarnings("all") @lombok.Generated private int predefWithJavadoc; + @java.lang.SuppressWarnings("all") + @lombok.Generated + private int last; public BuilderConstructorJavadocBuilder predef(final int x) { this.predef = x; return this; @@ -64,16 +68,26 @@ public BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder multiline(f this.multiline = multiline; return this; } + /** + * @param last also copy last param + * @return {@code this}. + */ + @java.lang.SuppressWarnings("all") + @lombok.Generated + public BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder last(final int last) { + this.last = last; + return this; + } @java.lang.SuppressWarnings("all") @lombok.Generated public BuilderConstructorJavadoc build() { - return new BuilderConstructorJavadoc(this.basic, this.multiline, this.predef, this.predefWithJavadoc); + return new BuilderConstructorJavadoc(this.basic, this.multiline, this.predef, this.predefWithJavadoc, this.last); } @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated public java.lang.String toString() { - return "BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(basic=" + this.basic + ", multiline=" + this.multiline + ", predef=" + this.predef + ", predefWithJavadoc=" + this.predefWithJavadoc + ")"; + return "BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(basic=" + this.basic + ", multiline=" + this.multiline + ", predef=" + this.predef + ", predefWithJavadoc=" + this.predefWithJavadoc + ", last=" + this.last + ")"; } } @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java b/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java index 273a803f53..62c8eb8bcf 100644 --- a/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java +++ b/test/transform/resource/after-ecj/BuilderConstructorJavadoc.java @@ -5,6 +5,7 @@ public static class BuilderConstructorJavadocBuilder { private @java.lang.SuppressWarnings("all") @lombok.Generated int multiline; private @java.lang.SuppressWarnings("all") @lombok.Generated int predef; private @java.lang.SuppressWarnings("all") @lombok.Generated int predefWithJavadoc; + private @java.lang.SuppressWarnings("all") @lombok.Generated int last; public BuilderConstructorJavadocBuilder predef(final int x) { this.predef = x; return this; @@ -17,6 +18,7 @@ public BuilderConstructorJavadocBuilder predefWithJavadoc(final int x) { super(); } /** + * @param basic tag is moved to the setter * @return {@code this}. */ public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder basic(final int basic) { @@ -24,20 +26,31 @@ public BuilderConstructorJavadocBuilder predefWithJavadoc(final int x) { return this; } /** + * @param multiline a param comment + * can be on multiple lines and can use + * {@code @code} or tags * @return {@code this}. */ public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder multiline(final int multiline) { this.multiline = multiline; return this; } + /** + * @param last also copy last param + * @return {@code this}. + */ + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder last(final int last) { + this.last = last; + return this; + } public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc build() { - return new BuilderConstructorJavadoc(this.basic, this.multiline, this.predef, this.predefWithJavadoc); + return new BuilderConstructorJavadoc(this.basic, this.multiline, this.predef, this.predefWithJavadoc, this.last); } public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { - return (((((((("BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(basic=" + this.basic) + ", multiline=") + this.multiline) + ", predef=") + this.predef) + ", predefWithJavadoc=") + this.predefWithJavadoc) + ")"); + return (((((((((("BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder(basic=" + this.basic) + ", multiline=") + this.multiline) + ", predef=") + this.predef) + ", predefWithJavadoc=") + this.predefWithJavadoc) + ", last=") + this.last) + ")"); } } - @lombok.Builder BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc) { + @lombok.Builder BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc, int last) { super(); } public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderConstructorJavadoc.BuilderConstructorJavadocBuilder builder() { diff --git a/test/transform/resource/before/BuilderConstructorJavadoc.java b/test/transform/resource/before/BuilderConstructorJavadoc.java index ebbd473f24..adf6db7657 100644 --- a/test/transform/resource/before/BuilderConstructorJavadoc.java +++ b/test/transform/resource/before/BuilderConstructorJavadoc.java @@ -10,9 +10,10 @@ class BuilderConstructorJavadoc { * {@code @code} or tags * @param predef don't copy this one * @param predefWithJavadoc don't copy this one + * @param last also copy last param */ @lombok.Builder - BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc) { + BuilderConstructorJavadoc(int basic, int multiline, int predef, int predefWithJavadoc, int last) { } From a2dd5ffa6a35fcac100663859430c49678bf75d2 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sat, 15 Jun 2024 11:32:51 +0200 Subject: [PATCH 057/118] Remove duplicate content in copied @param tags --- .../lombok/core/handlers/HandlerUtil.java | 21 ++++++++++++------- .../eclipse/handlers/HandleConstructor.java | 4 ++-- .../javac/handlers/HandleConstructor.java | 4 ++-- .../after-delombok/ConstructorJavadoc.java | 2 +- .../after-ecj/ConstructorJavadoc.java | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/core/lombok/core/handlers/HandlerUtil.java b/src/core/lombok/core/handlers/HandlerUtil.java index b6124670b7..412a77417e 100644 --- a/src/core/lombok/core/handlers/HandlerUtil.java +++ b/src/core/lombok/core/handlers/HandlerUtil.java @@ -910,9 +910,13 @@ public enum JavadocTag { } } - public static String stripLinesWithTagFromJavadoc(String javadoc, JavadocTag tag) { + public static String stripLinesWithTagFromJavadoc(String javadoc, JavadocTag... tags) { if (javadoc == null || javadoc.isEmpty()) return javadoc; - return tag.pattern.matcher(javadoc).replaceAll("").trim(); + String result = javadoc; + for (JavadocTag tag : tags) { + result = tag.pattern.matcher(result).replaceAll("").trim(); + } + return result; } public static String stripSectionsFromJavadoc(String javadoc) { @@ -968,7 +972,7 @@ public static String addReturnsUpdatedSelfIfNeeded(String in) { public static String addJavadocLine(String in, String line) { if (in == null) return line; - if (in.endsWith("\n")) return in + line + "\n"; + if (in.endsWith("\n")) return in + line; return in + "\n" + line; } @@ -990,11 +994,14 @@ public static String getConstructorParameterJavadoc(String paramName, String fie String fieldBaseJavadoc = stripSectionsFromJavadoc(fieldJavadoc); String paramJavadoc = getParamJavadoc(fieldBaseJavadoc, paramName); - if (paramJavadoc == null) { - paramJavadoc = stripLinesWithTagFromJavadoc(fieldBaseJavadoc, JavadocTag.PARAM); - paramJavadoc = stripLinesWithTagFromJavadoc(paramJavadoc, JavadocTag.RETURN); + if (paramJavadoc != null) { + return paramJavadoc; } - return paramJavadoc; + String javadocWithoutTags = stripLinesWithTagFromJavadoc(fieldBaseJavadoc, JavadocTag.PARAM, JavadocTag.RETURN); + if (javadocWithoutTags != null) { + return "@param " + paramName + " " + javadocWithoutTags; + } + return null; } } diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java index e60ca15f2b..81b4cf1194 100755 --- a/src/core/lombok/eclipse/handlers/HandleConstructor.java +++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java @@ -598,12 +598,12 @@ private void generateConstructorJavadoc(EclipseNode typeNode, EclipseNode constr String paramJavadoc = getConstructorParameterJavadoc(paramName, fieldJavadoc); if (paramJavadoc == null) { - paramJavadoc = ""; + paramJavadoc = "@param " + paramName; } else { fieldDescriptionAdded = true; } - constructorJavadoc = addJavadocLine(constructorJavadoc, "@param " + paramName + " " + paramJavadoc); + constructorJavadoc = addJavadocLine(constructorJavadoc, paramJavadoc); } if (fieldDescriptionAdded) { setDocComment(typeNode, constructorNode, constructorJavadoc); diff --git a/src/core/lombok/javac/handlers/HandleConstructor.java b/src/core/lombok/javac/handlers/HandleConstructor.java index 27dba4a0c4..31d1544592 100644 --- a/src/core/lombok/javac/handlers/HandleConstructor.java +++ b/src/core/lombok/javac/handlers/HandleConstructor.java @@ -490,12 +490,12 @@ private void generateConstructorJavadoc(JCMethodDecl constructor, JavacNode type String paramJavadoc = getConstructorParameterJavadoc(paramName, fieldJavadoc); if (paramJavadoc == null) { - paramJavadoc = ""; + paramJavadoc = "@param " + paramName; } else { fieldDescriptionAdded = true; } - constructorJavadoc = addJavadocLine(constructorJavadoc, "@param " + paramName + " " + paramJavadoc); + constructorJavadoc = addJavadocLine(constructorJavadoc, paramJavadoc); } if (fieldDescriptionAdded) { setDocComment(cu, constructor, constructorJavadoc); diff --git a/test/transform/resource/after-delombok/ConstructorJavadoc.java b/test/transform/resource/after-delombok/ConstructorJavadoc.java index bd55b58554..71a99e4659 100644 --- a/test/transform/resource/after-delombok/ConstructorJavadoc.java +++ b/test/transform/resource/after-delombok/ConstructorJavadoc.java @@ -16,7 +16,7 @@ public class ConstructorJavadoc { /** * Creates a new {@code ConstructorJavadoc} instance. * - * @param fieldName Some text + * @param fieldName Hello, World1 * @param fieldName2 Sky is blue */ @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-ecj/ConstructorJavadoc.java b/test/transform/resource/after-ecj/ConstructorJavadoc.java index 4b861ab7f6..da931f2c22 100644 --- a/test/transform/resource/after-ecj/ConstructorJavadoc.java +++ b/test/transform/resource/after-ecj/ConstructorJavadoc.java @@ -5,7 +5,7 @@ /** * Creates a new {@code ConstructorJavadoc} instance. * - * @param fieldName Some text + * @param fieldName Hello, World1 * @param fieldName2 Sky is blue */ public @java.lang.SuppressWarnings("all") @lombok.Generated ConstructorJavadoc(final int fieldName, final int fieldName2) { From 0ab79d6f14126cd7c18a229da36772c7800166a3 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sun, 16 Jun 2024 10:02:15 +0200 Subject: [PATCH 058/118] Generate javadoc for nested classes --- .../lombok/delombok/DocCommentIntegrator.java | 73 +++++++++-------- .../after-delombok/BuilderNestedJavadoc.java | 78 +++++++++++++++++++ .../after-ecj/BuilderNestedJavadoc.java | 49 ++++++++++++ .../resource/before/BuilderNestedJavadoc.java | 10 +++ 4 files changed, 173 insertions(+), 37 deletions(-) create mode 100644 test/transform/resource/after-delombok/BuilderNestedJavadoc.java create mode 100644 test/transform/resource/after-ecj/BuilderNestedJavadoc.java create mode 100644 test/transform/resource/before/BuilderNestedJavadoc.java diff --git a/src/delombok/lombok/delombok/DocCommentIntegrator.java b/src/delombok/lombok/delombok/DocCommentIntegrator.java index 945f4fa4d6..abc4e853bf 100644 --- a/src/delombok/lombok/delombok/DocCommentIntegrator.java +++ b/src/delombok/lombok/delombok/DocCommentIntegrator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2018 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,16 +22,13 @@ package lombok.delombok; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import java.util.NavigableMap; +import java.util.TreeMap; import java.util.regex.Pattern; -import lombok.javac.CommentInfo; -import lombok.javac.Javac; -import lombok.javac.PackageName; -import lombok.javac.handlers.JavacHandlerUtil; - import com.sun.tools.javac.parser.Tokens.Comment; import com.sun.tools.javac.tree.DocCommentTable; import com.sun.tools.javac.tree.JCTree; @@ -39,6 +36,11 @@ import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; import com.sun.tools.javac.tree.JCTree.JCMethodDecl; import com.sun.tools.javac.tree.JCTree.JCVariableDecl; +import com.sun.tools.javac.tree.TreeScanner; + +import lombok.javac.CommentInfo; +import lombok.javac.Javac; +import lombok.javac.handlers.JavacHandlerUtil; public class DocCommentIntegrator { /** @@ -49,18 +51,21 @@ public List integrate(List comments, JCCompilationUnit CommentInfo lastExcisedComment = null; JCTree lastNode = null; + NavigableMap positionMap = buildNodePositionMap(unit); + for (CommentInfo cmt : comments) { if (!cmt.isJavadoc()) { out.add(cmt); continue; } - JCTree node = findJavadocableNodeOnOrAfter(unit, cmt.endPos); - if (node == null) { + Entry entry = positionMap.ceilingEntry(cmt.endPos); + if (entry == null) { out.add(cmt); continue; } + JCTree node = entry.getValue(); if (node == lastNode) { out.add(lastExcisedComment); } @@ -73,6 +78,28 @@ public List integrate(List comments, JCCompilationUnit } return out; } + + private NavigableMap buildNodePositionMap(JCCompilationUnit unit) { + NavigableMap positionMap = new TreeMap<>(); + unit.accept(new TreeScanner() { + @Override + public void visitClassDef(JCClassDecl tree) { + positionMap.put(tree.pos, tree); + super.visitClassDef(tree); + } + @Override + public void visitMethodDef(JCMethodDecl tree) { + positionMap.put(tree.pos, tree); + super.visitMethodDef(tree); + } + @Override + public void visitVarDef(JCVariableDecl tree) { + positionMap.put(tree.pos, tree); + super.visitVarDef(tree); + } + }); + return positionMap; + } private static final Pattern CONTENT_STRIPPER = Pattern.compile("^(?:\\s*\\*)?(.*?)$", Pattern.MULTILINE); @SuppressWarnings("unchecked") private boolean attach(JCCompilationUnit top, final JCTree node, CommentInfo cmt) { @@ -119,32 +146,4 @@ static void attach(final JCTree node, String docCommentContent, final int pos, O }); } } - - private JCTree findJavadocableNodeOnOrAfter(JCCompilationUnit unit, int endPos) { - JCTree pid = PackageName.getPackageNode(unit); - if (pid != null && endPos <= pid.pos) return null; - Iterator it = unit.defs.iterator(); - - while (it.hasNext()) { - JCTree node = it.next(); - if (node.pos < endPos) { - if (node instanceof JCClassDecl) { - com.sun.tools.javac.util.List defs = ((JCClassDecl) node).defs; - if (!defs.isEmpty()) while (!defs.tail.isEmpty()) defs = defs.tail; - if (defs.head != null && defs.head.pos >= endPos) { - // The associated node is IN this class declaration, so, replace the iterator. - // There's no point looking beyond this member in the current iteration 'context' - // so we don't need to save the old ref. Just start over inside this type declaration. - it = ((JCClassDecl) node).defs.iterator(); - } - } - continue; - } - - if (node instanceof JCMethodDecl || node instanceof JCClassDecl || node instanceof JCVariableDecl) return node; - return null; - } - - return null; - } } diff --git a/test/transform/resource/after-delombok/BuilderNestedJavadoc.java b/test/transform/resource/after-delombok/BuilderNestedJavadoc.java new file mode 100644 index 0000000000..eb45e87f0a --- /dev/null +++ b/test/transform/resource/after-delombok/BuilderNestedJavadoc.java @@ -0,0 +1,78 @@ +public class BuilderNestedJavadoc { + public static class NestedClass { + /** + * Example javadoc + */ + String name; + @java.lang.SuppressWarnings("all") + @lombok.Generated + NestedClass(final String name) { + this.name = name; + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static class NestedClassBuilder { + @java.lang.SuppressWarnings("all") + @lombok.Generated + private String name; + @java.lang.SuppressWarnings("all") + @lombok.Generated + NestedClassBuilder() { + } + /** + * Example javadoc + * @return {@code this}. + */ + @java.lang.SuppressWarnings("all") + @lombok.Generated + public BuilderNestedJavadoc.NestedClass.NestedClassBuilder name(final String name) { + this.name = name; + return this; + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public BuilderNestedJavadoc.NestedClass build() { + return new BuilderNestedJavadoc.NestedClass(this.name); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public java.lang.String toString() { + return "BuilderNestedJavadoc.NestedClass.NestedClassBuilder(name=" + this.name + ")"; + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static BuilderNestedJavadoc.NestedClass.NestedClassBuilder builder() { + return new BuilderNestedJavadoc.NestedClass.NestedClassBuilder(); + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + BuilderNestedJavadoc() { + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static class BuilderNestedJavadocBuilder { + @java.lang.SuppressWarnings("all") + @lombok.Generated + BuilderNestedJavadocBuilder() { + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public BuilderNestedJavadoc build() { + return new BuilderNestedJavadoc(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public java.lang.String toString() { + return "BuilderNestedJavadoc.BuilderNestedJavadocBuilder()"; + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static BuilderNestedJavadoc.BuilderNestedJavadocBuilder builder() { + return new BuilderNestedJavadoc.BuilderNestedJavadocBuilder(); + } +} diff --git a/test/transform/resource/after-ecj/BuilderNestedJavadoc.java b/test/transform/resource/after-ecj/BuilderNestedJavadoc.java new file mode 100644 index 0000000000..a9d67fde54 --- /dev/null +++ b/test/transform/resource/after-ecj/BuilderNestedJavadoc.java @@ -0,0 +1,49 @@ +public @lombok.Builder class BuilderNestedJavadoc { + public static @lombok.Builder class NestedClass { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class NestedClassBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String name; + @java.lang.SuppressWarnings("all") @lombok.Generated NestedClassBuilder() { + super(); + } + /** + * Example javadoc + * @return {@code this}. + */ + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedJavadoc.NestedClass.NestedClassBuilder name(final String name) { + this.name = name; + return this; + } + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedJavadoc.NestedClass build() { + return new BuilderNestedJavadoc.NestedClass(this.name); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { + return (("BuilderNestedJavadoc.NestedClass.NestedClassBuilder(name=" + this.name) + ")"); + } + } + String name; + @java.lang.SuppressWarnings("all") @lombok.Generated NestedClass(final String name) { + super(); + this.name = name; + } + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedJavadoc.NestedClass.NestedClassBuilder builder() { + return new BuilderNestedJavadoc.NestedClass.NestedClassBuilder(); + } + } + public static @java.lang.SuppressWarnings("all") @lombok.Generated class BuilderNestedJavadocBuilder { + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedJavadocBuilder() { + super(); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedJavadoc build() { + return new BuilderNestedJavadoc(); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { + return "BuilderNestedJavadoc.BuilderNestedJavadocBuilder()"; + } + } + @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedJavadoc() { + super(); + } + public static @java.lang.SuppressWarnings("all") @lombok.Generated BuilderNestedJavadoc.BuilderNestedJavadocBuilder builder() { + return new BuilderNestedJavadoc.BuilderNestedJavadocBuilder(); + } +} diff --git a/test/transform/resource/before/BuilderNestedJavadoc.java b/test/transform/resource/before/BuilderNestedJavadoc.java new file mode 100644 index 0000000000..92e1277c26 --- /dev/null +++ b/test/transform/resource/before/BuilderNestedJavadoc.java @@ -0,0 +1,10 @@ +@lombok.Builder +public class BuilderNestedJavadoc { + @lombok.Builder + public static class NestedClass { + /** + * Example javadoc + */ + String name; + } +} From 8e276df9ca25b1803250b0061fd258236e398433 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sun, 16 Jun 2024 10:07:09 +0200 Subject: [PATCH 059/118] Remove java 7 features --- src/delombok/lombok/delombok/DocCommentIntegrator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/delombok/lombok/delombok/DocCommentIntegrator.java b/src/delombok/lombok/delombok/DocCommentIntegrator.java index abc4e853bf..f74ea249c5 100644 --- a/src/delombok/lombok/delombok/DocCommentIntegrator.java +++ b/src/delombok/lombok/delombok/DocCommentIntegrator.java @@ -80,7 +80,7 @@ public List integrate(List comments, JCCompilationUnit } private NavigableMap buildNodePositionMap(JCCompilationUnit unit) { - NavigableMap positionMap = new TreeMap<>(); + final NavigableMap positionMap = new TreeMap(); unit.accept(new TreeScanner() { @Override public void visitClassDef(JCClassDecl tree) { From ad2c75a6b121b329aee9595b564d9efebd0910dc Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sun, 16 Jun 2024 12:23:08 +0200 Subject: [PATCH 060/118] Add eclipse 2024-06 test target --- .github/workflows/ant.yml | 2 ++ buildScripts/ivy.xml | 14 ++++++++++++++ buildScripts/setup.ant.xml | 4 ++++ buildScripts/tests.ant.xml | 11 ++++++++++- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 278f9752cd..4a53d4278f 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -107,12 +107,14 @@ jobs: - eclipse-202309 - eclipse-202312 - eclipse-202403 + - eclipse-202406 - eclipse-I-build - eclipse-oxygen-full - eclipse-2022-03-full - eclipse-2023-09-full - eclipse-2023-12-full - eclipse-2024-03-full + - eclipse-2024-06-full - eclipse-I-build-full - ecj11 - ecj14 diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index c3687cb802..38b4878563 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -34,6 +34,7 @@ + @@ -160,6 +161,19 @@ + + + + + + + + + + + + + diff --git a/buildScripts/setup.ant.xml b/buildScripts/setup.ant.xml index 2a25a9ba7d..91d3d478bf 100644 --- a/buildScripts/setup.ant.xml +++ b/buildScripts/setup.ant.xml @@ -176,6 +176,10 @@ This buildfile is part of projectlombok.org. It sets up the build itself. + + + + diff --git a/buildScripts/tests.ant.xml b/buildScripts/tests.ant.xml index 8f7023db2d..6044551823 100644 --- a/buildScripts/tests.ant.xml +++ b/buildScripts/tests.ant.xml @@ -228,6 +228,11 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn + + + + + @@ -300,10 +305,14 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn - + + + + + From eb6e01e172fabb011d664c248c3218b058e30da4 Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Mon, 24 Jun 2024 23:52:53 +0200 Subject: [PATCH 061/118] add test case for array type parameter --- .../SuperBuilderWithArrayTypeParam.java | 131 ++++++++++++++++++ .../SuperBuilderWithArrayTypeParam.java | 87 ++++++++++++ .../SuperBuilderWithArrayTypeParam.java | 16 +++ 3 files changed, 234 insertions(+) create mode 100644 test/transform/resource/after-delombok/SuperBuilderWithArrayTypeParam.java create mode 100644 test/transform/resource/after-ecj/SuperBuilderWithArrayTypeParam.java create mode 100644 test/transform/resource/before/SuperBuilderWithArrayTypeParam.java diff --git a/test/transform/resource/after-delombok/SuperBuilderWithArrayTypeParam.java b/test/transform/resource/after-delombok/SuperBuilderWithArrayTypeParam.java new file mode 100644 index 0000000000..40cdde2d82 --- /dev/null +++ b/test/transform/resource/after-delombok/SuperBuilderWithArrayTypeParam.java @@ -0,0 +1,131 @@ +//version 8: +public class SuperBuilderWithArrayTypeParam { + public static class Parent { + A field1; + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static abstract class ParentBuilder, B extends SuperBuilderWithArrayTypeParam.Parent.ParentBuilder> { + @java.lang.SuppressWarnings("all") + @lombok.Generated + private A field1; + /** + * @return {@code this}. + */ + @java.lang.SuppressWarnings("all") + @lombok.Generated + public B field1(final A field1) { + this.field1 = field1; + return self(); + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected abstract B self(); + @java.lang.SuppressWarnings("all") + @lombok.Generated + public abstract C build(); + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public java.lang.String toString() { + return "SuperBuilderWithArrayTypeParam.Parent.ParentBuilder(field1=" + this.field1 + ")"; + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + private static final class ParentBuilderImpl extends SuperBuilderWithArrayTypeParam.Parent.ParentBuilder, SuperBuilderWithArrayTypeParam.Parent.ParentBuilderImpl> { + @java.lang.SuppressWarnings("all") + @lombok.Generated + private ParentBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected SuperBuilderWithArrayTypeParam.Parent.ParentBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public SuperBuilderWithArrayTypeParam.Parent build() { + return new SuperBuilderWithArrayTypeParam.Parent(this); + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected Parent(final SuperBuilderWithArrayTypeParam.Parent.ParentBuilder b) { + this.field1 = b.field1; + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static SuperBuilderWithArrayTypeParam.Parent.ParentBuilder builder() { + return new SuperBuilderWithArrayTypeParam.Parent.ParentBuilderImpl(); + } + } + public static class Child extends Parent { + double field3; + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static abstract class ChildBuilder> extends Parent.ParentBuilder { + @java.lang.SuppressWarnings("all") + @lombok.Generated + private double field3; + /** + * @return {@code this}. + */ + @java.lang.SuppressWarnings("all") + @lombok.Generated + public B field3(final double field3) { + this.field3 = field3; + return self(); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected abstract B self(); + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public abstract C build(); + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public java.lang.String toString() { + return "SuperBuilderWithArrayTypeParam.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + private static final class ChildBuilderImpl extends SuperBuilderWithArrayTypeParam.Child.ChildBuilder { + @java.lang.SuppressWarnings("all") + @lombok.Generated + private ChildBuilderImpl() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected SuperBuilderWithArrayTypeParam.Child.ChildBuilderImpl self() { + return this; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public SuperBuilderWithArrayTypeParam.Child build() { + return new SuperBuilderWithArrayTypeParam.Child(this); + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + protected Child(final SuperBuilderWithArrayTypeParam.Child.ChildBuilder b) { + super(b); + this.field3 = b.field3; + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static SuperBuilderWithArrayTypeParam.Child.ChildBuilder builder() { + return new SuperBuilderWithArrayTypeParam.Child.ChildBuilderImpl(); + } + } + public static void test() { + Child x = Child.builder().field3(0.0).field1(new Integer[] {2}).build(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/SuperBuilderWithArrayTypeParam.java b/test/transform/resource/after-ecj/SuperBuilderWithArrayTypeParam.java new file mode 100644 index 0000000000..578f62c785 --- /dev/null +++ b/test/transform/resource/after-ecj/SuperBuilderWithArrayTypeParam.java @@ -0,0 +1,87 @@ +//version 8: +public class SuperBuilderWithArrayTypeParam { + public static @lombok.experimental.SuperBuilder class Parent { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilder, B extends SuperBuilderWithArrayTypeParam.Parent.ParentBuilder> { + private @java.lang.SuppressWarnings("all") @lombok.Generated A field1; + public ParentBuilder() { + super(); + } + /** + * @return {@code this}. + */ + public @java.lang.SuppressWarnings("all") @lombok.Generated B field1(final A field1) { + this.field1 = field1; + return self(); + } + protected abstract @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { + return (("SuperBuilderWithArrayTypeParam.Parent.ParentBuilder(field1=" + this.field1) + ")"); + } + } + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ParentBuilderImpl extends SuperBuilderWithArrayTypeParam.Parent.ParentBuilder, SuperBuilderWithArrayTypeParam.Parent.ParentBuilderImpl> { + private ParentBuilderImpl() { + super(); + } + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithArrayTypeParam.Parent.ParentBuilderImpl self() { + return this; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithArrayTypeParam.Parent build() { + return new SuperBuilderWithArrayTypeParam.Parent(this); + } + } + A field1; + protected @java.lang.SuppressWarnings("all") @lombok.Generated Parent(final SuperBuilderWithArrayTypeParam.Parent.ParentBuilder b) { + super(); + this.field1 = b.field1; + } + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithArrayTypeParam.Parent.ParentBuilder builder() { + return new SuperBuilderWithArrayTypeParam.Parent.ParentBuilderImpl(); + } + } + public static @lombok.experimental.SuperBuilder class Child extends Parent { + public static abstract @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilder> extends Parent.ParentBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated double field3; + public ChildBuilder() { + super(); + } + /** + * @return {@code this}. + */ + public @java.lang.SuppressWarnings("all") @lombok.Generated B field3(final double field3) { + this.field3 = field3; + return self(); + } + protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated B self(); + public abstract @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated C build(); + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { + return (((("SuperBuilderWithArrayTypeParam.Child.ChildBuilder(super=" + super.toString()) + ", field3=") + this.field3) + ")"); + } + } + private static final @java.lang.SuppressWarnings("all") @lombok.Generated class ChildBuilderImpl extends SuperBuilderWithArrayTypeParam.Child.ChildBuilder { + private ChildBuilderImpl() { + super(); + } + protected @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithArrayTypeParam.Child.ChildBuilderImpl self() { + return this; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithArrayTypeParam.Child build() { + return new SuperBuilderWithArrayTypeParam.Child(this); + } + } + double field3; + protected @java.lang.SuppressWarnings("all") @lombok.Generated Child(final SuperBuilderWithArrayTypeParam.Child.ChildBuilder b) { + super(b); + this.field3 = b.field3; + } + public static @java.lang.SuppressWarnings("all") @lombok.Generated SuperBuilderWithArrayTypeParam.Child.ChildBuilder builder() { + return new SuperBuilderWithArrayTypeParam.Child.ChildBuilderImpl(); + } + } + public SuperBuilderWithArrayTypeParam() { + super(); + } + public static void test() { + Child x = Child.builder().field3(0.0).field1(new Integer[]{2}).build(); + } +} diff --git a/test/transform/resource/before/SuperBuilderWithArrayTypeParam.java b/test/transform/resource/before/SuperBuilderWithArrayTypeParam.java new file mode 100644 index 0000000000..9d85a8a528 --- /dev/null +++ b/test/transform/resource/before/SuperBuilderWithArrayTypeParam.java @@ -0,0 +1,16 @@ +//version 8: +public class SuperBuilderWithArrayTypeParam { + @lombok.experimental.SuperBuilder + public static class Parent { + A field1; + } + + @lombok.experimental.SuperBuilder + public static class Child extends Parent { + double field3; + } + + public static void test() { + Child x = Child.builder().field3(0.0).field1(new Integer[] {2}).build(); + } +} From e97746f3fac1dd298d3cb93148c34b943707257d Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Tue, 25 Jun 2024 00:07:23 +0200 Subject: [PATCH 062/118] fix javac type parameter generation for array type --- src/core/lombok/javac/handlers/HandleSuperBuilder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java index d64daf385a..34fe4bb334 100644 --- a/src/core/lombok/javac/handlers/HandleSuperBuilder.java +++ b/src/core/lombok/javac/handlers/HandleSuperBuilder.java @@ -36,6 +36,7 @@ import com.sun.tools.javac.code.Flags; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCAnnotation; +import com.sun.tools.javac.tree.JCTree.JCArrayTypeTree; import com.sun.tools.javac.tree.JCTree.JCAssign; import com.sun.tools.javac.tree.JCTree.JCBlock; import com.sun.tools.javac.tree.JCTree.JCClassDecl; @@ -63,9 +64,9 @@ import lombok.Singular; import lombok.ToString; import lombok.core.AST.Kind; -import lombok.core.configuration.CheckerFrameworkVersion; import lombok.core.AnnotationValues; import lombok.core.HandlerPriority; +import lombok.core.configuration.CheckerFrameworkVersion; import lombok.core.handlers.HandlerUtil; import lombok.core.handlers.HandlerUtil.FieldAccess; import lombok.core.handlers.InclusionExclusionUtils.Included; @@ -78,6 +79,7 @@ import lombok.javac.handlers.HandleBuilder.BuilderFieldData; import lombok.javac.handlers.HandleBuilder.BuilderJob; import lombok.javac.handlers.JavacHandlerUtil.CopyJavadoc; +import lombok.javac.handlers.JavacHandlerUtil.JCAnnotatedTypeReflect; import lombok.javac.handlers.JavacHandlerUtil.MemberExistsResult; import lombok.javac.handlers.JavacSingularsRecipes.ExpressionMaker; import lombok.javac.handlers.JavacSingularsRecipes.JavacSingularizer; @@ -1108,6 +1110,8 @@ private ListBuffer getTypeParamExpressions(List typeParamsForBuilderParameter.append(copySelect(maker, (JCFieldAccess) typeParam)); } else if (typeParam instanceof JCTypeApply) { typeParamsForBuilderParameter.append(cloneType(maker, (JCTypeApply)typeParam, source)); + } else if (typeParam instanceof JCArrayTypeTree) { + typeParamsForBuilderParameter.append(cloneType(maker, (JCArrayTypeTree)typeParam, source)); } else if (JCAnnotatedTypeReflect.is(typeParam)) { typeParamsForBuilderParameter.append(cloneType(maker, (JCExpression)typeParam, source)); } From ce2eda8fe934506abe6fb8651dac727492120ccb Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Tue, 25 Jun 2024 00:11:54 +0200 Subject: [PATCH 063/118] add fix to changelog --- doc/changelog.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index acfcb21645..52d1797617 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -5,6 +5,7 @@ Lombok Changelog * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). * IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3667). * IMPROBABLE BREAKING CHANGE: When `lombok.config` contains `lombok.onX.flagUsage = WARNING`, from now on warnings will actually be generated if onX is used.[Issue #2848](https://github.com/projectlombok/lombok/issues/2848) +* BUGFIX: When `@SuperBuilder` was used on a type with an generic array type, it would error `wrong number of type arguments`. [Issue #3694](https://github.com/projectlombok/lombok/issues/3694). ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. From 48ad2ba6c82cf1b4d852d174628c15ca5e634555 Mon Sep 17 00:00:00 2001 From: Steve Bosman Date: Tue, 25 Jun 2024 22:44:01 +0100 Subject: [PATCH 064/118] Minor correction to SneakyThrows javadoc --- src/core/lombok/SneakyThrows.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/lombok/SneakyThrows.java b/src/core/lombok/SneakyThrows.java index 2a8009a3b9..41b8f5169e 100644 --- a/src/core/lombok/SneakyThrows.java +++ b/src/core/lombok/SneakyThrows.java @@ -27,10 +27,10 @@ import java.lang.annotation.Target; /** - * @SneakyThrow will avoid javac's insistence that you either catch or throw onward any checked exceptions that + * @SneakyThrows will avoid javac's insistence that you either catch or throw onward any checked exceptions that * statements in your method body declare they generate. *

- * @SneakyThrow does not silently swallow, wrap into RuntimeException, or otherwise modify any exceptions of the listed + * @SneakyThrows does not silently swallow, wrap into RuntimeException, or otherwise modify any exceptions of the listed * checked exception types. The JVM does not check for the consistency of the checked exception system; javac does, * and this annotation lets you opt out of its mechanism. *

From c61a404b410bd482fcd6a48d303fb483932214d0 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 28 Jun 2024 01:39:59 +0200 Subject: [PATCH 065/118] [trivial] --- src/core/lombok/javac/handlers/HandleLog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lombok/javac/handlers/HandleLog.java b/src/core/lombok/javac/handlers/HandleLog.java index f5eefaa1b8..7c88e2b86a 100644 --- a/src/core/lombok/javac/handlers/HandleLog.java +++ b/src/core/lombok/javac/handlers/HandleLog.java @@ -131,7 +131,7 @@ private static boolean createField(LoggingFramework framework, JavacNode typeNod typeNode.toName(logFieldName), loggerType, factoryMethodCall), source); if (isRecord(typeNode) && Javac.getJavaCompilerVersion() < 16) { - // This is a workaround for https://bugs.openjdk.java.net/browse/JDK-8243057 + // This is a workaround for https://bugs.openjdk.java.net/browse/JDK-8243057 - note that the workaround is only for static fields in records, but our infra _requires_ `static` for logs in records (think about it). injectField(typeNode, fieldDecl); } else { From d90ec73e571ceb958c28e9925d0e9d8057fa5ba9 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 28 Jun 2024 02:24:22 +0200 Subject: [PATCH 066/118] [trivial] [style] --- src/core/lombok/javac/handlers/HandleSuperBuilder.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java index 34fe4bb334..c468fb77f7 100644 --- a/src/core/lombok/javac/handlers/HandleSuperBuilder.java +++ b/src/core/lombok/javac/handlers/HandleSuperBuilder.java @@ -1103,17 +1103,17 @@ private ListBuffer getTypeParamExpressions(List ListBuffer typeParamsForBuilderParameter = new ListBuffer(); for (JCTree typeParam : typeParams) { if (typeParam instanceof JCTypeParameter) { - typeParamsForBuilderParameter.append(maker.Ident(((JCTypeParameter)typeParam).getName())); + typeParamsForBuilderParameter.append(maker.Ident(((JCTypeParameter) typeParam).getName())); } else if (typeParam instanceof JCIdent) { - typeParamsForBuilderParameter.append(maker.Ident(((JCIdent)typeParam).getName())); + typeParamsForBuilderParameter.append(maker.Ident(((JCIdent) typeParam).getName())); } else if (typeParam instanceof JCFieldAccess) { typeParamsForBuilderParameter.append(copySelect(maker, (JCFieldAccess) typeParam)); } else if (typeParam instanceof JCTypeApply) { - typeParamsForBuilderParameter.append(cloneType(maker, (JCTypeApply)typeParam, source)); + typeParamsForBuilderParameter.append(cloneType(maker, (JCTypeApply) typeParam, source)); } else if (typeParam instanceof JCArrayTypeTree) { - typeParamsForBuilderParameter.append(cloneType(maker, (JCArrayTypeTree)typeParam, source)); + typeParamsForBuilderParameter.append(cloneType(maker, (JCArrayTypeTree) typeParam, source)); } else if (JCAnnotatedTypeReflect.is(typeParam)) { - typeParamsForBuilderParameter.append(cloneType(maker, (JCExpression)typeParam, source)); + typeParamsForBuilderParameter.append(cloneType(maker, (JCExpression) typeParam, source)); } } return typeParamsForBuilderParameter; From 3cd41e8fa00adafac52a401f50ef6628f4153258 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 28 Jun 2024 02:42:14 +0200 Subject: [PATCH 067/118] [trivial] some test cases were failing (due to the constructor-javadoc update); the bug was in the test cases, not the code. --- .../resource/after-delombok/BuilderNestedJavadoc.java | 5 +++++ test/transform/resource/after-ecj/BuilderNestedJavadoc.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/test/transform/resource/after-delombok/BuilderNestedJavadoc.java b/test/transform/resource/after-delombok/BuilderNestedJavadoc.java index eb45e87f0a..2fbd5a2c0e 100644 --- a/test/transform/resource/after-delombok/BuilderNestedJavadoc.java +++ b/test/transform/resource/after-delombok/BuilderNestedJavadoc.java @@ -4,6 +4,11 @@ public static class NestedClass { * Example javadoc */ String name; + /** + * Creates a new {@code NestedClass} instance. + * + * @param name Example javadoc + */ @java.lang.SuppressWarnings("all") @lombok.Generated NestedClass(final String name) { diff --git a/test/transform/resource/after-ecj/BuilderNestedJavadoc.java b/test/transform/resource/after-ecj/BuilderNestedJavadoc.java index a9d67fde54..7528bfab07 100644 --- a/test/transform/resource/after-ecj/BuilderNestedJavadoc.java +++ b/test/transform/resource/after-ecj/BuilderNestedJavadoc.java @@ -21,6 +21,11 @@ } } String name; + /** + * Creates a new {@code NestedClass} instance. + * + * @param name Example javadoc + */ @java.lang.SuppressWarnings("all") @lombok.Generated NestedClass(final String name) { super(); this.name = name; From fbbe7f07c817df5e8b7079b64a023749dcff2127 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 28 Jun 2024 02:45:03 +0200 Subject: [PATCH 068/118] [release] pre-release version bump --- doc/changelog.markdown | 3 ++- src/core/lombok/core/Version.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 52d1797617..941adee0bb 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -1,11 +1,12 @@ Lombok Changelog ---------------- -### v1.18.33 "Edgy Guinea Pig" +### v1.18.34 (June 28th, 2024) * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). * IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3667). * IMPROBABLE BREAKING CHANGE: When `lombok.config` contains `lombok.onX.flagUsage = WARNING`, from now on warnings will actually be generated if onX is used.[Issue #2848](https://github.com/projectlombok/lombok/issues/2848) * BUGFIX: When `@SuperBuilder` was used on a type with an generic array type, it would error `wrong number of type arguments`. [Issue #3694](https://github.com/projectlombok/lombok/issues/3694). +* FEATURE: Lombok generates javadoc for you for most of the methods it adds; with this release, javadoc is also added to generated constructors. [Issue #933](https://github.com/projectlombok/lombok/issues/933). ### v1.18.32 (March 20th, 2024) * PLATFORM: Initial JDK22 support added. diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java index 7caf52da9f..32aa78b90c 100644 --- a/src/core/lombok/core/Version.java +++ b/src/core/lombok/core/Version.java @@ -30,9 +30,9 @@ public class Version { // ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries). // Note: In 'X.Y.Z', if Z is odd, its a snapshot build built from the repository, so many different 0.10.3 versions can exist, for example. // Official builds always end in an even number. (Since 0.10.2). - private static final String VERSION = "1.18.33"; - private static final String RELEASE_NAME = "Edgy Guinea Pig"; -// private static final String RELEASE_NAME = "Envious Ferret"; + private static final String VERSION = "1.18.34"; +// private static final String RELEASE_NAME = "Edgy Guinea Pig"; + private static final String RELEASE_NAME = "Envious Ferret"; // Named version history: // Angry Butterfly From eb4722c59ffc9e43e73bcf12fb52b2f8ad92ffef Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 28 Jun 2024 02:49:06 +0200 Subject: [PATCH 069/118] [release] post-release version bump --- doc/changelog.markdown | 3 +++ src/core/lombok/core/Version.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 941adee0bb..fa8bb5cbf6 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -1,6 +1,9 @@ Lombok Changelog ---------------- +### v1.18.35 "Edgy Guinea Pig" +* We recently released v1.18.34; there is no edge release since then. + ### v1.18.34 (June 28th, 2024) * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). * IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3667). diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java index 32aa78b90c..0e18719b44 100644 --- a/src/core/lombok/core/Version.java +++ b/src/core/lombok/core/Version.java @@ -30,9 +30,9 @@ public class Version { // ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries). // Note: In 'X.Y.Z', if Z is odd, its a snapshot build built from the repository, so many different 0.10.3 versions can exist, for example. // Official builds always end in an even number. (Since 0.10.2). - private static final String VERSION = "1.18.34"; -// private static final String RELEASE_NAME = "Edgy Guinea Pig"; - private static final String RELEASE_NAME = "Envious Ferret"; + private static final String VERSION = "1.18.35"; + private static final String RELEASE_NAME = "Edgy Guinea Pig"; +// private static final String RELEASE_NAME = "Envious Ferret"; // Named version history: // Angry Butterfly From 674386e49b7688ebd925216ff41de744d46668d1 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Tue, 20 Aug 2024 22:01:55 +0200 Subject: [PATCH 070/118] [fixes #3706] Add null check for compilation unit --- .../eclipse/handlers/EclipseHandlerUtil.java | 1 + .../noerrors/builderJavadoc/BuilderJavadoc.java | 14 ++++++++++++++ .../resource/noerrors/builderJavadoc/Usage.java | 7 +++++++ .../lombok/eclipse/compile/NoErrorsTest.java | 17 +++++++++++++++-- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 test/eclipse/resource/noerrors/builderJavadoc/BuilderJavadoc.java create mode 100644 test/eclipse/resource/noerrors/builderJavadoc/Usage.java diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 31554a8691..83f8c941b0 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -2838,6 +2838,7 @@ public static void setDocComment(CompilationUnitDeclaration cud, TypeDeclaration if (doc == null) return; ICompilationUnit compilationUnit = cud.compilationResult.compilationUnit; + if (compilationUnit == null) return; if (compilationUnit.getClass().equals(COMPILATION_UNIT)) { try { compilationUnit = (ICompilationUnit) Permit.invoke(COMPILATION_UNIT_ORIGINAL_FROM_CLONE, compilationUnit); diff --git a/test/eclipse/resource/noerrors/builderJavadoc/BuilderJavadoc.java b/test/eclipse/resource/noerrors/builderJavadoc/BuilderJavadoc.java new file mode 100644 index 0000000000..745511a541 --- /dev/null +++ b/test/eclipse/resource/noerrors/builderJavadoc/BuilderJavadoc.java @@ -0,0 +1,14 @@ +package pkg; + +import lombok.Builder; + +@Builder +public class BuilderJavadoc { + /** + * Javadoc + * + * @param test ABC + * @return test + */ + private String test; +} \ No newline at end of file diff --git a/test/eclipse/resource/noerrors/builderJavadoc/Usage.java b/test/eclipse/resource/noerrors/builderJavadoc/Usage.java new file mode 100644 index 0000000000..edf3d53d0a --- /dev/null +++ b/test/eclipse/resource/noerrors/builderJavadoc/Usage.java @@ -0,0 +1,7 @@ +package pkg; + +public class Usage { + public void test() { + BuilderJavadoc.builder().test("test").build(); + } +} \ No newline at end of file diff --git a/test/eclipse/src/lombok/eclipse/compile/NoErrorsTest.java b/test/eclipse/src/lombok/eclipse/compile/NoErrorsTest.java index 6d81d3812d..d504967051 100644 --- a/test/eclipse/src/lombok/eclipse/compile/NoErrorsTest.java +++ b/test/eclipse/src/lombok/eclipse/compile/NoErrorsTest.java @@ -28,6 +28,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IProblemRequestor; +import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.WorkingCopyOwner; import org.eclipse.jdt.core.compiler.IProblem; import org.junit.Rule; @@ -47,6 +48,19 @@ public class NoErrorsTest { public void fieldNameConstantsInAnnotation() throws Exception { ICompilationUnit cu = setup.getPackageFragment().getCompilationUnit("Usage.java"); + List problems = collectProblems(cu); + assertTrue(problems.isEmpty()); + } + + @Test + public void builderJavadoc() throws Exception { + ICompilationUnit cu = setup.getPackageFragment().getCompilationUnit("Usage.java"); + + List problems = collectProblems(cu); + assertTrue(problems.isEmpty()); + } + + private List collectProblems(ICompilationUnit cu) throws JavaModelException { final List problems = new ArrayList(); final IProblemRequestor requestor = new IProblemRequestor() { @Override @@ -83,7 +97,6 @@ public IProblemRequestor getProblemRequestor(ICompilationUnit workingCopy) { workingCopy.discardWorkingCopy(); } - System.out.println(problems); - assertTrue(problems.isEmpty()); + return problems; } } From f19a7e865a0974a58e734976f1b85f3cd502cde1 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Tue, 20 Aug 2024 23:29:46 +0200 Subject: [PATCH 071/118] [fixes #3709] Improve extraction of javadoc comments --- .../eclipse/handlers/EclipseHandlerUtil.java | 13 ++-- .../resource/after-delombok/WeirdJavadoc.java | 72 +++++++++++++++++++ .../resource/after-ecj/WeirdJavadoc.java | 45 ++++++++++++ .../resource/before/WeirdJavadoc.java | 28 ++++++++ 4 files changed, 154 insertions(+), 4 deletions(-) create mode 100644 test/transform/resource/after-delombok/WeirdJavadoc.java create mode 100644 test/transform/resource/after-ecj/WeirdJavadoc.java create mode 100644 test/transform/resource/before/WeirdJavadoc.java diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 31554a8691..15d2ffff49 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -38,6 +38,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.eclipse.jdt.core.compiler.CharOperation; import org.eclipse.jdt.internal.compiler.ast.ASTNode; @@ -2797,6 +2799,9 @@ public static Annotation[][] getRecordFieldAnnotations(TypeDeclaration typeDecla return annotations; } + private static final Pattern JAVADOC_PATTERN = Pattern.compile("^\\s*\\/\\*\\*((?:\\S|\\s)*?)\\*\\/", Pattern.MULTILINE); + private static final Pattern LEADING_ASTERISKS_PATTERN = Pattern.compile("(?m)^\\s*\\* ?"); + public static String getDocComment(EclipseNode eclipseNode) { if (eclipseNode.getAst().getSource() == null) return null; @@ -2816,11 +2821,11 @@ public static String getDocComment(EclipseNode eclipseNode) { if (start != -1 && end != -1) { char[] rawContent = CharOperation.subarray(eclipseNode.getAst().getSource(), start, end); String rawContentString = new String(rawContent); - int startIndex = rawContentString.indexOf("/**"); - int endIndex = rawContentString.indexOf("*/"); - if (startIndex != -1 && endIndex != -1) { + Matcher javadocMatcher = JAVADOC_PATTERN.matcher(rawContentString); + if (javadocMatcher.find()) { + String javadoc = javadocMatcher.group(1); /* Remove all leading asterisks */ - return rawContentString.substring(startIndex + 3, endIndex).replaceAll("(?m)^\\s*\\* ?", "").trim(); + return LEADING_ASTERISKS_PATTERN.matcher(javadoc).replaceAll("").trim(); } } return null; diff --git a/test/transform/resource/after-delombok/WeirdJavadoc.java b/test/transform/resource/after-delombok/WeirdJavadoc.java new file mode 100644 index 0000000000..b20bfeb357 --- /dev/null +++ b/test/transform/resource/after-delombok/WeirdJavadoc.java @@ -0,0 +1,72 @@ +public class WeirdJavadoc { + // Comment + /* Weird comment /** */ + /* Weird comment /** */ + /** + * This is the real comment + * @param test Copy this + */ + WeirdJavadoc(String test) { + } + // Comment + /* Weird comment /** */ + /* Weird comment /** */ + /** + * This is the real comment + */ + private String test; + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static class WeirdJavadocBuilder { + @java.lang.SuppressWarnings("all") + @lombok.Generated + private String test; + @java.lang.SuppressWarnings("all") + @lombok.Generated + WeirdJavadocBuilder() { + } + /** + * @param test Copy this + * @return {@code this}. + */ + @java.lang.SuppressWarnings("all") + @lombok.Generated + public WeirdJavadoc.WeirdJavadocBuilder test(final String test) { + this.test = test; + return this; + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public WeirdJavadoc build() { + return new WeirdJavadoc(this.test); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @lombok.Generated + public java.lang.String toString() { + return "WeirdJavadoc.WeirdJavadocBuilder(test=" + this.test + ")"; + } + } + @java.lang.SuppressWarnings("all") + @lombok.Generated + public static WeirdJavadoc.WeirdJavadocBuilder builder() { + return new WeirdJavadoc.WeirdJavadocBuilder(); + } + /** + * This is the real comment + */ + @java.lang.SuppressWarnings("all") + @lombok.Generated + public String getTest() { + return this.test; + } + /** + * This is the real comment + * @param test Copy this + */ + @java.lang.SuppressWarnings("all") + @lombok.Generated + public void setTest(final String test) { + this.test = test; + } +} diff --git a/test/transform/resource/after-ecj/WeirdJavadoc.java b/test/transform/resource/after-ecj/WeirdJavadoc.java new file mode 100644 index 0000000000..ac059228d4 --- /dev/null +++ b/test/transform/resource/after-ecj/WeirdJavadoc.java @@ -0,0 +1,45 @@ +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; +public class WeirdJavadoc { + public static @java.lang.SuppressWarnings("all") @lombok.Generated class WeirdJavadocBuilder { + private @java.lang.SuppressWarnings("all") @lombok.Generated String test; + @java.lang.SuppressWarnings("all") @lombok.Generated WeirdJavadocBuilder() { + super(); + } + /** + * @param test Copy this + * @return {@code this}. + */ + public @java.lang.SuppressWarnings("all") @lombok.Generated WeirdJavadoc.WeirdJavadocBuilder test(final String test) { + this.test = test; + return this; + } + public @java.lang.SuppressWarnings("all") @lombok.Generated WeirdJavadoc build() { + return new WeirdJavadoc(this.test); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { + return (("WeirdJavadoc.WeirdJavadocBuilder(test=" + this.test) + ")"); + } + } + private @Getter @Setter String test; + @Builder WeirdJavadoc(String test) { + super(); + } + public static @java.lang.SuppressWarnings("all") @lombok.Generated WeirdJavadoc.WeirdJavadocBuilder builder() { + return new WeirdJavadoc.WeirdJavadocBuilder(); + } + /** + * This is the real comment + */ + public @java.lang.SuppressWarnings("all") @lombok.Generated String getTest() { + return this.test; + } + /** + * This is the real comment + * @param test Copy this + */ + public @java.lang.SuppressWarnings("all") @lombok.Generated void setTest(final String test) { + this.test = test; + } +} diff --git a/test/transform/resource/before/WeirdJavadoc.java b/test/transform/resource/before/WeirdJavadoc.java new file mode 100644 index 0000000000..43c8a0806c --- /dev/null +++ b/test/transform/resource/before/WeirdJavadoc.java @@ -0,0 +1,28 @@ +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +public class WeirdJavadoc { + // Comment + /* Weird comment /** */ + /** + * This is the real comment + * @param test Copy this + */ + /* Weird comment /** */ + @Builder + WeirdJavadoc(String test) { + + } + + // Comment + /* Weird comment /** */ + /** + * This is the real comment + * @param test Copy this + */ + /* Weird comment /** */ + @Getter + @Setter + private String test; +} From b960d0d02a7c3ec9afae493011730345dd4ba6b0 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Tue, 20 Aug 2024 23:32:45 +0200 Subject: [PATCH 072/118] Ignore javadoc copy errors for constructors Lombok should not crash if it cannot copy or generate javadoc for generated code. We have already added this try...catch to all other javadoc copy methods. --- .../eclipse/handlers/HandleConstructor.java | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java index 81b4cf1194..1941569670 100755 --- a/src/core/lombok/eclipse/handlers/HandleConstructor.java +++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java @@ -588,25 +588,27 @@ public MethodDeclaration createStaticConstructor(AccessLevel level, String name, } private void generateConstructorJavadoc(EclipseNode typeNode, EclipseNode constructorNode, Collection fields) { - if (fields.isEmpty()) return; - - String constructorJavadoc = getConstructorJavadocHeader(typeNode.getName()); - boolean fieldDescriptionAdded = false; - for (EclipseNode fieldNode : fields) { - String paramName = String.valueOf(removePrefixFromField(fieldNode)); - String fieldJavadoc = getDocComment(fieldNode); - String paramJavadoc = getConstructorParameterJavadoc(paramName, fieldJavadoc); - - if (paramJavadoc == null) { - paramJavadoc = "@param " + paramName; - } else { - fieldDescriptionAdded = true; + try { + if (fields.isEmpty()) return; + + String constructorJavadoc = getConstructorJavadocHeader(typeNode.getName()); + boolean fieldDescriptionAdded = false; + for (EclipseNode fieldNode : fields) { + String paramName = String.valueOf(removePrefixFromField(fieldNode)); + String fieldJavadoc = getDocComment(fieldNode); + String paramJavadoc = getConstructorParameterJavadoc(paramName, fieldJavadoc); + + if (paramJavadoc == null) { + paramJavadoc = "@param " + paramName; + } else { + fieldDescriptionAdded = true; + } + + constructorJavadoc = addJavadocLine(constructorJavadoc, paramJavadoc); } - - constructorJavadoc = addJavadocLine(constructorJavadoc, paramJavadoc); - } - if (fieldDescriptionAdded) { - setDocComment(typeNode, constructorNode, constructorJavadoc); - } + if (fieldDescriptionAdded) { + setDocComment(typeNode, constructorNode, constructorJavadoc); + } + } catch (Exception ignore) {} } } From 5a375aee5a539a47828068e8c9ea254d5906cdc0 Mon Sep 17 00:00:00 2001 From: Oliver Erhart <8238759+thunderhook@users.noreply.github.com> Date: Fri, 23 Aug 2024 21:05:40 +0200 Subject: [PATCH 073/118] [doc] remove unnecessary import in FieldNameConstants example --- .../experimental/FieldNameConstantsExample_pre.jpage | 1 - 1 file changed, 1 deletion(-) diff --git a/website/usageExamples/experimental/FieldNameConstantsExample_pre.jpage b/website/usageExamples/experimental/FieldNameConstantsExample_pre.jpage index b462867b9d..05d086b23d 100644 --- a/website/usageExamples/experimental/FieldNameConstantsExample_pre.jpage +++ b/website/usageExamples/experimental/FieldNameConstantsExample_pre.jpage @@ -1,5 +1,4 @@ import lombok.experimental.FieldNameConstants; -import lombok.AccessLevel; @FieldNameConstants public class FieldNameConstantsExample { From 1fd5749e47943ede21b3304d4dc4d16cae8acb28 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Tue, 10 Sep 2024 07:13:37 +0200 Subject: [PATCH 074/118] Exclude the classloader for jasperreports-maven-plugin due to a classloader conflict with ECJ --- doc/changelog.markdown | 2 ++ src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java | 1 + 2 files changed, 3 insertions(+) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index fa8bb5cbf6..71c0a1270b 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -3,6 +3,8 @@ Lombok Changelog ### v1.18.35 "Edgy Guinea Pig" * We recently released v1.18.34; there is no edge release since then. +* BUGFIX: Eclipse projects using the `com.pro-crafting.tools:jasperreports-maven-plugin` will now compile. + ### v1.18.34 (June 28th, 2024) * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index e3a52ba125..e4954f9b72 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -63,6 +63,7 @@ private static void registerPatchScripts(Instrumentation instrumentation, boolea if (loader.getClass().getName().startsWith("org.sonar.classloader.")) return false; // Relevant to bug #2351 if (loader.toString().contains("com.alexnederlof:jasperreports-plugin")) return false; //Relevant to bug #1036 if (loader.toString().contains("com.pro-crafting.tools:jasperreports-plugin")) return false; //Relevant to bug #1036 + if (loader.toString().contains("com.pro-crafting.tools:jasperreports-maven-plugin")) return false; //Relevant to bug #1036 } if (!(loader instanceof URLClassLoader)) return true; ClassLoader parent = loader.getParent(); From cc3b8086d49f8e0e46383a73a0fd4e15bfa9fd99 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Thu, 19 Sep 2024 17:09:28 +0200 Subject: [PATCH 075/118] [fixes #3728] Remove signature files eclipse plugin jars --- .../DownloadEclipseDependencies.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java index 0e8d589504..0aa9934dd4 100644 --- a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java +++ b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java @@ -36,6 +36,9 @@ import java.util.Arrays; import java.util.List; import java.util.Set; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import java.util.zip.ZipOutputStream; /** * Download eclipse bundles. @@ -87,12 +90,22 @@ private static void downloadFile(String filename, String repositoryUrl, String t return; } System.out.print("Downloading '" + filename + "'... "); - InputStream in = null; - OutputStream out = null; + ZipInputStream in = null; + ZipOutputStream out = null; try { - in = getStreamForUrl(repositoryUrl + filename); - out = new FileOutputStream(targetFile); - copy(in, out); + in = new ZipInputStream(getStreamForUrl(repositoryUrl + filename)); + out = new ZipOutputStream(new FileOutputStream(targetFile)); + + ZipEntry zipEntry; + while ((zipEntry = in.getNextEntry()) != null) { + String name = zipEntry.getName(); + + // Remove signature files + if (name.matches("META-INF/.*\\.(SF|RSA)")) continue; + + out.putNextEntry(new ZipEntry(name)); + copy(in, out); + } System.out.println("[done]"); } catch (IOException e) { System.out.println("[error]"); From 6fba0cb2da05ea2a5be666154892aa557ec0c467 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Thu, 19 Sep 2024 17:09:45 +0200 Subject: [PATCH 076/118] Add eclipse 2024-09 test targets --- .github/workflows/ant.yml | 2 ++ buildScripts/ivy.xml | 18 ++++++++++++++++-- buildScripts/setup.ant.xml | 4 ++++ buildScripts/tests.ant.xml | 9 +++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 4a53d4278f..a31cb3e3e4 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -108,6 +108,7 @@ jobs: - eclipse-202312 - eclipse-202403 - eclipse-202406 + - eclipse-202409 - eclipse-I-build - eclipse-oxygen-full - eclipse-2022-03-full @@ -115,6 +116,7 @@ jobs: - eclipse-2023-12-full - eclipse-2024-03-full - eclipse-2024-06-full + - eclipse-2024-09-full - eclipse-I-build-full - ecj11 - ecj14 diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index 38b4878563..de31decdfb 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -35,6 +35,7 @@ + @@ -148,7 +149,7 @@ - + @@ -161,7 +162,7 @@ - + @@ -175,6 +176,19 @@ + + + + + + + + + + + + + diff --git a/buildScripts/setup.ant.xml b/buildScripts/setup.ant.xml index 91d3d478bf..abd8d386fa 100644 --- a/buildScripts/setup.ant.xml +++ b/buildScripts/setup.ant.xml @@ -180,6 +180,10 @@ This buildfile is part of projectlombok.org. It sets up the build itself. + + + + diff --git a/buildScripts/tests.ant.xml b/buildScripts/tests.ant.xml index 6044551823..766d2b5fd3 100644 --- a/buildScripts/tests.ant.xml +++ b/buildScripts/tests.ant.xml @@ -233,6 +233,11 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn + + + + + @@ -313,6 +318,10 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn + + + + From ddf4ebce52d66432e6ed8fe88b8a04317effde10 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Thu, 19 Sep 2024 17:32:54 +0200 Subject: [PATCH 077/118] Remove deprecated inlineJsrBytecode ECJ ignored this setting for Java 1.5+ --- test/core/src/lombok/RunTestsViaEcj.java | 1 - 1 file changed, 1 deletion(-) diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java index 352ba4e6c9..5f13909548 100644 --- a/test/core/src/lombok/RunTestsViaEcj.java +++ b/test/core/src/lombok/RunTestsViaEcj.java @@ -79,7 +79,6 @@ protected CompilerOptions ecjCompilerOptions(TestParameters parameters) { options.targetJDK = ecjCompilerVersionConstant; options.docCommentSupport = false; options.parseLiteralExpressionsAsConstants = true; - options.inlineJsrBytecode = true; options.reportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable = false; options.reportUnusedDeclaredThrownExceptionIncludeDocCommentReference = false; options.reportUnusedDeclaredThrownExceptionWhenOverriding = false; From 09ac596dd8d01b3fc6e0bc031d1a711d30480333 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Thu, 19 Sep 2024 17:41:30 +0200 Subject: [PATCH 078/118] Set ecj target version --- test/core/src/lombok/RunTestsViaEcj.java | 1 + 1 file changed, 1 insertion(+) diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java index 5f13909548..3a0f02e26e 100644 --- a/test/core/src/lombok/RunTestsViaEcj.java +++ b/test/core/src/lombok/RunTestsViaEcj.java @@ -95,6 +95,7 @@ protected CompilerOptions ecjCompilerOptions(TestParameters parameters) { warnings.put(CompilerOptions.OPTION_ReportNonStaticAccessToStatic, "warning"); warnings.put("org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures", "ignore"); warnings.put(CompilerOptions.OPTION_Source, (ecjCompilerVersion < 9 ? "1." : "") + ecjCompilerVersion); + warnings.put(CompilerOptions.OPTION_TargetPlatform, (ecjCompilerVersion < 9 ? "1." : "") + ecjCompilerVersion); warnings.put("org.eclipse.jdt.core.compiler.codegen.useStringConcatFactory", "disabled"); options.set(warnings); return options; From 6522b8230d938f2363bdb19810f44ff3a2746f34 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Fri, 20 Sep 2024 00:25:38 +0200 Subject: [PATCH 079/118] [fixes #3748] Patch SourceTypeConverter to avoid parsing empty strings --- .../lombok/eclipse/agent/EclipsePatcher.java | 8 ++++++++ .../lombok/launch/PatchFixesHider.java | 8 ++++++++ .../synchronizedUsage/ClassWithSynchronized.java | 9 +++++++++ .../noerrors/synchronizedUsage/Usage.java | 10 ++++++++++ .../src/lombok/eclipse/compile/NoErrorsTest.java | 15 ++++++++++++--- 5 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 test/eclipse/resource/noerrors/synchronizedUsage/ClassWithSynchronized.java create mode 100644 test/eclipse/resource/noerrors/synchronizedUsage/Usage.java diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index e4954f9b72..18d6594af0 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -875,6 +875,14 @@ private static void patchFixSourceTypeConverter(ScriptManager sm) { .target(new MethodTarget(SOURCE_TYPE_CONVERTER_SIG, "convertAnnotations", ANNOTATION_SIG + "[]", I_ANNOTATABLE_SIG)) .wrapMethod(new Hook("lombok.launch.PatchFixesHider$PatchFixes", "convertAnnotations", ANNOTATION_SIG + "[]", ANNOTATION_SIG + "[]", I_ANNOTATABLE_SIG)) .request(StackRequest.PARAM1, StackRequest.RETURN_VALUE).build()); + + sm.addScriptIfWitness(OSGI_TYPES, ScriptBuilder.exitEarly() + .target(new MethodTarget(SOURCE_TYPE_CONVERTER_SIG, "parseMemberValue", "org.eclipse.jdt.internal.compiler.ast.Expression", "char[]")) + .decisionMethod(new Hook("lombok.launch.PatchFixesHider$PatchFixes", "isEmpty", "boolean", "char[]")) + .valueMethod(new Hook("lombok.launch.PatchFixesHider$PatchFixes", "returnNullExpression", "org.eclipse.jdt.internal.compiler.ast.Expression", "java.lang.Object")) + .request(StackRequest.PARAM1) + .transplant() + .build()); } private static void patchEclipseDebugPatches(ScriptManager sm) { diff --git a/src/eclipseAgent/lombok/launch/PatchFixesHider.java b/src/eclipseAgent/lombok/launch/PatchFixesHider.java index 7ba663ccf4..1d29241001 100755 --- a/src/eclipseAgent/lombok/launch/PatchFixesHider.java +++ b/src/eclipseAgent/lombok/launch/PatchFixesHider.java @@ -892,6 +892,14 @@ public static Annotation[] convertAnnotations(Annotation[] out, IAnnotatable ann return replace; } + public static boolean isEmpty(char[] array) { + return array.length == 0; + } + + public static Expression returnNullExpression(Object string) { + return null; + } + public static String getRealNodeSource(String original, org.eclipse.jdt.internal.compiler.ast.ASTNode node) { if (!isGenerated(node)) return original; diff --git a/test/eclipse/resource/noerrors/synchronizedUsage/ClassWithSynchronized.java b/test/eclipse/resource/noerrors/synchronizedUsage/ClassWithSynchronized.java new file mode 100644 index 0000000000..736ffafaf4 --- /dev/null +++ b/test/eclipse/resource/noerrors/synchronizedUsage/ClassWithSynchronized.java @@ -0,0 +1,9 @@ +package pkg; + +import lombok.Synchronized; + +public class ClassWithSynchronized { + @Synchronized + public void test() { + } +} \ No newline at end of file diff --git a/test/eclipse/resource/noerrors/synchronizedUsage/Usage.java b/test/eclipse/resource/noerrors/synchronizedUsage/Usage.java new file mode 100644 index 0000000000..f871e5ee03 --- /dev/null +++ b/test/eclipse/resource/noerrors/synchronizedUsage/Usage.java @@ -0,0 +1,10 @@ +package pkg; + +public class Usage { + private ClassWithSynchronized test; + + // Prevent "The value of the field Usage.test is not used" + public void test() { + test.test(); + } +} \ No newline at end of file diff --git a/test/eclipse/src/lombok/eclipse/compile/NoErrorsTest.java b/test/eclipse/src/lombok/eclipse/compile/NoErrorsTest.java index d504967051..a140b6979a 100644 --- a/test/eclipse/src/lombok/eclipse/compile/NoErrorsTest.java +++ b/test/eclipse/src/lombok/eclipse/compile/NoErrorsTest.java @@ -21,9 +21,10 @@ */ package lombok.eclipse.compile; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.eclipse.jdt.core.ICompilationUnit; @@ -49,7 +50,7 @@ public void fieldNameConstantsInAnnotation() throws Exception { ICompilationUnit cu = setup.getPackageFragment().getCompilationUnit("Usage.java"); List problems = collectProblems(cu); - assertTrue(problems.isEmpty()); + assertEquals(Collections.emptyList(), problems); } @Test @@ -57,7 +58,15 @@ public void builderJavadoc() throws Exception { ICompilationUnit cu = setup.getPackageFragment().getCompilationUnit("Usage.java"); List problems = collectProblems(cu); - assertTrue(problems.isEmpty()); + assertEquals(Collections.emptyList(), problems); + } + + @Test + public void synchronizedUsage() throws Exception { + ICompilationUnit cu = setup.getPackageFragment().getCompilationUnit("Usage.java"); + + List problems = collectProblems(cu); + assertEquals(Collections.emptyList(), problems); } private List collectProblems(ICompilationUnit cu) throws JavaModelException { From 7526768ddaa7280eaad4232da0945d4cfe44ae99 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 20 Sep 2024 02:17:30 +0200 Subject: [PATCH 080/118] [deps] Update dep to patcher 0.52 --- .../org.projectlombok-lombok.patcher-0.52.xml | 14 ++++++++++++++ buildScripts/ivy.xml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.52.xml diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.52.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.52.xml new file mode 100644 index 0000000000..61905395cb --- /dev/null +++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.52.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index 38b4878563..766fe92a79 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -40,7 +40,7 @@ - + From b8c0427b3d1a5dc688f496ba64b755d5c12c4581 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Mon, 16 Sep 2024 20:42:09 +0200 Subject: [PATCH 081/118] [#3722] Support new JDK23 CommentStyle --- .github/workflows/ant.yml | 4 ++-- .../lombok/delombok/DocCommentIntegrator.java | 2 +- src/utils/lombok/javac/Javac.java | 18 ++++++++++++++++-- test/pretty/resource/after/Javadoc.java | 17 +++++++++++++++++ test/pretty/resource/before/Javadoc.java | 19 +++++++++++++++++++ 5 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 test/pretty/resource/after/Javadoc.java create mode 100644 test/pretty/resource/before/Javadoc.java diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 4a53d4278f..8d743478a3 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -41,10 +41,10 @@ jobs: runs-on: ubuntu-latest needs: build env: - EA_JDK: 22 + EA_JDK: 23 strategy: matrix: - jdk: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22] + jdk: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23] goal: [javacCurrent] include: - jdk: 11 diff --git a/src/delombok/lombok/delombok/DocCommentIntegrator.java b/src/delombok/lombok/delombok/DocCommentIntegrator.java index f74ea249c5..3464964ebe 100644 --- a/src/delombok/lombok/delombok/DocCommentIntegrator.java +++ b/src/delombok/lombok/delombok/DocCommentIntegrator.java @@ -137,7 +137,7 @@ static void attach(final JCTree node, String docCommentContent, final int pos, O } @Override public CommentStyle getStyle() { - return CommentStyle.JAVADOC; + return (CommentStyle) Javac.getCommentStyle(); } @Override public boolean isDeprecated() { diff --git a/src/utils/lombok/javac/Javac.java b/src/utils/lombok/javac/Javac.java index 1c9bed09e4..f783468716 100644 --- a/src/utils/lombok/javac/Javac.java +++ b/src/utils/lombok/javac/Javac.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2019 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -43,6 +43,7 @@ import com.sun.tools.javac.code.Type; import com.sun.tools.javac.main.JavaCompiler; import com.sun.tools.javac.parser.Tokens.Comment; +import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle; import com.sun.tools.javac.tree.DocCommentTable; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCAnnotation; @@ -330,6 +331,10 @@ public static void setDocComment(JCCompilationUnit cu, JCTree node, String javad } } + public static Object getCommentStyle() { + return JavadocOps_8.COMMENT_STYLE; + } + private static class JavadocOps_8 { static String getJavadoc(Object dc, JCTree node) { DocCommentTable dct = (DocCommentTable) dc; @@ -350,6 +355,15 @@ static void setJavadoc(Object dc, JCTree node, String javadoc) { dct.putComment(node, newCmt); } + private static final CommentStyle COMMENT_STYLE = getCommentStyle(); + private static CommentStyle getCommentStyle() { + try { + return CommentStyle.valueOf("JAVADOC"); + } catch (IllegalArgumentException e) { + return CommentStyle.valueOf("JAVADOC_BLOCK"); + } + } + private static Comment createJavadocComment(final String text, final JCTree field) { return new Comment() { @Override public String getText() { @@ -361,7 +375,7 @@ private static Comment createJavadocComment(final String text, final JCTree fiel } @Override public CommentStyle getStyle() { - return CommentStyle.JAVADOC; + return COMMENT_STYLE; } @Override public boolean isDeprecated() { diff --git a/test/pretty/resource/after/Javadoc.java b/test/pretty/resource/after/Javadoc.java new file mode 100644 index 0000000000..038d0dc4fb --- /dev/null +++ b/test/pretty/resource/after/Javadoc.java @@ -0,0 +1,17 @@ +/** + * Block comment + */ +class BlockComment { + /** + * Method + */ + private void test() { + } +} +/// Markdown +/// Comment +class MarkdownComment { + /// Method + private void test() { + } +} \ No newline at end of file diff --git a/test/pretty/resource/before/Javadoc.java b/test/pretty/resource/before/Javadoc.java new file mode 100644 index 0000000000..b0fce82496 --- /dev/null +++ b/test/pretty/resource/before/Javadoc.java @@ -0,0 +1,19 @@ +/** + * Block comment + */ +class BlockComment { + + /** + * Method + */ + private void test() {} +} + +/// Markdown +/// Comment +class MarkdownComment { + + /// Method + private void test() {} + +} \ No newline at end of file From 7fad5661b084ded7b7d590108dade5f7fe8efc93 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Thu, 26 Sep 2024 18:53:25 +0200 Subject: [PATCH 082/118] Remove ordering licenses from our website --- .github/FUNDING.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 9109c65573..4e66ca026a 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,3 @@ -custom: https://projectlombok.org/order-license-info patreon: lombok tidelift: maven/org.projectlombok:lombok github: projectlombok From 430d535fa9071647819f226e4ecfa4fa13fe2f7f Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Fri, 27 Sep 2024 18:01:51 +0200 Subject: [PATCH 083/118] Add Fern as a sponsor --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fea9ecc9e2..87b4caeafd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ # Project Lombok -Project Lombok is a java library that automatically plugs into your editor and build tools, spicing up your java. +Sponsored Content +> [![Sponsor logo Fern](https://projectlombok.org/files/logos/fern.png)](https://form.typeform.com/to/xlwIBLD5) +> Offer API docs that look as good as Stripe's using our sponsor [Fern](https://form.typeform.com/to/bShdJw7z). Request a [preview of your docs](https://form.typeform.com/to/bShdJw7z) on Fern. + +
+ +**Project Lombok** is a java library that automatically plugs into your editor and build tools, spicing up your java. Never write another getter or equals method again, with one annotation your class has a fully featured builder, automate your logging variables, and much more. See [LICENSE] for the Project Lombok license. From d0411e94f44ad7684924f306f41b5bb86ae87813 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 28 Sep 2024 00:44:06 +0200 Subject: [PATCH 084/118] Remove website analytics --- website/templates/_scaffold.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html index e9924c4ee0..34a5b47dbc 100644 --- a/website/templates/_scaffold.html +++ b/website/templates/_scaffold.html @@ -37,7 +37,6 @@

${title}

- @@ -63,14 +62,6 @@

${title}

-
From a419d7aa6f9f0a399b376e00fdef7fe6fa92671f Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 28 Sep 2024 00:54:29 +0200 Subject: [PATCH 085/118] Website supporters bar stable height --- website/resources/css/custom.css | 7 +++++++ website/resources/js/supporters.js | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index 0ff84b785c..f9246bbcc4 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -503,4 +503,11 @@ body { a:not([role=button]):focus { outline-offset: 2px; +} + +.sbCnt { + height: 90px; + display: flex; + justify-content: space-between; + align-items: center; } \ No newline at end of file diff --git a/website/resources/js/supporters.js b/website/resources/js/supporters.js index 6d7709050b..3df4b83c31 100644 --- a/website/resources/js/supporters.js +++ b/website/resources/js/supporters.js @@ -129,7 +129,7 @@ updateSupporterBar(); } - var supPerBar = 4; + var supPerBar = 3; function updateSupporterBar() { var s = $(".supporterBar"); if (s.length === 0) return; From cb8de127b0f59cc79c67ec8f574ac391885c9de1 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 28 Sep 2024 01:51:27 +0200 Subject: [PATCH 086/118] Fix sponsor logo url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 87b4caeafd..88fc6e534f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Project Lombok Sponsored Content -> [![Sponsor logo Fern](https://projectlombok.org/files/logos/fern.png)](https://form.typeform.com/to/xlwIBLD5) +> [![Sponsor logo Fern](https://projectlombok.org/files/logos/fern.png)](https://form.typeform.com/to/bShdJw7z) > Offer API docs that look as good as Stripe's using our sponsor [Fern](https://form.typeform.com/to/bShdJw7z). Request a [preview of your docs](https://form.typeform.com/to/bShdJw7z) on Fern.
From 72519b068c298525fe972ea7ccae71c804fb6fa4 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 28 Sep 2024 02:21:14 +0200 Subject: [PATCH 087/118] Add sponsor to website --- website/resources/css/custom.css | 18 +++++++++++++++++- website/templates/index.html | 8 ++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index f9246bbcc4..b7bc53a99d 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -510,4 +510,20 @@ a:not([role=button]):focus { display: flex; justify-content: space-between; align-items: center; -} \ No newline at end of file +} + +.sponsored { + margin-top: 1em; +} + +.sponsored::before { + content: "Sponsored Content"; + color: #AAAAAA; + font-size: 0.8em; + font-style: italic; + margin-bottom: 0.4em; +} + +.sponsored blockquote { + padding: 0 1em; +} diff --git a/website/templates/index.html b/website/templates/index.html index 8553170136..ccbc0b9af6 100644 --- a/website/templates/index.html +++ b/website/templates/index.html @@ -31,5 +31,13 @@
+
From fc0028707150cea1c720935764022e445f3e50f6 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 28 Sep 2024 02:29:06 +0200 Subject: [PATCH 088/118] Update sponsor link color --- website/resources/css/custom.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index b7bc53a99d..108879c98f 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -527,3 +527,7 @@ a:not([role=button]):focus { .sponsored blockquote { padding: 0 1em; } + +.sponsored a { + color: #1DA32B; +} From eb29efe77bb912a9c860ef240ba218224e6f85a0 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 28 Sep 2024 03:07:33 +0200 Subject: [PATCH 089/118] Website layout --- website/resources/css/custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index 108879c98f..a462268f71 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -513,7 +513,7 @@ a:not([role=button]):focus { } .sponsored { - margin-top: 1em; + margin: 1em 0; } .sponsored::before { From 7e188e53edde519d0de17f5bde6f68399dc2070f Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 28 Sep 2024 03:13:50 +0200 Subject: [PATCH 090/118] More website tweaks --- website/resources/css/custom.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index a462268f71..f44c286bf3 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -506,9 +506,9 @@ a:not([role=button]):focus { } .sbCnt { - height: 90px; + min-height: 90px; display: flex; - justify-content: space-between; + justify-content: space-around; align-items: center; } From 0449ed51d93bb7ec0943f325ab6293286b78a288 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 28 Sep 2024 23:47:39 +0200 Subject: [PATCH 091/118] Website teaks --- website/resources/css/custom.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index f44c286bf3..6c57c0837c 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -506,7 +506,7 @@ a:not([role=button]):focus { } .sbCnt { - min-height: 90px; + min-height: 120px; display: flex; justify-content: space-around; align-items: center; @@ -530,4 +530,6 @@ a:not([role=button]):focus { .sponsored a { color: #1DA32B; + text-decoration: underline; + text-underline-offset: 0.15em; } From f6db26f25fbdcf38df8dfbbd0fdcb748a403b084 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sat, 28 Sep 2024 23:58:47 +0200 Subject: [PATCH 092/118] Website mobile tweaks --- website/resources/css/custom.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index 6c57c0837c..b3ec7dbbc9 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -512,6 +512,10 @@ a:not([role=button]):focus { align-items: center; } +.sbCnt img { + object-fit: contain; +} + .sponsored { margin: 1em 0; } From 268b61457ecef18b75078f27d2404972af72f8e7 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Sun, 29 Sep 2024 01:17:14 +0200 Subject: [PATCH 093/118] WCAG AA improvements --- website/resources/css/custom.css | 45 +++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index b3ec7dbbc9..bd7ccbee1d 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -1,3 +1,17 @@ +.main-section a, +.footer a { + text-decoration: underline; + text-underline-offset: 0.15em; + text-decoration-color: #d9230f20; +} + +.main-section a:hover, +.main-section a:focus, +.footer a:hover, +.footer a:focus { + text-decoration-color: #91170A; +} + .importantNotification { background-color: #FFEBCD; border-radius: 20px; @@ -5,7 +19,7 @@ margin: 10px; } -.tidelift-link-inline { +.main-section .tidelift-link-inline { border-radius: 18px; background-color: #626980; background-color: #626980; @@ -15,9 +29,10 @@ background-size: 12px; padding: 2px 8px 2px 26px; color: white; + text-decoration-color: #ffffff20; } -.tidelift-link { +.main-section .tidelift-link { border-bottom-left-radius: 18px; border-top-left-radius: 18px; background-color: #626980; @@ -32,13 +47,15 @@ background-position: 10px; background-size: 12px; padding: 6px 12px 6px 28px; + text-decoration-color: #ffffff20; } -.tidelift-link:focus, -.tidelift-link-inline:focus, -.tidelift-link:hover, -.tidelift-link-inline:hover { +.main-section .tidelift-link:focus, +.main-section .tidelift-link-inline:focus, +.main-section .tidelift-link:hover, +.main-section .tidelift-link-inline:hover { color: white; + text-decoration-color: white; } #tideliftlink { @@ -70,6 +87,10 @@ pre { text-align: center; } +.main-section a.tideliftb { + text-decoration: none; +} + .tideliftb1 { background-color: white; float: left; @@ -532,8 +553,12 @@ a:not([role=button]):focus { padding: 0 1em; } -.sponsored a { - color: #1DA32B; - text-decoration: underline; - text-underline-offset: 0.15em; +.main-section .sponsored a { + color: #008800; + text-decoration-color: currentcolor; +} + +.main-section .sponsored a:hover { + color: #008800; + text-decoration-color: currentcolor; } From 04c9755b39617a0e222a8e88ef44677b34044ab2 Mon Sep 17 00:00:00 2001 From: Aleksandar Kanchev <136312841+kanchev1@users.noreply.github.com> Date: Wed, 11 Sep 2024 06:45:09 +0200 Subject: [PATCH 094/118] [fixes #3116] Add multi round support for mapstruct --- AUTHORS | 1 + .../lombok/mapstruct/NotifierHider.java | 44 ++++++++++--------- .../lombok/launch/AnnotationProcessor.java | 5 --- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/AUTHORS b/AUTHORS index b291072f7c..b39b8450b9 100755 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,7 @@ Lombok contributors in alphabetical order: Adam Juraszek +Aleksandar Kanchev <136312841+kanchev1@users.noreply.github.com> Aleksandr Zhelezniak Amine Touzani Andre Brait diff --git a/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java b/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java index a8e92b4b9c..bed6c7143a 100644 --- a/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java +++ b/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java @@ -1,35 +1,37 @@ package lombok.mapstruct; -import java.lang.reflect.Field; +import org.mapstruct.ap.spi.AstModifyingAnnotationProcessor; +import javax.lang.model.element.AnnotationMirror; import javax.lang.model.type.TypeMirror; +import java.util.List; -import org.mapstruct.ap.spi.AstModifyingAnnotationProcessor; - +/** + * Report to MapStruct that a type is completed when there aren't any Lombok annotations left on it. Lombok annotations + * are removed whenever a class is processed. This way, annotations which require multiple rounds to process are also + * correctly handled, and MapStruct processing will be delayed until Lombok completely finishes processing required types. + */ class NotifierHider { public static class AstModificationNotifier implements AstModifyingAnnotationProcessor { - private static Field lombokInvoked; - - @Override public boolean isTypeComplete(TypeMirror type) { - if (System.getProperty("lombok.disable") != null) return true; - return isLombokInvoked(); - } - - private static boolean isLombokInvoked() { - if (lombokInvoked != null) { - try { - return lombokInvoked.getBoolean(null); - } catch (Exception e) {} + + @Override + public boolean isTypeComplete(final TypeMirror typeMirror) { + final List annotationMirrors = typeMirror.getAnnotationMirrors(); + if (annotationMirrors == null || annotationMirrors.isEmpty()) { return true; } - - try { - Class data = Class.forName("lombok.launch.AnnotationProcessorHider$AstModificationNotifierData"); - lombokInvoked = data.getField("lombokInvoked"); - return lombokInvoked.getBoolean(null); - } catch (Exception e) {} + + for (final AnnotationMirror annotationMirror : annotationMirrors) { + final String annotationName = String.valueOf(annotationMirror); + // check for ClaimingProcessor's SupportedAnnotationTypes + if (annotationName.startsWith("@lombok.")) { + return false; + } + } + return true; + } } } diff --git a/src/launch/lombok/launch/AnnotationProcessor.java b/src/launch/lombok/launch/AnnotationProcessor.java index 456a8cefca..28a28d723a 100644 --- a/src/launch/lombok/launch/AnnotationProcessor.java +++ b/src/launch/lombok/launch/AnnotationProcessor.java @@ -39,10 +39,6 @@ class AnnotationProcessorHider { - public static class AstModificationNotifierData { - public volatile static boolean lombokInvoked = false; - } - public static class AnnotationProcessor extends AbstractProcessor { private final AbstractProcessor instance = createWrappedInstance(); @@ -60,7 +56,6 @@ public static class AnnotationProcessor extends AbstractProcessor { @Override public void init(ProcessingEnvironment processingEnv) { disableJava9SillyWarning(); - AstModificationNotifierData.lombokInvoked = true; instance.init(processingEnv); super.init(processingEnv); } From ec87cfb26072468d797bb4db39bff220c5240eac Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Wed, 9 Oct 2024 00:11:08 +0200 Subject: [PATCH 095/118] Update docker integration tests --- .github/workflows/ant.yml | 4 +--- docker/ant/files/{jdk-22 => jdk-23}/classpath/build.xml | 0 docker/ant/files/{jdk-22 => jdk-23}/modules/build.xml | 0 docker/gradle/Dockerfile | 6 +++--- docker/maven/files/{jdk-22 => jdk-23}/classpath/pom.xml | 0 docker/maven/files/{jdk-22 => jdk-23}/modules/pom.xml | 0 docker/provision/gradle/gradle-6.8.3.sh | 4 ---- docker/provision/gradle/gradle-7.6.1.sh | 4 ---- docker/provision/gradle/gradle-8.3.sh | 4 ---- docker/provision/gradle/{gradle-8.5.sh => gradle.sh} | 4 ++-- docker/provision/jdk/java-22.sh | 4 ---- docker/provision/jdk/java-23.sh | 4 ++++ 12 files changed, 10 insertions(+), 24 deletions(-) rename docker/ant/files/{jdk-22 => jdk-23}/classpath/build.xml (100%) rename docker/ant/files/{jdk-22 => jdk-23}/modules/build.xml (100%) rename docker/maven/files/{jdk-22 => jdk-23}/classpath/pom.xml (100%) rename docker/maven/files/{jdk-22 => jdk-23}/modules/pom.xml (100%) delete mode 100755 docker/provision/gradle/gradle-6.8.3.sh delete mode 100755 docker/provision/gradle/gradle-7.6.1.sh delete mode 100755 docker/provision/gradle/gradle-8.3.sh rename docker/provision/gradle/{gradle-8.5.sh => gradle.sh} (64%) delete mode 100755 docker/provision/jdk/java-22.sh create mode 100755 docker/provision/jdk/java-23.sh diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 8d743478a3..4d973d443d 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -166,14 +166,12 @@ jobs: needs: build strategy: matrix: - jdk: [8, 11, 17, 21, 22] + jdk: [8, 11, 17, 21, 23] tool: - {name: "maven", cmd: "mvn compile"} - {name: "gradle", cmd: "gradle assemble"} - {name: "ant", cmd: "ant dist"} - {name: "bazel", cmd: "bazel build //:ProjectRunner"} - exclude: - - {tool: {name: "gradle", cmd: "gradle assemble"}, jdk: 22} fail-fast: false env: IMAGE_NAME: lombok-${{ matrix.tool.name }}-jdk${{ matrix.jdk }} diff --git a/docker/ant/files/jdk-22/classpath/build.xml b/docker/ant/files/jdk-23/classpath/build.xml similarity index 100% rename from docker/ant/files/jdk-22/classpath/build.xml rename to docker/ant/files/jdk-23/classpath/build.xml diff --git a/docker/ant/files/jdk-22/modules/build.xml b/docker/ant/files/jdk-23/modules/build.xml similarity index 100% rename from docker/ant/files/jdk-22/modules/build.xml rename to docker/ant/files/jdk-23/modules/build.xml diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile index b83f7f0e13..de6256615e 100644 --- a/docker/gradle/Dockerfile +++ b/docker/gradle/Dockerfile @@ -7,9 +7,9 @@ RUN provision/jdk/java-${jdk}.sh ARG lombokjar=lombok.jar ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar -ARG gradle=8.5 -ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh -RUN provision/gradle/gradle-${gradle}.sh +ARG gradle=8.10.2 +ADD provision/gradle/gradle.sh provision/gradle/gradle.sh +RUN provision/gradle/gradle.sh ${gradle} FROM ubuntu:22.04 diff --git a/docker/maven/files/jdk-22/classpath/pom.xml b/docker/maven/files/jdk-23/classpath/pom.xml similarity index 100% rename from docker/maven/files/jdk-22/classpath/pom.xml rename to docker/maven/files/jdk-23/classpath/pom.xml diff --git a/docker/maven/files/jdk-22/modules/pom.xml b/docker/maven/files/jdk-23/modules/pom.xml similarity index 100% rename from docker/maven/files/jdk-22/modules/pom.xml rename to docker/maven/files/jdk-23/modules/pom.xml diff --git a/docker/provision/gradle/gradle-6.8.3.sh b/docker/provision/gradle/gradle-6.8.3.sh deleted file mode 100755 index 62ab0f629d..0000000000 --- a/docker/provision/gradle/gradle-6.8.3.sh +++ /dev/null @@ -1,4 +0,0 @@ -apt-get update && apt-get install -y wget unzip -wget https://services.gradle.org/distributions/gradle-6.8.3-bin.zip -O gradle.zip -mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip -mv /opt/gradle/gradle-6.8.3 /opt/gradle/gradle diff --git a/docker/provision/gradle/gradle-7.6.1.sh b/docker/provision/gradle/gradle-7.6.1.sh deleted file mode 100755 index d56d318a10..0000000000 --- a/docker/provision/gradle/gradle-7.6.1.sh +++ /dev/null @@ -1,4 +0,0 @@ -apt-get update && apt-get install -y wget unzip -wget https://services.gradle.org/distributions/gradle-7.6.1-bin.zip -O gradle.zip -mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip -mv /opt/gradle/gradle-7.6.1 /opt/gradle/gradle diff --git a/docker/provision/gradle/gradle-8.3.sh b/docker/provision/gradle/gradle-8.3.sh deleted file mode 100755 index 507087d470..0000000000 --- a/docker/provision/gradle/gradle-8.3.sh +++ /dev/null @@ -1,4 +0,0 @@ -apt-get update && apt-get install -y wget unzip -wget https://services.gradle.org/distributions/gradle-8.3-bin.zip -O gradle.zip -mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip -mv /opt/gradle/gradle-8.3 /opt/gradle/gradle diff --git a/docker/provision/gradle/gradle-8.5.sh b/docker/provision/gradle/gradle.sh similarity index 64% rename from docker/provision/gradle/gradle-8.5.sh rename to docker/provision/gradle/gradle.sh index 2f13a21099..60ce27348c 100755 --- a/docker/provision/gradle/gradle-8.5.sh +++ b/docker/provision/gradle/gradle.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget unzip -wget https://github.com/gradle/gradle-distributions/releases/download/v8.5.0/gradle-8.5-bin.zip -O gradle.zip +wget https://github.com/gradle/gradle-distributions/releases/download/v$1/gradle-$1-bin.zip -O gradle.zip mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip -mv /opt/gradle/gradle-8.5 /opt/gradle/gradle +mv /opt/gradle/gradle-$1 /opt/gradle/gradle diff --git a/docker/provision/jdk/java-22.sh b/docker/provision/jdk/java-22.sh deleted file mode 100755 index 69135bfd3a..0000000000 --- a/docker/provision/jdk/java-22.sh +++ /dev/null @@ -1,4 +0,0 @@ -apt-get update && apt-get install -y wget -wget https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz -O jdk.tar.gz -tar -xzf jdk.tar.gz -C /opt/ -mv /opt/jdk-22 /opt/jdk diff --git a/docker/provision/jdk/java-23.sh b/docker/provision/jdk/java-23.sh new file mode 100755 index 0000000000..5c489e28bc --- /dev/null +++ b/docker/provision/jdk/java-23.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget +wget https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz -O jdk.tar.gz +tar -xzf jdk.tar.gz -C /opt/ +mv /opt/jdk-23 /opt/jdk From 28a7a8823a6aeca687782b9d46c5bff67b935ffa Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Wed, 9 Oct 2024 00:37:10 +0200 Subject: [PATCH 096/118] -proc:full added --- docker/ant/files/jdk-23/classpath/build.xml | 1 + docker/ant/files/jdk-23/modules/build.xml | 1 + docker/maven/files/jdk-23/classpath/pom.xml | 3 ++- docker/maven/files/jdk-23/modules/pom.xml | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/ant/files/jdk-23/classpath/build.xml b/docker/ant/files/jdk-23/classpath/build.xml index 07e5885674..2bb486a85f 100644 --- a/docker/ant/files/jdk-23/classpath/build.xml +++ b/docker/ant/files/jdk-23/classpath/build.xml @@ -20,6 +20,7 @@ + diff --git a/docker/ant/files/jdk-23/modules/build.xml b/docker/ant/files/jdk-23/modules/build.xml index e1f9355020..13f661acb7 100644 --- a/docker/ant/files/jdk-23/modules/build.xml +++ b/docker/ant/files/jdk-23/modules/build.xml @@ -20,6 +20,7 @@ + diff --git a/docker/maven/files/jdk-23/classpath/pom.xml b/docker/maven/files/jdk-23/classpath/pom.xml index 316a3b8f10..52df5b57b5 100644 --- a/docker/maven/files/jdk-23/classpath/pom.xml +++ b/docker/maven/files/jdk-23/classpath/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 22 + 23 @@ -22,6 +22,7 @@ true true true + full -Werror -Xlint:all diff --git a/docker/maven/files/jdk-23/modules/pom.xml b/docker/maven/files/jdk-23/modules/pom.xml index 95c3a86e48..8c673a4233 100644 --- a/docker/maven/files/jdk-23/modules/pom.xml +++ b/docker/maven/files/jdk-23/modules/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 22 + 23 From 081e8aa961994c84d193733c587996e4669bef1f Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Thu, 17 Oct 2024 23:50:26 +0200 Subject: [PATCH 097/118] [trivial] [style] --- .../lombok/mapstruct/NotifierHider.java | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java b/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java index bed6c7143a..3e0975f8b1 100644 --- a/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java +++ b/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java @@ -12,26 +12,18 @@ * correctly handled, and MapStruct processing will be delayed until Lombok completely finishes processing required types. */ class NotifierHider { - public static class AstModificationNotifier implements AstModifyingAnnotationProcessor { - @Override - public boolean isTypeComplete(final TypeMirror typeMirror) { - final List annotationMirrors = typeMirror.getAnnotationMirrors(); - if (annotationMirrors == null || annotationMirrors.isEmpty()) { - return true; - } - - for (final AnnotationMirror annotationMirror : annotationMirrors) { - final String annotationName = String.valueOf(annotationMirror); - // check for ClaimingProcessor's SupportedAnnotationTypes - if (annotationName.startsWith("@lombok.")) { - return false; - } + public boolean isTypeComplete(TypeMirror typeMirror) { + List annotationMirrors = typeMirror.getAnnotationMirrors(); + if (annotationMirrors == null || annotationMirrors.isEmpty()) return true; + + for (AnnotationMirror annotationMirror : annotationMirrors) { + String annotationName = String.valueOf(annotationMirror); + if (annotationName.startsWith("@lombok.")) return false; } - + return true; - } } } From dc57606f3480626a5b0940989b7c292f14c07b6d Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Thu, 17 Oct 2024 23:50:47 +0200 Subject: [PATCH 098/118] MapStruct notifier: Ensure we always report lombok will not do anything further if lombok is entirely disabled. --- src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java b/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java index 3e0975f8b1..834b5bf2e0 100644 --- a/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java +++ b/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java @@ -15,6 +15,7 @@ class NotifierHider { public static class AstModificationNotifier implements AstModifyingAnnotationProcessor { @Override public boolean isTypeComplete(TypeMirror typeMirror) { + if (System.getProperty("lombok.disable") != null) return true; List annotationMirrors = typeMirror.getAnnotationMirrors(); if (annotationMirrors == null || annotationMirrors.isEmpty()) return true; From 0bc7f199007c6403d02c45d56b2e88e8f6314583 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 18 Oct 2024 00:04:21 +0200 Subject: [PATCH 099/118] [refactor] The 'copy zip files stripping signatures' code cleaned up ever so slightly; timestamps of zip entries is now preserved. --- .../DownloadEclipseDependencies.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java index 0aa9934dd4..eff44bf73f 100644 --- a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java +++ b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java @@ -90,22 +90,14 @@ private static void downloadFile(String filename, String repositoryUrl, String t return; } System.out.print("Downloading '" + filename + "'... "); - ZipInputStream in = null; - ZipOutputStream out = null; + + InputStream in = null; + OutputStream out = null; try { - in = new ZipInputStream(getStreamForUrl(repositoryUrl + filename)); - out = new ZipOutputStream(new FileOutputStream(targetFile)); + in = getStreamForUrl(repositoryUrl + filename); + out = new FileOutputStream(targetFile); - ZipEntry zipEntry; - while ((zipEntry = in.getNextEntry()) != null) { - String name = zipEntry.getName(); - - // Remove signature files - if (name.matches("META-INF/.*\\.(SF|RSA)")) continue; - - out.putNextEntry(new ZipEntry(name)); - copy(in, out); - } + copyZipButStripSignatures(in, out); System.out.println("[done]"); } catch (IOException e) { System.out.println("[error]"); @@ -118,6 +110,18 @@ private static void downloadFile(String filename, String repositoryUrl, String t } } + private static void copyZipButStripSignatures(InputStream rawIn, OutputStream rawOut) throws IOException { + ZipInputStream in = new ZipInputStream(rawIn); + ZipOutputStream out = new ZipOutputStream(rawOut); + + ZipEntry zipEntry; + while ((zipEntry = in.getNextEntry()) != null) { + if (zipEntry.getName().matches("META-INF/.*\\.(SF|RSA)")) continue; + out.putNextEntry(zipEntry); + copy(in, out); + } + } + private static void copy(InputStream from, OutputStream to) throws IOException { byte[] b = new byte[4096]; while (true) { From 0e9b161b6f8781f77684844f9dee7a9173ff7de8 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 18 Oct 2024 00:11:37 +0200 Subject: [PATCH 100/118] [trivial] --- src/eclipseAgent/lombok/launch/PatchFixesHider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eclipseAgent/lombok/launch/PatchFixesHider.java b/src/eclipseAgent/lombok/launch/PatchFixesHider.java index 1d29241001..1b005c57d1 100755 --- a/src/eclipseAgent/lombok/launch/PatchFixesHider.java +++ b/src/eclipseAgent/lombok/launch/PatchFixesHider.java @@ -896,7 +896,7 @@ public static boolean isEmpty(char[] array) { return array.length == 0; } - public static Expression returnNullExpression(Object string) { + public static Expression returnNullExpression(Object arg0) { return null; } From c8d615209707e4030bfe94323efbb5869853754c Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 18 Oct 2024 01:12:58 +0200 Subject: [PATCH 101/118] [infra] ant targets to test on JDK23 added and changelog updated. --- buildScripts/tests.ant.xml | 10 +++++++--- doc/changelog.markdown | 3 +-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/buildScripts/tests.ant.xml b/buildScripts/tests.ant.xml index 766d2b5fd3..c9d4a2b447 100644 --- a/buildScripts/tests.ant.xml +++ b/buildScripts/tests.ant.xml @@ -148,10 +148,14 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn + + + + - - + + @@ -368,5 +372,5 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn - + diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 71c0a1270b..96894b96f3 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -2,10 +2,9 @@ Lombok Changelog ---------------- ### v1.18.35 "Edgy Guinea Pig" -* We recently released v1.18.34; there is no edge release since then. +* PLATFORM: JDK23 support added. * BUGFIX: Eclipse projects using the `com.pro-crafting.tools:jasperreports-maven-plugin` will now compile. - ### v1.18.34 (June 28th, 2024) * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638). * IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3667). From 02a89cf7feb1cd5899530aa12d4de76d622e38fe Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Mon, 14 Oct 2024 22:17:09 +0200 Subject: [PATCH 102/118] Check exact message line numbers in tests --- .../src/lombok/CompilerMessageMatcher.java | 5 ++--- .../DelegateFlagUsage.java.messages | 2 +- .../DelegateOnStatic.java.messages | 4 ++-- .../DelegateRecursion.java.messages | 2 +- ...lsAndHashCodeOfAndExcludeWarn.java.messages | 4 ++-- ...sionMethodAmbiguousFunctional.java.messages | 2 +- ...perBuilderWithJsonDeserialize.java.messages | 2 +- .../LockedInRecord.java.messages | 2 +- .../NonNullOnParameter.java.messages | 2 +- .../OnXFlagUsage.java.messages | 12 ++++++------ .../SynchronizedInRecord.java.messages | 2 +- .../messages-delombok/ValErrors.java.messages | 4 ++-- .../ValInBasicFor.java.messages | 2 +- .../VarInForOldMulti.java.messages | 2 +- .../VarNullInit.java.messages | 2 +- .../messages-delombok/VarWarning.java.messages | 2 +- ...lsAndHashCodeOfAndExcludeWarn.java.messages | 4 ++-- ...perBuilderWithJsonDeserialize.java.messages | 2 +- .../NonNullOnParameter.java.messages | 6 +++--- .../messages-ecj/NonNullPlain.java.messages | 2 +- .../messages-ecj/OnXFlagUsage.java.messages | 12 ++++++------ .../LockedTypeMismatch.java.messages | 4 ++-- .../NonNullOnParameter.java.messages | 2 +- .../ValInvalidParameter.java.messages | 18 +++++++++--------- 24 files changed, 50 insertions(+), 51 deletions(-) diff --git a/test/core/src/lombok/CompilerMessageMatcher.java b/test/core/src/lombok/CompilerMessageMatcher.java index c00263f4f9..923b45e623 100644 --- a/test/core/src/lombok/CompilerMessageMatcher.java +++ b/test/core/src/lombok/CompilerMessageMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2013 The Project Lombok Authors. + * Copyright (C) 2012-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -67,8 +67,7 @@ public static CompilerMessageMatcher asCompilerMessageMatcher(CompilerMessage me public boolean matches(CompilerMessage message) { outer: for (int i = 0; i < lineNumbers.size(); i++) { - //Allow an off-by-1 in line numbers; when running tests that sometimes happens for as yet unknown reasons. - if (message.getLine() != lineNumbers.get(i) && message.getLine() -1 != lineNumbers.get(i)) continue; + if (message.getLine() != lineNumbers.get(i)) continue; for (String token : messages.get(i)) { if (!message.getMessage().contains(token)) continue outer; } diff --git a/test/transform/resource/messages-delombok/DelegateFlagUsage.java.messages b/test/transform/resource/messages-delombok/DelegateFlagUsage.java.messages index a6b786322e..54e48e664d 100644 --- a/test/transform/resource/messages-delombok/DelegateFlagUsage.java.messages +++ b/test/transform/resource/messages-delombok/DelegateFlagUsage.java.messages @@ -1 +1 @@ -4 Use of @Delegate is flagged according to lombok configuration. \ No newline at end of file +5 Use of @Delegate is flagged according to lombok configuration. diff --git a/test/transform/resource/messages-delombok/DelegateOnStatic.java.messages b/test/transform/resource/messages-delombok/DelegateOnStatic.java.messages index 51dcf5014e..45ae7c5750 100644 --- a/test/transform/resource/messages-delombok/DelegateOnStatic.java.messages +++ b/test/transform/resource/messages-delombok/DelegateOnStatic.java.messages @@ -1,2 +1,2 @@ -6 @Delegate is legal only on instance fields or no-argument instance methods. -10 @Delegate is legal only on instance fields or no-argument instance methods. \ No newline at end of file +7 @Delegate is legal only on instance fields or no-argument instance methods. +11 @Delegate is legal only on instance fields or no-argument instance methods. diff --git a/test/transform/resource/messages-delombok/DelegateRecursion.java.messages b/test/transform/resource/messages-delombok/DelegateRecursion.java.messages index bf4d84106e..b3179954f9 100644 --- a/test/transform/resource/messages-delombok/DelegateRecursion.java.messages +++ b/test/transform/resource/messages-delombok/DelegateRecursion.java.messages @@ -1 +1 @@ -4 @Delegate does not support recursion (delegating to a type that itself has @Delegate members). Member "inner" is @Delegate in type "DelegateRecursionCenter" +5 @Delegate does not support recursion (delegating to a type that itself has @Delegate members). Member "inner" is @Delegate in type "DelegateRecursionCenter" diff --git a/test/transform/resource/messages-delombok/EqualsAndHashCodeOfAndExcludeWarn.java.messages b/test/transform/resource/messages-delombok/EqualsAndHashCodeOfAndExcludeWarn.java.messages index 2c4fbd68ba..706282f906 100644 --- a/test/transform/resource/messages-delombok/EqualsAndHashCodeOfAndExcludeWarn.java.messages +++ b/test/transform/resource/messages-delombok/EqualsAndHashCodeOfAndExcludeWarn.java.messages @@ -1,2 +1,2 @@ -1 This field does not exist. -6 This field does not exist, or would have been excluded anyway. \ No newline at end of file +2 This field does not exist. +7 This field does not exist, or would have been excluded anyway. diff --git a/test/transform/resource/messages-delombok/ExtensionMethodAmbiguousFunctional.java.messages b/test/transform/resource/messages-delombok/ExtensionMethodAmbiguousFunctional.java.messages index 9fa3414f76..0b22d4046c 100644 --- a/test/transform/resource/messages-delombok/ExtensionMethodAmbiguousFunctional.java.messages +++ b/test/transform/resource/messages-delombok/ExtensionMethodAmbiguousFunctional.java.messages @@ -1 +1 @@ -9 reference to ambiguous is ambiguous both method ambiguous(T,java.util.function.Function) in ExtensionMethodAmbiguousFunctional.Extensions and method ambiguous(T,java.util.function.Consumer) in ExtensionMethodAmbiguousFunctional.Extensions match +10 reference to ambiguous is ambiguous both method ambiguous(T,java.util.function.Function) in ExtensionMethodAmbiguousFunctional.Extensions and method ambiguous(T,java.util.function.Consumer) in ExtensionMethodAmbiguousFunctional.Extensions match diff --git a/test/transform/resource/messages-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java.messages b/test/transform/resource/messages-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java.messages index 5c69304fed..1947a26ee6 100644 --- a/test/transform/resource/messages-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java.messages +++ b/test/transform/resource/messages-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java.messages @@ -1 +1 @@ -1 @JsonDeserialize already exists on class. Either delete @JsonDeserialize, or remove @Jacksonized and manually configure Jackson. \ No newline at end of file +2 @JsonDeserialize already exists on class. Either delete @JsonDeserialize, or remove @Jacksonized and manually configure Jackson. diff --git a/test/transform/resource/messages-delombok/LockedInRecord.java.messages b/test/transform/resource/messages-delombok/LockedInRecord.java.messages index 0165764d47..1e921a76e2 100644 --- a/test/transform/resource/messages-delombok/LockedInRecord.java.messages +++ b/test/transform/resource/messages-delombok/LockedInRecord.java.messages @@ -1 +1 @@ -5 @Locked is legal only on methods in classes and enums. +6 @Locked is legal only on methods in classes and enums. diff --git a/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages b/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages index 042c97f856..0fe49dadbe 100644 --- a/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages +++ b/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages @@ -1 +1 @@ -22 @NonNull is meaningless on a primitive. +23 @NonNull is meaningless on a primitive. diff --git a/test/transform/resource/messages-delombok/OnXFlagUsage.java.messages b/test/transform/resource/messages-delombok/OnXFlagUsage.java.messages index c4187b9fd0..fbb1ea2cd0 100644 --- a/test/transform/resource/messages-delombok/OnXFlagUsage.java.messages +++ b/test/transform/resource/messages-delombok/OnXFlagUsage.java.messages @@ -1,6 +1,6 @@ -9 Use of @Getter(onMethod=...) is flagged according to lombok configuration. -10 Use of @Setter(onMethod=...) is flagged according to lombok configuration. -10 Use of @Setter(onParam=...) is flagged according to lombok configuration. -11 Use of @NoArgsConstructor(onConstructor=...) is flagged according to lombok configuration. -12 Use of @AllArgsConstructor(onConstructor=...) is flagged according to lombok configuration. -18 Use of @RequiredArgsConstructor(onConstructor=...) is flagged according to lombok configuration. \ No newline at end of file +10 Use of @Getter(onMethod=...) is flagged according to lombok configuration. +11 Use of @Setter(onMethod=...) is flagged according to lombok configuration. +11 Use of @Setter(onParam=...) is flagged according to lombok configuration. +12 Use of @NoArgsConstructor(onConstructor=...) is flagged according to lombok configuration. +13 Use of @AllArgsConstructor(onConstructor=...) is flagged according to lombok configuration. +19 Use of @RequiredArgsConstructor(onConstructor=...) is flagged according to lombok configuration. diff --git a/test/transform/resource/messages-delombok/SynchronizedInRecord.java.messages b/test/transform/resource/messages-delombok/SynchronizedInRecord.java.messages index d40e68b309..af4b11f893 100644 --- a/test/transform/resource/messages-delombok/SynchronizedInRecord.java.messages +++ b/test/transform/resource/messages-delombok/SynchronizedInRecord.java.messages @@ -1 +1 @@ -5 @Synchronized is legal only on methods in classes and enums. +6 @Synchronized is legal only on methods in classes and enums. diff --git a/test/transform/resource/messages-delombok/ValErrors.java.messages b/test/transform/resource/messages-delombok/ValErrors.java.messages index 0777143b90..734d3a5a9b 100644 --- a/test/transform/resource/messages-delombok/ValErrors.java.messages +++ b/test/transform/resource/messages-delombok/ValErrors.java.messages @@ -1,2 +1,2 @@ -6 Cannot use 'val' here because initializer expression does not have a representable type: Type cannot be resolved -10 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... }) +7 Cannot use 'val' here because initializer expression does not have a representable type: Type cannot be resolved +11 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... }) diff --git a/test/transform/resource/messages-delombok/ValInBasicFor.java.messages b/test/transform/resource/messages-delombok/ValInBasicFor.java.messages index 60f8f70c44..334a2713ab 100644 --- a/test/transform/resource/messages-delombok/ValInBasicFor.java.messages +++ b/test/transform/resource/messages-delombok/ValInBasicFor.java.messages @@ -1 +1 @@ -7 'val' is not allowed in old-style for loops +8 'val' is not allowed in old-style for loops diff --git a/test/transform/resource/messages-delombok/VarInForOldMulti.java.messages b/test/transform/resource/messages-delombok/VarInForOldMulti.java.messages index f65fe8239c..917ca0a094 100644 --- a/test/transform/resource/messages-delombok/VarInForOldMulti.java.messages +++ b/test/transform/resource/messages-delombok/VarInForOldMulti.java.messages @@ -1 +1 @@ -6 'var' is not allowed in old-style for loops if there is more than 1 initializer +7 'var' is not allowed in old-style for loops if there is more than 1 initializer diff --git a/test/transform/resource/messages-delombok/VarNullInit.java.messages b/test/transform/resource/messages-delombok/VarNullInit.java.messages index 5a2a6ae11d..a82c77cfb2 100644 --- a/test/transform/resource/messages-delombok/VarNullInit.java.messages +++ b/test/transform/resource/messages-delombok/VarNullInit.java.messages @@ -1 +1 @@ -5 variable initializer is 'null' \ No newline at end of file +6 variable initializer is 'null' diff --git a/test/transform/resource/messages-delombok/VarWarning.java.messages b/test/transform/resource/messages-delombok/VarWarning.java.messages index 886e98f44e..fe6e79a290 100644 --- a/test/transform/resource/messages-delombok/VarWarning.java.messages +++ b/test/transform/resource/messages-delombok/VarWarning.java.messages @@ -1 +1 @@ -6 Use of var is flagged according to lombok configuration \ No newline at end of file +7 Use of var is flagged according to lombok configuration. diff --git a/test/transform/resource/messages-ecj/EqualsAndHashCodeOfAndExcludeWarn.java.messages b/test/transform/resource/messages-ecj/EqualsAndHashCodeOfAndExcludeWarn.java.messages index 2c4fbd68ba..706282f906 100644 --- a/test/transform/resource/messages-ecj/EqualsAndHashCodeOfAndExcludeWarn.java.messages +++ b/test/transform/resource/messages-ecj/EqualsAndHashCodeOfAndExcludeWarn.java.messages @@ -1,2 +1,2 @@ -1 This field does not exist. -6 This field does not exist, or would have been excluded anyway. \ No newline at end of file +2 This field does not exist. +7 This field does not exist, or would have been excluded anyway. diff --git a/test/transform/resource/messages-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java.messages b/test/transform/resource/messages-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java.messages index 5c69304fed..1947a26ee6 100644 --- a/test/transform/resource/messages-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java.messages +++ b/test/transform/resource/messages-ecj/JacksonizedSuperBuilderWithJsonDeserialize.java.messages @@ -1 +1 @@ -1 @JsonDeserialize already exists on class. Either delete @JsonDeserialize, or remove @Jacksonized and manually configure Jackson. \ No newline at end of file +2 @JsonDeserialize already exists on class. Either delete @JsonDeserialize, or remove @Jacksonized and manually configure Jackson. diff --git a/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages b/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages index 4b7d18b3fd..b4cf664e5b 100644 --- a/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages +++ b/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages @@ -1,3 +1,3 @@ -15 Dead code -22 @NonNull is meaningless on a primitive. -28 Dead code \ No newline at end of file +16 Dead code +23 @NonNull is meaningless on a primitive. +29 Dead code diff --git a/test/transform/resource/messages-ecj/NonNullPlain.java.messages b/test/transform/resource/messages-ecj/NonNullPlain.java.messages index 1c33c7018d..f6709a64dc 100644 --- a/test/transform/resource/messages-ecj/NonNullPlain.java.messages +++ b/test/transform/resource/messages-ecj/NonNullPlain.java.messages @@ -1 +1 @@ -7 @NonNull is meaningless on a primitive. \ No newline at end of file +8 @NonNull is meaningless on a primitive. diff --git a/test/transform/resource/messages-ecj/OnXFlagUsage.java.messages b/test/transform/resource/messages-ecj/OnXFlagUsage.java.messages index c4187b9fd0..fbb1ea2cd0 100644 --- a/test/transform/resource/messages-ecj/OnXFlagUsage.java.messages +++ b/test/transform/resource/messages-ecj/OnXFlagUsage.java.messages @@ -1,6 +1,6 @@ -9 Use of @Getter(onMethod=...) is flagged according to lombok configuration. -10 Use of @Setter(onMethod=...) is flagged according to lombok configuration. -10 Use of @Setter(onParam=...) is flagged according to lombok configuration. -11 Use of @NoArgsConstructor(onConstructor=...) is flagged according to lombok configuration. -12 Use of @AllArgsConstructor(onConstructor=...) is flagged according to lombok configuration. -18 Use of @RequiredArgsConstructor(onConstructor=...) is flagged according to lombok configuration. \ No newline at end of file +10 Use of @Getter(onMethod=...) is flagged according to lombok configuration. +11 Use of @Setter(onMethod=...) is flagged according to lombok configuration. +11 Use of @Setter(onParam=...) is flagged according to lombok configuration. +12 Use of @NoArgsConstructor(onConstructor=...) is flagged according to lombok configuration. +13 Use of @AllArgsConstructor(onConstructor=...) is flagged according to lombok configuration. +19 Use of @RequiredArgsConstructor(onConstructor=...) is flagged according to lombok configuration. diff --git a/test/transform/resource/messages-idempotent/LockedTypeMismatch.java.messages b/test/transform/resource/messages-idempotent/LockedTypeMismatch.java.messages index 195f1466b4..f5819b1ac0 100644 --- a/test/transform/resource/messages-idempotent/LockedTypeMismatch.java.messages +++ b/test/transform/resource/messages-idempotent/LockedTypeMismatch.java.messages @@ -1,2 +1,2 @@ -27 cannot find symbol -31 cannot find symbol +28 cannot find symbol method readLock() location: java.util.concurrent.locks.Lock +32 cannot find symbol method readLock() location: java.util.concurrent.locks.Lock diff --git a/test/transform/resource/messages-idempotent/NonNullOnParameter.java.messages b/test/transform/resource/messages-idempotent/NonNullOnParameter.java.messages index 57556bf3d4..e2a9b468a3 100644 --- a/test/transform/resource/messages-idempotent/NonNullOnParameter.java.messages +++ b/test/transform/resource/messages-idempotent/NonNullOnParameter.java.messages @@ -1 +1 @@ -33 @NonNull is meaningless on a primitive. \ No newline at end of file +34 @NonNull is meaningless on a primitive. diff --git a/test/transform/resource/messages-idempotent/ValInvalidParameter.java.messages b/test/transform/resource/messages-idempotent/ValInvalidParameter.java.messages index 539d29cdf8..8fea4d3646 100644 --- a/test/transform/resource/messages-idempotent/ValInvalidParameter.java.messages +++ b/test/transform/resource/messages-idempotent/ValInvalidParameter.java.messages @@ -1,9 +1,9 @@ -3 cannot find symbol -4 cannot find symbol -5 cannot find symbol -6 cannot find symbol -7 cannot find symbol -8 cannot find symbol -9 method b2 in class ValInvalidParameter cannot be applied to given types; -10 reference to a is ambiguous -11 reference to a is ambiguous \ No newline at end of file +4 cannot find symbol symbol: class NonExistingClass location: class ValInvalidParameter +5 cannot find symbol symbol: class NonExistingClass location: class ValInvalidParameter +6 cannot find symbol symbol: method nonExisitingMethod(java.lang.Integer) location: class ValInvalidParameter +7 cannot find symbol symbol: variable nonExistingObject location: class ValInvalidParameter +8 cannot find symbol symbol: method nonExistingMethod() location: class java.lang.Integer +9 cannot find symbol symbol: class NonExistingClass location: class ValInvalidParameter +10 method b2 in class ValInvalidParameter cannot be applied to given types; required: int,int found: int reason: actual and formal argument lists differ in length +11 reference to a is ambiguous both method a(java.lang.String) in ValInvalidParameter and method a(java.lang.Integer) in ValInvalidParameter match +12 reference to a is ambiguous both method a(java.lang.String) in ValInvalidParameter and method a(java.lang.Integer) in ValInvalidParameter match From 4aa58fb21101b6643af477151b35842fffcb70cd Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Mon, 14 Oct 2024 22:43:20 +0200 Subject: [PATCH 103/118] Update ecj message line numbers --- .../messages-ecj/DelegateFlagUsage.java.messages | 2 +- .../messages-ecj/DelegateOnGetter.java.messages | 4 ++-- .../messages-ecj/DelegateOnStatic.java.messages | 4 ++-- .../messages-ecj/DelegateRecursion.java.messages | 2 +- ...alAnonymousSubclassWithGenerics.java.messages | 2 +- .../ValInvalidParameter.java.messages | 16 ++++++++-------- .../messages-ecj/ValLambda.java.messages | 4 ++-- .../messages-ecj/ValRawType.java.messages | 2 +- .../messages-ecj/VarInForOldMulti.java.messages | 2 +- .../messages-ecj/VarModifier.java.messages | 4 ++-- .../messages-ecj/VarNullInit.java.messages | 2 +- .../messages-ecj/VarWarning.java.messages | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/test/transform/resource/messages-ecj/DelegateFlagUsage.java.messages b/test/transform/resource/messages-ecj/DelegateFlagUsage.java.messages index 6c8f693e6e..54e48e664d 100644 --- a/test/transform/resource/messages-ecj/DelegateFlagUsage.java.messages +++ b/test/transform/resource/messages-ecj/DelegateFlagUsage.java.messages @@ -1 +1 @@ -4 Use of @Delegate is flagged according to lombok configuration. +5 Use of @Delegate is flagged according to lombok configuration. diff --git a/test/transform/resource/messages-ecj/DelegateOnGetter.java.messages b/test/transform/resource/messages-ecj/DelegateOnGetter.java.messages index 16453094cb..ef40527b25 100644 --- a/test/transform/resource/messages-ecj/DelegateOnGetter.java.messages +++ b/test/transform/resource/messages-ecj/DelegateOnGetter.java.messages @@ -1,2 +1,2 @@ -1 The type Delegate is deprecated -6 The type Delegate is deprecated +2 The type Delegate is deprecated +7 The type Delegate is deprecated diff --git a/test/transform/resource/messages-ecj/DelegateOnStatic.java.messages b/test/transform/resource/messages-ecj/DelegateOnStatic.java.messages index 51dcf5014e..45ae7c5750 100644 --- a/test/transform/resource/messages-ecj/DelegateOnStatic.java.messages +++ b/test/transform/resource/messages-ecj/DelegateOnStatic.java.messages @@ -1,2 +1,2 @@ -6 @Delegate is legal only on instance fields or no-argument instance methods. -10 @Delegate is legal only on instance fields or no-argument instance methods. \ No newline at end of file +7 @Delegate is legal only on instance fields or no-argument instance methods. +11 @Delegate is legal only on instance fields or no-argument instance methods. diff --git a/test/transform/resource/messages-ecj/DelegateRecursion.java.messages b/test/transform/resource/messages-ecj/DelegateRecursion.java.messages index bf4d84106e..b3179954f9 100644 --- a/test/transform/resource/messages-ecj/DelegateRecursion.java.messages +++ b/test/transform/resource/messages-ecj/DelegateRecursion.java.messages @@ -1 +1 @@ -4 @Delegate does not support recursion (delegating to a type that itself has @Delegate members). Member "inner" is @Delegate in type "DelegateRecursionCenter" +5 @Delegate does not support recursion (delegating to a type that itself has @Delegate members). Member "inner" is @Delegate in type "DelegateRecursionCenter" diff --git a/test/transform/resource/messages-ecj/ValAnonymousSubclassWithGenerics.java.messages b/test/transform/resource/messages-ecj/ValAnonymousSubclassWithGenerics.java.messages index 37f876391c..a70f61bf29 100644 --- a/test/transform/resource/messages-ecj/ValAnonymousSubclassWithGenerics.java.messages +++ b/test/transform/resource/messages-ecj/ValAnonymousSubclassWithGenerics.java.messages @@ -1 +1 @@ -17 The serializable class does not declare a static final serialVersionUID field of type long \ No newline at end of file +18 The serializable class does not declare a static final serialVersionUID field of type long diff --git a/test/transform/resource/messages-ecj/ValInvalidParameter.java.messages b/test/transform/resource/messages-ecj/ValInvalidParameter.java.messages index cbf2d7c4e6..6758e11973 100644 --- a/test/transform/resource/messages-ecj/ValInvalidParameter.java.messages +++ b/test/transform/resource/messages-ecj/ValInvalidParameter.java.messages @@ -1,9 +1,9 @@ -5 NonExistingClass cannot be resolved to a type 6 NonExistingClass cannot be resolved to a type -7 The method nonExisitingMethod(Integer) is undefined for the type ValInvalidParameter -8 nonExistingObject cannot be resolved -9 The method nonExistingMethod() is undefined for the type Integer -10 NonExistingClass cannot be resolved to a type -11 The method b2(int, int) in the type ValInvalidParameter is not applicable for the arguments (int) -12 The method a(String) is ambiguous for the type ValInvalidParameter -13 The method a(String) is ambiguous for the type ValInvalidParameter \ No newline at end of file +7 NonExistingClass cannot be resolved to a type +8 The method nonExisitingMethod(Integer) is undefined for the type ValInvalidParameter +9 nonExistingObject cannot be resolved +10 The method nonExistingMethod() is undefined for the type Integer +11 NonExistingClass cannot be resolved to a type +12 The method b2(int, int) in the type ValInvalidParameter is not applicable for the arguments (int) +13 The method a(String) is ambiguous for the type ValInvalidParameter +14 The method a(String) is ambiguous for the type ValInvalidParameter diff --git a/test/transform/resource/messages-ecj/ValLambda.java.messages b/test/transform/resource/messages-ecj/ValLambda.java.messages index fa7231efed..6bfb52d952 100644 --- a/test/transform/resource/messages-ecj/ValLambda.java.messages +++ b/test/transform/resource/messages-ecj/ValLambda.java.messages @@ -1,2 +1,2 @@ -24 Function is a raw type. References to generic type Function should be parameterized -25 Function is a raw type. References to generic type Function should be parameterized \ No newline at end of file +25 Function is a raw type. References to generic type Function should be parameterized +26 Function is a raw type. References to generic type Function should be parameterized diff --git a/test/transform/resource/messages-ecj/ValRawType.java.messages b/test/transform/resource/messages-ecj/ValRawType.java.messages index 2a1fbba647..95fef20373 100644 --- a/test/transform/resource/messages-ecj/ValRawType.java.messages +++ b/test/transform/resource/messages-ecj/ValRawType.java.messages @@ -1 +1 @@ -13 List is a raw type. References to generic type List should be parameterized +14 List is a raw type. References to generic type List should be parameterized diff --git a/test/transform/resource/messages-ecj/VarInForOldMulti.java.messages b/test/transform/resource/messages-ecj/VarInForOldMulti.java.messages index 0bfd6e65a9..917ca0a094 100644 --- a/test/transform/resource/messages-ecj/VarInForOldMulti.java.messages +++ b/test/transform/resource/messages-ecj/VarInForOldMulti.java.messages @@ -1 +1 @@ -6 'var' is not allowed in old-style for loops if there is more than 1 initializer \ No newline at end of file +7 'var' is not allowed in old-style for loops if there is more than 1 initializer diff --git a/test/transform/resource/messages-ecj/VarModifier.java.messages b/test/transform/resource/messages-ecj/VarModifier.java.messages index 051d1ad708..1931c2cdc1 100644 --- a/test/transform/resource/messages-ecj/VarModifier.java.messages +++ b/test/transform/resource/messages-ecj/VarModifier.java.messages @@ -1,3 +1,3 @@ -1 The type var is deprecated -7 The type var is deprecated +2 The type var is deprecated 8 The type var is deprecated +9 The type var is deprecated diff --git a/test/transform/resource/messages-ecj/VarNullInit.java.messages b/test/transform/resource/messages-ecj/VarNullInit.java.messages index 5a2a6ae11d..a82c77cfb2 100644 --- a/test/transform/resource/messages-ecj/VarNullInit.java.messages +++ b/test/transform/resource/messages-ecj/VarNullInit.java.messages @@ -1 +1 @@ -5 variable initializer is 'null' \ No newline at end of file +6 variable initializer is 'null' diff --git a/test/transform/resource/messages-ecj/VarWarning.java.messages b/test/transform/resource/messages-ecj/VarWarning.java.messages index 25096b845e..fe6e79a290 100644 --- a/test/transform/resource/messages-ecj/VarWarning.java.messages +++ b/test/transform/resource/messages-ecj/VarWarning.java.messages @@ -1 +1 @@ -6 Use of var is flagged according to lombok configuration. \ No newline at end of file +7 Use of var is flagged according to lombok configuration. From 5caea325100c2b76dee6a5d63c1328523a9da671 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sat, 19 Oct 2024 11:49:29 +0200 Subject: [PATCH 104/118] [fixes #3761] Update annotation value index --- src/core/lombok/core/AnnotationValues.java | 3 ++- test/core/src/lombok/CompilerMessageMatcher.java | 12 +++++++++--- .../before/EqualsAndHashCodeOfAndExcludeError.java | 14 ++++++++++++++ ...qualsAndHashCodeOfAndExcludeError.java.messages | 2 ++ ...qualsAndHashCodeOfAndExcludeError.java.messages | 2 ++ 5 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 test/transform/resource/before/EqualsAndHashCodeOfAndExcludeError.java create mode 100644 test/transform/resource/messages-delombok/EqualsAndHashCodeOfAndExcludeError.java.messages create mode 100644 test/transform/resource/messages-ecj/EqualsAndHashCodeOfAndExcludeError.java.messages diff --git a/src/core/lombok/core/AnnotationValues.java b/src/core/lombok/core/AnnotationValues.java index 390e9b71b3..19026ca51a 100644 --- a/src/core/lombok/core/AnnotationValues.java +++ b/src/core/lombok/core/AnnotationValues.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2022 The Project Lombok Authors. + * Copyright (C) 2009-2024 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -182,6 +182,7 @@ public List getAsStringList(String methodName) { "I can't make sense of this annotation value. Try using a fully qualified literal.", idx); } out.add((String) result); + idx++; } return Collections.unmodifiableList(out); diff --git a/test/core/src/lombok/CompilerMessageMatcher.java b/test/core/src/lombok/CompilerMessageMatcher.java index 923b45e623..76eb2ee92c 100644 --- a/test/core/src/lombok/CompilerMessageMatcher.java +++ b/test/core/src/lombok/CompilerMessageMatcher.java @@ -36,6 +36,7 @@ public class CompilerMessageMatcher { /** Line Number (starting at 1) */ private final List lineNumbers = new ArrayList(); + private final List positions = new ArrayList(); private final List> messages = new ArrayList>(); private boolean optional; @@ -48,6 +49,7 @@ public boolean isOptional() { public static CompilerMessageMatcher asCompilerMessageMatcher(CompilerMessage message) { CompilerMessageMatcher cmm = new CompilerMessageMatcher(); cmm.lineNumbers.add((int) message.getLine()); + cmm.positions.add(message.getPosition()); cmm.messages.add(Arrays.asList(message.getMessage().split("\\s+"))); return cmm; } @@ -55,7 +57,9 @@ public static CompilerMessageMatcher asCompilerMessageMatcher(CompilerMessage me @Override public String toString() { StringBuilder out = new StringBuilder(); for (int i = 0; i < lineNumbers.size(); i++) { - out.append(lineNumbers.get(i)).append(" "); + out.append(lineNumbers.get(i)); + if (positions.get(i) != null) out.append(":").append(positions.get(i)); + out.append(" "); for (String part : messages.get(i)) out.append(part).append(" "); if (out.length() > 0) out.setLength(out.length() - 1); out.append(" |||| "); @@ -68,6 +72,7 @@ public boolean matches(CompilerMessage message) { outer: for (int i = 0; i < lineNumbers.size(); i++) { if (message.getLine() != lineNumbers.get(i)) continue; + if (positions.get(i) != null && !positions.get(i).equals(message.getPosition())) continue; for (String token : messages.get(i)) { if (!message.getMessage().contains(token)) continue outer; } @@ -87,7 +92,7 @@ public static List readAll(InputStream rawIn) throws IOE return out; } - private static final Pattern PATTERN = Pattern.compile("^(-?\\d+) (.*)$"); + private static final Pattern PATTERN = Pattern.compile("^(-?\\d+)(?::(\\d+))? (.*)$"); private static CompilerMessageMatcher read(String line) { line = line.trim(); @@ -107,7 +112,8 @@ private static CompilerMessageMatcher read(String line) { Matcher m = PATTERN.matcher(part); if (!m.matches()) throw new IllegalArgumentException("Typo in test file: " + line); cmm.lineNumbers.add(Integer.parseInt(m.group(1))); - cmm.messages.add(Arrays.asList(m.group(2).split("\\s+"))); + cmm.positions.add(m.group(2) != null ? Long.parseLong(m.group(2)) : null); + cmm.messages.add(Arrays.asList(m.group(3).split("\\s+"))); } return cmm; diff --git a/test/transform/resource/before/EqualsAndHashCodeOfAndExcludeError.java b/test/transform/resource/before/EqualsAndHashCodeOfAndExcludeError.java new file mode 100644 index 0000000000..cbfb135568 --- /dev/null +++ b/test/transform/resource/before/EqualsAndHashCodeOfAndExcludeError.java @@ -0,0 +1,14 @@ +// skip-compare-contents +@lombok.EqualsAndHashCode(of={"x", Const.A}) +final class EqualsAndHashCodeErrorOf { + int x; +} + +@lombok.EqualsAndHashCode(exclude={"x", Const.A}) +final class EqualsAndHashCodeErrorExclude { + int x; +} + +class Const { + static final String A = "A"; +} \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/EqualsAndHashCodeOfAndExcludeError.java.messages b/test/transform/resource/messages-delombok/EqualsAndHashCodeOfAndExcludeError.java.messages new file mode 100644 index 0000000000..18e7a32b49 --- /dev/null +++ b/test/transform/resource/messages-delombok/EqualsAndHashCodeOfAndExcludeError.java.messages @@ -0,0 +1,2 @@ +2:60 You must use constant literals in lombok annotations; they cannot be references to (static) fields. +7:160 You must use constant literals in lombok annotations; they cannot be references to (static) fields. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/EqualsAndHashCodeOfAndExcludeError.java.messages b/test/transform/resource/messages-ecj/EqualsAndHashCodeOfAndExcludeError.java.messages new file mode 100644 index 0000000000..18e7a32b49 --- /dev/null +++ b/test/transform/resource/messages-ecj/EqualsAndHashCodeOfAndExcludeError.java.messages @@ -0,0 +1,2 @@ +2:60 You must use constant literals in lombok annotations; they cannot be references to (static) fields. +7:160 You must use constant literals in lombok annotations; they cannot be references to (static) fields. \ No newline at end of file From d21d551a4dab3ec88c968761fbd3c62bab27fb2a Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sat, 19 Oct 2024 15:31:26 +0200 Subject: [PATCH 105/118] Close ZipOutputStream in eclipse dependency downloader --- .../DownloadEclipseDependencies.java | 53 +++++++++++-------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java index eff44bf73f..a60cd7a71d 100644 --- a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java +++ b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java @@ -23,6 +23,7 @@ import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; +import java.io.Closeable; import java.io.File; import java.io.FileOutputStream; import java.io.FilenameFilter; @@ -66,17 +67,12 @@ public static void main(String[] args) throws Exception { String pluginSource = updateSite.getResolvedUrl() + "/plugins/"; for (String artifact : artifacts) { - try { - downloadFile(artifact, pluginSource, pluginTarget); - } catch (Exception e) { - } - + // Download artifact + downloadFile(artifact, pluginSource, pluginTarget); + // Download artifact source int index = artifact.lastIndexOf("_"); String source = artifact.substring(0, index) + ".source" + artifact.substring(index); - try { - downloadFile(source, pluginSource, pluginTarget); - } catch (Exception e) { - } + downloadFile(source, pluginSource, pluginTarget); } writeEclipseLibrary(target, eclipseVersion); @@ -102,23 +98,27 @@ private static void downloadFile(String filename, String repositoryUrl, String t } catch (IOException e) { System.out.println("[error]"); } finally { - if (in != null) try { - in.close(); - } catch (Exception ignore) { - } - if (out != null) out.close(); + closeQuietly(in); + closeQuietly(out); } } private static void copyZipButStripSignatures(InputStream rawIn, OutputStream rawOut) throws IOException { - ZipInputStream in = new ZipInputStream(rawIn); - ZipOutputStream out = new ZipOutputStream(rawOut); - - ZipEntry zipEntry; - while ((zipEntry = in.getNextEntry()) != null) { - if (zipEntry.getName().matches("META-INF/.*\\.(SF|RSA)")) continue; - out.putNextEntry(zipEntry); - copy(in, out); + ZipInputStream in = null; + ZipOutputStream out = null; + try { + in = new ZipInputStream(rawIn); + out = new ZipOutputStream(rawOut); + + ZipEntry zipEntry; + while ((zipEntry = in.getNextEntry()) != null) { + if (zipEntry.getName().matches("META-INF/.*\\.(SF|RSA)")) continue; + out.putNextEntry(zipEntry); + copy(in, out); + } + } finally { + closeQuietly(in); + closeQuietly(out); } } @@ -131,6 +131,15 @@ private static void copy(InputStream from, OutputStream to) throws IOException { } } + private static void closeQuietly(Closeable closeable) { + if (closeable != null) { + try { + closeable.close(); + } catch (IOException ignore) { + } + } + } + private static InputStream getStreamForUrl(String url) throws IOException, MalformedURLException { HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); connection.setRequestProperty("User-Agent", "lombok"); From 7a9f3a8b7599d4be61bd32698874f6d7e4c15b89 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Thu, 24 Oct 2024 22:15:40 +0200 Subject: [PATCH 106/118] Fix resource management in the eclipse downloader: - closeQuietly is a pet peeve of mine; it is an abomination that must never be. - All actual resources are closed; all filters aren't because there is no need. - the underlying problem (of 'flushing' zips) is addressed. --- .../DownloadEclipseDependencies.java | 45 +++++++------------ 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java index a60cd7a71d..20b590e63e 100644 --- a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java +++ b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java @@ -69,6 +69,7 @@ public static void main(String[] args) throws Exception { for (String artifact : artifacts) { // Download artifact downloadFile(artifact, pluginSource, pluginTarget); + // Download artifact source int index = artifact.lastIndexOf("_"); String source = artifact.substring(0, index) + ".source" + artifact.substring(index); @@ -95,31 +96,29 @@ private static void downloadFile(String filename, String repositoryUrl, String t copyZipButStripSignatures(in, out); System.out.println("[done]"); - } catch (IOException e) { - System.out.println("[error]"); } finally { - closeQuietly(in); - closeQuietly(out); + try { + if (in != null) in.close(); + } finally { + if (out != null) out.close(); + } } } private static void copyZipButStripSignatures(InputStream rawIn, OutputStream rawOut) throws IOException { ZipInputStream in = null; ZipOutputStream out = null; - try { - in = new ZipInputStream(rawIn); - out = new ZipOutputStream(rawOut); - - ZipEntry zipEntry; - while ((zipEntry = in.getNextEntry()) != null) { - if (zipEntry.getName().matches("META-INF/.*\\.(SF|RSA)")) continue; - out.putNextEntry(zipEntry); - copy(in, out); - } - } finally { - closeQuietly(in); - closeQuietly(out); + + in = new ZipInputStream(rawIn); + out = new ZipOutputStream(rawOut); + + ZipEntry zipEntry; + while ((zipEntry = in.getNextEntry()) != null) { + if (zipEntry.getName().matches("META-INF/.*\\.(SF|RSA)")) continue; + out.putNextEntry(zipEntry); + copy(in, out); } + out.close(); // zip streams buffer. } private static void copy(InputStream from, OutputStream to) throws IOException { @@ -131,21 +130,11 @@ private static void copy(InputStream from, OutputStream to) throws IOException { } } - private static void closeQuietly(Closeable closeable) { - if (closeable != null) { - try { - closeable.close(); - } catch (IOException ignore) { - } - } - } - private static InputStream getStreamForUrl(String url) throws IOException, MalformedURLException { HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); connection.setRequestProperty("User-Agent", "lombok"); connection.setRequestProperty("Accept", "*/*"); - InputStream in = new BufferedInputStream(connection.getInputStream()); - return in; + return new BufferedInputStream(connection.getInputStream()); } private static void writeEclipseLibrary(String target, String eclipseVersion) throws IOException { From 3394b6ef7c00b25ad4ad4b64ac5f879aa16e4db5 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Thu, 24 Oct 2024 22:32:51 +0200 Subject: [PATCH 107/118] eclipse downloader: When downloading sources, accept failure. --- .../eclipse/dependencies/DownloadEclipseDependencies.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java index 20b590e63e..e2ef2bbeac 100644 --- a/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java +++ b/src/support/lombok/eclipse/dependencies/DownloadEclipseDependencies.java @@ -23,7 +23,6 @@ import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; -import java.io.Closeable; import java.io.File; import java.io.FileOutputStream; import java.io.FilenameFilter; @@ -73,7 +72,12 @@ public static void main(String[] args) throws Exception { // Download artifact source int index = artifact.lastIndexOf("_"); String source = artifact.substring(0, index) + ".source" + artifact.substring(index); - downloadFile(source, pluginSource, pluginTarget); + try { + downloadFile(source, pluginSource, pluginTarget); + } catch (Exception e) { + // It's just the source; sometimes these aren't present (specifically, `org.eclipse.swt` doesn't currently appear to have the sources, at least not using the `_sources` naming scheme). Don't fail, just skip them. + System.out.println("[failed]"); + } } writeEclipseLibrary(target, eclipseVersion); From 9af596e29ecb0375d3474e4de7299cb21ecadbd6 Mon Sep 17 00:00:00 2001 From: tamila-krashtan Date: Sat, 26 Oct 2024 17:58:00 +0300 Subject: [PATCH 108/118] Fix typo in With.html --- website/templates/features/With.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/features/With.html b/website/templates/features/With.html index 867c17eb9d..f4809d2647 100644 --- a/website/templates/features/With.html +++ b/website/templates/features/With.html @@ -27,7 +27,7 @@ <@f.snippets name="With" /> <@f.confKeys> - <>
+
lombok.accessors.prefix += a field prefix (default: empty list)
This is a list property; entries can be added with the += operator. Inherited prefixes from parent config files can be removed with the -= operator. Lombok will strip any matching field prefix from the name of a field in order to determine the name of the getter/setter to generate. For example, if m is one of the prefixes listed in this setting, then a field named mFoobar will result in a getter named getFoobar(), not getMFoobar(). An explicitly configured prefix parameter of an @Accessors annotation takes precedence over this setting. From 033870592900e47d9855d190924d0addecddad61 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 15 Nov 2024 01:20:14 +0100 Subject: [PATCH 109/118] Revert "[fixes #3116] Add multi round support for mapstruct": This reverts commit 04c9755b39617a0e222a8e88ef44677b34044ab2. The nature of the fix is to simply scan the TypeMirror for 'lombok shenanigans'; if it finds them, the type is not complete; if there are none, the type is. This fundamentally does not work - lombok shenanigans may remain even if lombok is done (`@lombok.NonNull` for example), and lombok shenanigans don't just appear as annotations on the type; they can appear in many forms: Annotations on local var decls, or even method calls to `Lombok.safeDeNull` or whatnot. safeDenull is made up, but we might add it someday. `@Getter` on a field isn't though, and suffers from the same problem. --- AUTHORS | 1 - .../lombok/mapstruct/NotifierHider.java | 36 ++++++++++--------- .../lombok/launch/AnnotationProcessor.java | 5 +++ 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/AUTHORS b/AUTHORS index 67e8006023..a8c9bcc459 100755 --- a/AUTHORS +++ b/AUTHORS @@ -1,7 +1,6 @@ Lombok contributors in alphabetical order: Adam Juraszek -Aleksandar Kanchev <136312841+kanchev1@users.noreply.github.com> Aleksandr Zhelezniak Amine Touzani Andre Brait diff --git a/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java b/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java index 834b5bf2e0..222e9c0baf 100644 --- a/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java +++ b/src/bindings/mapstruct/lombok/mapstruct/NotifierHider.java @@ -1,29 +1,33 @@ package lombok.mapstruct; -import org.mapstruct.ap.spi.AstModifyingAnnotationProcessor; +import java.lang.reflect.Field; -import javax.lang.model.element.AnnotationMirror; import javax.lang.model.type.TypeMirror; -import java.util.List; -/** - * Report to MapStruct that a type is completed when there aren't any Lombok annotations left on it. Lombok annotations - * are removed whenever a class is processed. This way, annotations which require multiple rounds to process are also - * correctly handled, and MapStruct processing will be delayed until Lombok completely finishes processing required types. - */ +import org.mapstruct.ap.spi.AstModifyingAnnotationProcessor; + class NotifierHider { public static class AstModificationNotifier implements AstModifyingAnnotationProcessor { - @Override - public boolean isTypeComplete(TypeMirror typeMirror) { + private static Field lombokInvoked; + + @Override public boolean isTypeComplete(TypeMirror type) { if (System.getProperty("lombok.disable") != null) return true; - List annotationMirrors = typeMirror.getAnnotationMirrors(); - if (annotationMirrors == null || annotationMirrors.isEmpty()) return true; - - for (AnnotationMirror annotationMirror : annotationMirrors) { - String annotationName = String.valueOf(annotationMirror); - if (annotationName.startsWith("@lombok.")) return false; + return isLombokInvoked(); + } + + private static boolean isLombokInvoked() { + if (lombokInvoked != null) { + try { + return lombokInvoked.getBoolean(null); + } catch (Exception e) {} + return true; } + try { + Class data = Class.forName("lombok.launch.AnnotationProcessorHider$AstModificationNotifierData"); + lombokInvoked = data.getField("lombokInvoked"); + return lombokInvoked.getBoolean(null); + } catch (Exception e) {} return true; } } diff --git a/src/launch/lombok/launch/AnnotationProcessor.java b/src/launch/lombok/launch/AnnotationProcessor.java index 28a28d723a..456a8cefca 100644 --- a/src/launch/lombok/launch/AnnotationProcessor.java +++ b/src/launch/lombok/launch/AnnotationProcessor.java @@ -39,6 +39,10 @@ class AnnotationProcessorHider { + public static class AstModificationNotifierData { + public volatile static boolean lombokInvoked = false; + } + public static class AnnotationProcessor extends AbstractProcessor { private final AbstractProcessor instance = createWrappedInstance(); @@ -56,6 +60,7 @@ public static class AnnotationProcessor extends AbstractProcessor { @Override public void init(ProcessingEnvironment processingEnv) { disableJava9SillyWarning(); + AstModificationNotifierData.lombokInvoked = true; instance.init(processingEnv); super.init(processingEnv); } From 91d79ff9fbef24494039a9f37498a4fd4386459e Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 15 Nov 2024 01:37:45 +0100 Subject: [PATCH 110/118] [release] pre-release version bump --- doc/changelog.markdown | 2 +- src/core/lombok/core/Version.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 96894b96f3..b3a8b5858c 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -1,7 +1,7 @@ Lombok Changelog ---------------- -### v1.18.35 "Edgy Guinea Pig" +### v1.18.36 (November 15th, 2024) * PLATFORM: JDK23 support added. * BUGFIX: Eclipse projects using the `com.pro-crafting.tools:jasperreports-maven-plugin` will now compile. diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java index 0e18719b44..582741fd57 100644 --- a/src/core/lombok/core/Version.java +++ b/src/core/lombok/core/Version.java @@ -30,9 +30,9 @@ public class Version { // ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries). // Note: In 'X.Y.Z', if Z is odd, its a snapshot build built from the repository, so many different 0.10.3 versions can exist, for example. // Official builds always end in an even number. (Since 0.10.2). - private static final String VERSION = "1.18.35"; - private static final String RELEASE_NAME = "Edgy Guinea Pig"; -// private static final String RELEASE_NAME = "Envious Ferret"; + private static final String VERSION = "1.18.36"; +// private static final String RELEASE_NAME = "Edgy Guinea Pig"; + private static final String RELEASE_NAME = "Envious Ferret"; // Named version history: // Angry Butterfly From 8ae385ce1487f3be498dabc08f9cc2153e8fd89e Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 15 Nov 2024 01:48:15 +0100 Subject: [PATCH 111/118] [release] post-release version bump --- doc/changelog.markdown | 3 +++ src/core/lombok/core/Version.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index b3a8b5858c..469a638c40 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -1,6 +1,9 @@ Lombok Changelog ---------------- +### v1.18.37 "Edgy Guinea Pig" +* We recently released v1.18.36; there is no edge release since then. + ### v1.18.36 (November 15th, 2024) * PLATFORM: JDK23 support added. * BUGFIX: Eclipse projects using the `com.pro-crafting.tools:jasperreports-maven-plugin` will now compile. diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java index 582741fd57..789bbf5e90 100644 --- a/src/core/lombok/core/Version.java +++ b/src/core/lombok/core/Version.java @@ -30,9 +30,9 @@ public class Version { // ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries). // Note: In 'X.Y.Z', if Z is odd, its a snapshot build built from the repository, so many different 0.10.3 versions can exist, for example. // Official builds always end in an even number. (Since 0.10.2). - private static final String VERSION = "1.18.36"; -// private static final String RELEASE_NAME = "Edgy Guinea Pig"; - private static final String RELEASE_NAME = "Envious Ferret"; + private static final String VERSION = "1.18.37"; + private static final String RELEASE_NAME = "Edgy Guinea Pig"; +// private static final String RELEASE_NAME = "Envious Ferret"; // Named version history: // Angry Butterfly From 6dc461a13aae607780a3ef3dfd68dda7c8abb1b2 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Sat, 23 Nov 2024 13:23:01 +0100 Subject: [PATCH 112/118] [ci] Switch to Ubuntu 24.04 (ships with ant 1.10.14) --- .github/workflows/ant.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 26fe5426a3..a216ebba60 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout @@ -38,7 +38,7 @@ jobs: test-javac: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: build env: EA_JDK: 23 @@ -71,15 +71,6 @@ jobs: website: jdk.java.net release: ${{ matrix.jdk }} version: latest - - - name: Install Ant - env: - ANT_VERSION: 1.10.14 - run: | - wget https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VERSION-bin.zip - unzip apache-ant-$ANT_VERSION-bin.zip -d "${HOME}" - echo "ANT_HOME=${HOME}/apache-ant-$ANT_VERSION" >> $GITHUB_ENV - echo "${HOME}/apache-ant-$ANT_VERSION/bin" >> $GITHUB_PATH - name: Cache dependencies uses: actions/cache@v4 @@ -95,7 +86,7 @@ jobs: run: ant -noinput test.${{ matrix.goal }} test-eclipse: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: build strategy: matrix: @@ -164,7 +155,7 @@ jobs: run: xvfb-run ant -noinput dist test.${{ matrix.version }} docker-integration-test: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: build strategy: matrix: From b313df556d9f04b343769ba336e7a66d94e6c419 Mon Sep 17 00:00:00 2001 From: Anshuman Mishra Date: Fri, 20 Dec 2024 23:50:39 -0800 Subject: [PATCH 113/118] fix: Don't alter the AST node positions of original code. --- .../javac/handlers/HandleConstructor.java | 2 +- .../javac/handlers/HandleEqualsAndHashCode.java | 2 +- .../lombok/javac/handlers/HandleGetter.java | 2 +- .../javac/handlers/HandleJacksonized.java | 2 +- .../lombok/javac/handlers/HandleSetter.java | 4 ++-- src/core/lombok/javac/handlers/HandleWith.java | 4 ++-- .../lombok/javac/handlers/HandleWithBy.java | 2 +- .../lombok/javac/handlers/JavacHandlerUtil.java | 17 +++++++++++------ .../javac/handlers/JavacSingularsRecipes.java | 4 ++-- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/core/lombok/javac/handlers/HandleConstructor.java b/src/core/lombok/javac/handlers/HandleConstructor.java index 31d1544592..ca885cd616 100644 --- a/src/core/lombok/javac/handlers/HandleConstructor.java +++ b/src/core/lombok/javac/handlers/HandleConstructor.java @@ -364,7 +364,7 @@ public static void addConstructorProperties(JCModifiers mods, JavacNode node, Li if (addConstructorProperties && !isLocalType(typeNode) && LombokOptionsFactory.getDelombokOptions(typeNode.getContext()).getFormatPreferences().generateConstructorProperties()) { addConstructorProperties(mods, typeNode, fieldsToParam); } - if (onConstructor != null) mods.annotations = mods.annotations.appendList(copyAnnotations(onConstructor)); + if (onConstructor != null) mods.annotations = mods.annotations.appendList(copyAnnotations(onConstructor, maker)); return recursiveSetGeneratedBy(maker.MethodDef(mods, typeNode.toName(""), null, List.nil(), params.toList(), List.nil(), maker.Block(0L, nullChecks.appendList(assigns).toList()), null), source); diff --git a/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java index 259880fa2f..40854a34dd 100644 --- a/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java +++ b/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java @@ -190,7 +190,7 @@ public void generateMethods(JavacNode typeNode, JavacNode source, java.util.List injectMethod(typeNode, equalsMethod); if (needsCanEqual && canEqualExists == MemberExistsResult.NOT_EXISTS) { - JCMethodDecl canEqualMethod = createCanEqual(typeNode, source, copyAnnotations(onParam)); + JCMethodDecl canEqualMethod = createCanEqual(typeNode, source, copyAnnotations(onParam, typeNode.getTreeMaker())); injectMethod(typeNode, canEqualMethod); } diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index 30224f56c3..41d4e09245 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.java @@ -250,7 +250,7 @@ public JCMethodDecl createGetter(long access, JavacNode field, JavacTreeMaker tr List copyableAnnotations = findCopyableAnnotations(field); List delegates = findDelegatesAndRemoveFromField(field); - List annsOnMethod = copyAnnotations(onMethod).appendList(copyableAnnotations); + List annsOnMethod = copyAnnotations(onMethod, field.getTreeMaker()).appendList(copyableAnnotations); if (field.isFinal()) { if (getCheckerFrameworkVersion(field).generatePure()) annsOnMethod = annsOnMethod.prepend(treeMaker.Annotation(genTypeRef(field, CheckerFrameworkVersion.NAME__PURE), List.nil())); } else { diff --git a/src/core/lombok/javac/handlers/HandleJacksonized.java b/src/core/lombok/javac/handlers/HandleJacksonized.java index 3ee0eec4e0..bec2d771f9 100644 --- a/src/core/lombok/javac/handlers/HandleJacksonized.java +++ b/src/core/lombok/javac/handlers/HandleJacksonized.java @@ -136,7 +136,7 @@ public class HandleJacksonized extends JavacAnnotationHandler { // Copy annotations from the class to the builder class. List copyableAnnotations = findJacksonAnnotationsOnClass(tdNode); - List copiedAnnotations = copyAnnotations(copyableAnnotations); + List copiedAnnotations = copyAnnotations(copyableAnnotations, maker); for (JCAnnotation anno : copiedAnnotations) { recursiveSetGeneratedBy(anno, annotationNode); } diff --git a/src/core/lombok/javac/handlers/HandleSetter.java b/src/core/lombok/javac/handlers/HandleSetter.java index 380f71ca21..bdb5b1acc7 100644 --- a/src/core/lombok/javac/handlers/HandleSetter.java +++ b/src/core/lombok/javac/handlers/HandleSetter.java @@ -241,7 +241,7 @@ public static JCMethodDecl createSetterWithRecv(long access, boolean deprecate, List copyableAnnotations = findCopyableAnnotations(field); Name methodName = field.toName(setterName); - List annsOnParam = copyAnnotations(onParam).appendList(copyableAnnotations); + List annsOnParam = copyAnnotations(onParam, treeMaker).appendList(copyableAnnotations); long flags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, field.getContext()); JCExpression pType = cloneType(treeMaker, fieldDecl.vartype, source); @@ -274,7 +274,7 @@ public static JCMethodDecl createSetterWithRecv(long access, boolean deprecate, List throwsClauses = List.nil(); JCExpression annotationMethodDefaultValue = null; - List annsOnMethod = mergeAnnotations(copyAnnotations(onMethod), findCopyableToSetterAnnotations(field)); + List annsOnMethod = mergeAnnotations(copyAnnotations(onMethod, treeMaker), findCopyableToSetterAnnotations(field)); if (isFieldDeprecated(field) || deprecate) { annsOnMethod = annsOnMethod.prepend(treeMaker.Annotation(genJavaLangTypeRef(field, "Deprecated"), List.nil())); } diff --git a/src/core/lombok/javac/handlers/HandleWith.java b/src/core/lombok/javac/handlers/HandleWith.java index c7fa053127..52f2c1928d 100644 --- a/src/core/lombok/javac/handlers/HandleWith.java +++ b/src/core/lombok/javac/handlers/HandleWith.java @@ -229,7 +229,7 @@ public JCMethodDecl createWith(long access, JavacNode field, JavacTreeMaker make JCBlock methodBody = null; long flags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, field.getContext()); - List annsOnParam = copyAnnotations(onParam).appendList(copyableAnnotations); + List annsOnParam = copyAnnotations(onParam, maker).appendList(copyableAnnotations); JCExpression pType = cloneType(maker, fieldDecl.vartype, source); JCVariableDecl param = maker.VarDef(maker.Modifiers(flags, annsOnParam), fieldDecl.name, pType, null); @@ -278,7 +278,7 @@ public JCMethodDecl createWith(long access, JavacNode field, JavacTreeMaker make List throwsClauses = List.nil(); JCExpression annotationMethodDefaultValue = null; - List annsOnMethod = copyAnnotations(onMethod); + List annsOnMethod = copyAnnotations(onMethod, maker); CheckerFrameworkVersion checkerFramework = getCheckerFrameworkVersion(source); if (checkerFramework.generateSideEffectFree()) annsOnMethod = annsOnMethod.prepend(maker.Annotation(genTypeRef(source, CheckerFrameworkVersion.NAME__SIDE_EFFECT_FREE), List.nil())); diff --git a/src/core/lombok/javac/handlers/HandleWithBy.java b/src/core/lombok/javac/handlers/HandleWithBy.java index ff67fd9fd9..7978928fc9 100644 --- a/src/core/lombok/javac/handlers/HandleWithBy.java +++ b/src/core/lombok/javac/handlers/HandleWithBy.java @@ -321,7 +321,7 @@ public JCMethodDecl createWithBy(long access, JavacNode field, JavacTreeMaker ma List throwsClauses = List.nil(); JCExpression annotationMethodDefaultValue = null; - List annsOnMethod = copyAnnotations(onMethod); + List annsOnMethod = copyAnnotations(onMethod, maker); CheckerFrameworkVersion checkerFramework = getCheckerFrameworkVersion(source); if (checkerFramework.generateSideEffectFree()) annsOnMethod = annsOnMethod.prepend(maker.Annotation(genTypeRef(source, CheckerFrameworkVersion.NAME__SIDE_EFFECT_FREE), List.nil())); diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index 38658bb622..15c47a9360 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -1746,7 +1746,8 @@ public static List findCopyableAnnotations(JavacNode node) { } } } - return copyAnnotations(result.toList()); + + return copyAnnotations(result.toList(), node.getTreeMaker()); } /** @@ -1784,7 +1785,7 @@ private static List findAnnotationsInList(JavacNode node, java.uti if (annoName == null) return List.nil(); if (!annoName.isEmpty()) { - for (String bn : annotationsToFind) if (typeMatches(bn, node, annoName)) return List.of(anno); + for (String bn : annotationsToFind) if (typeMatches(bn, node, annoName)) return copyAnnotations(List.of(anno), node.getTreeMaker()); } ListBuffer result = new ListBuffer(); @@ -1799,7 +1800,7 @@ private static List findAnnotationsInList(JavacNode node, java.uti } } } - return copyAnnotations(result.toList()); + return copyAnnotations(result.toList(), node.getTreeMaker()); } /** @@ -2108,14 +2109,18 @@ public static void sanityCheckForMethodGeneratingAnnotationsOnBuilderClass(Javac errorNode.addError(out.append(" are not allowed on builder classes.").toString()); } - static List copyAnnotations(List in) { + static List copyAnnotations(List in, JavacTreeMaker maker) { ListBuffer out = new ListBuffer(); for (JCExpression expr : in) { if (!(expr instanceof JCAnnotation)) continue; - out.append((JCAnnotation) expr.clone()); + out.append(copyAnnotation((JCAnnotation) expr, maker)); } return out.toList(); } + + static JCAnnotation copyAnnotation(JCAnnotation annotation, JavacTreeMaker maker) { + return maker.Annotation(annotation.annotationType, annotation.args); + } static List mergeAnnotations(List a, List b) { if (a == null || a.isEmpty()) return b; @@ -2266,7 +2271,7 @@ private static JCExpression cloneType0(JavacTreeMaker maker, JCTree in) { if (JCAnnotatedTypeReflect.is(in)) { JCExpression underlyingType = cloneType0(maker, JCAnnotatedTypeReflect.getUnderlyingType(in)); - List anns = copyAnnotations(JCAnnotatedTypeReflect.getAnnotations(in)); + List anns = copyAnnotations(JCAnnotatedTypeReflect.getAnnotations(in), maker); return JCAnnotatedTypeReflect.create(anns, underlyingType); } diff --git a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java index 4954a61082..938d6e8fae 100644 --- a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java +++ b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java @@ -315,7 +315,7 @@ private void generateSingularMethod(CheckerFrameworkVersion cfv, boolean depreca if (!setterPrefix.isEmpty()) name = builderType.toName(HandlerUtil.buildAccessorName(source, setterPrefix, name.toString())); statements.prepend(createConstructBuilderVarIfNeeded(maker, data, builderType, source)); - List methodAnnotations = copyAnnotations(findCopyableToBuilderSingularSetterAnnotations(data.annotation.up())); + List methodAnnotations = copyAnnotations(findCopyableToBuilderSingularSetterAnnotations(data.annotation.up()), maker); finishAndInjectMethod(cfv, maker, returnType, returnStatement, data, builderType, source, deprecate, statements, name, params, methodAnnotations, access, null); } @@ -362,7 +362,7 @@ private void generatePluralMethod(CheckerFrameworkVersion cfv, boolean deprecate statements.prepend(JavacHandlerUtil.generateNullCheck(maker, null, data.getPluralName(), builderType, "%s cannot be null")); } - List methodAnnotations = copyAnnotations(findCopyableToSetterAnnotations(data.annotation.up())); + List methodAnnotations = copyAnnotations(findCopyableToSetterAnnotations(data.annotation.up()), maker); finishAndInjectMethod(cfv, maker, returnType, returnStatement, data, builderType, source, deprecate, statements, name, List.of(param), methodAnnotations, access, ignoreNullCollections); } From fab7ffdc2b5b04358ffd28e38c8e071817a4decb Mon Sep 17 00:00:00 2001 From: Anshuman Mishra Date: Fri, 27 Dec 2024 14:34:00 -0800 Subject: [PATCH 114/118] Add unit test and cover missing cases --- .../javac/handlers/JavacHandlerUtil.java | 7 +- src/delombok/lombok/delombok/Delombok.java | 6 ++ test/core/src/lombok/RunTestsViaDelombok.java | 66 +++++++++++++++++-- 3 files changed, 71 insertions(+), 8 deletions(-) diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index 15c47a9360..5c9f80c6af 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -38,6 +38,7 @@ import java.util.Map; import java.util.regex.Pattern; +import com.sun.source.tree.TreeVisitor; import com.sun.tools.javac.code.Attribute; import com.sun.tools.javac.code.BoundKind; import com.sun.tools.javac.code.Flags; @@ -75,6 +76,7 @@ import com.sun.tools.javac.tree.JCTree.JCVariableDecl; import com.sun.tools.javac.tree.JCTree.JCWildcard; import com.sun.tools.javac.tree.JCTree.TypeBoundKind; +import com.sun.tools.javac.tree.TreeCopier; import com.sun.tools.javac.tree.TreeMaker; import com.sun.tools.javac.tree.TreeScanner; import com.sun.tools.javac.util.Context; @@ -2117,9 +2119,10 @@ static List copyAnnotations(List in, Javac } return out.toList(); } - + static JCAnnotation copyAnnotation(JCAnnotation annotation, JavacTreeMaker maker) { - return maker.Annotation(annotation.annotationType, annotation.args); + TreeVisitor visitor = new TreeCopier(maker.getUnderlyingTreeMaker()); + return (JCAnnotation) visitor.visitAnnotation(annotation, null); } static List mergeAnnotations(List a, List b) { diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java index e5fb440e7a..a0510f6c6b 100755 --- a/src/delombok/lombok/delombok/Delombok.java +++ b/src/delombok/lombok/delombok/Delombok.java @@ -103,6 +103,7 @@ public void setWriter(Writer writer) { private LinkedHashMap fileToBase = new LinkedHashMap(); private List filesToParse = new ArrayList(); private Map formatPrefs = new HashMap(); + private List preLombokProcessors = new ArrayList(); private List additionalAnnotationProcessors = new ArrayList(); /** If null, output to standard out. */ @@ -653,6 +654,10 @@ public void addFile(File base, String fileName) throws IOException { fileToBase.put(f, base); } + public void addPreLombokProcessors(AbstractProcessor processor) { + preLombokProcessors.add(processor); + } + public void addAdditionalAnnotationProcessor(AbstractProcessor processor) { additionalAnnotationProcessors.add(processor); } @@ -735,6 +740,7 @@ public boolean delombok() throws IOException { Map baseMap = new IdentityHashMap(); Set processors = new LinkedHashSet(); + processors.addAll(preLombokProcessors); processors.add(new lombok.javac.apt.LombokProcessor()); processors.addAll(additionalAnnotationProcessors); diff --git a/test/core/src/lombok/RunTestsViaDelombok.java b/test/core/src/lombok/RunTestsViaDelombok.java index 918a0de455..1051cec85a 100644 --- a/test/core/src/lombok/RunTestsViaDelombok.java +++ b/test/core/src/lombok/RunTestsViaDelombok.java @@ -33,6 +33,8 @@ import java.util.Collection; import java.util.Collections; import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; import java.util.IdentityHashMap; import java.util.List; import java.util.Locale; @@ -83,7 +85,11 @@ public TransformationResult transformCode(final File file, TestParameters parame delombok.setDiagnosticsListener(new CapturingDiagnosticListener(file, result.getMessages())); - if (parameters.isCheckPositions()) delombok.addAdditionalAnnotationProcessor(new ValidatePositionProcessor(parameters.getMinVersion())); + if (parameters.isCheckPositions()) { + NodePositionMapper nodePositionMapper = new NodePositionMapper(); + delombok.addPreLombokProcessors(nodePositionMapper); + delombok.addAdditionalAnnotationProcessor(new ValidatePositionProcessor(parameters.getMinVersion(), nodePositionMapper)); + } delombok.addAdditionalAnnotationProcessor(new ValidateTypesProcessor()); delombok.addAdditionalAnnotationProcessor(new ValidateNoDuplicateTreeNodeProcessor()); @@ -105,15 +111,35 @@ public TransformationResult transformCode(final File file, TestParameters parame } } + public static class NodePositionMapper extends TreeProcessor { + Map nodePositions = new HashMap<>(); + + @Override void processCompilationUnit(final JCCompilationUnit unit) { + unit.accept(new TreeScanner() { + @Override public void scan(JCTree tree) { + if (tree == null) return; + if (tree.pos >= 0) { + nodePositions.put(tree, tree.pos); + } + super.scan(tree); + + } + }); + } + + } + public static class ValidatePositionProcessor extends TreeProcessor { private final int version; + private final NodePositionMapper nodePositionMapper; - public ValidatePositionProcessor(int version) { + public ValidatePositionProcessor(int version, NodePositionMapper nodePositionMapper) { this.version = version; + this.nodePositionMapper = nodePositionMapper; } private String craftFailMsg(String problematicNode, Deque astContext) { - StringBuilder msg = new StringBuilder(problematicNode).append(" position of node not set: "); + StringBuilder msg = new StringBuilder(problematicNode); for (JCTree t : astContext) { msg.append("\n ").append(t.getClass().getSimpleName()); String asStr = t.toString(); @@ -125,12 +151,30 @@ private String craftFailMsg(String problematicNode, Deque astContext) { return msg.append("\n-------").toString(); } + private boolean isLombokGenerated(JCTree tree) { + List annotations = com.sun.tools.javac.util.List.nil(); + if (tree instanceof JCMethodDecl) { + annotations = ((JCMethodDecl) tree).mods.annotations; + } + if (tree instanceof JCVariableDecl) { + annotations = ((JCVariableDecl) tree).mods.annotations; + } + for (JCAnnotation annotation: annotations) { + if ("lombok.Generated".equals(annotation.getAnnotationType().toString())) { + return true; + } + } + return false; + } + @Override void processCompilationUnit(final JCCompilationUnit unit) { final Deque astContext = new ArrayDeque(); + final Deque lombokGeneratedNodes = new ArrayDeque(); unit.accept(new TreeScanner() { @Override public void scan(JCTree tree) { if (tree == null) return; if (tree instanceof JCMethodDecl && (((JCMethodDecl) tree).mods.flags & Flags.GENERATEDCONSTR) != 0) return; + if (isLombokGenerated(tree)) lombokGeneratedNodes.add(tree); astContext.push(tree); try { if (tree instanceof JCModifiers) return; @@ -153,16 +197,26 @@ private String craftFailMsg(String problematicNode, Deque astContext) { if (tree instanceof JCVariableDecl && (((JCVariableDecl) tree).mods.flags & Javac.GENERATED_MEMBER) != 0) return; - if (check && tree.pos == -1) fail(craftFailMsg("Start", astContext)); + if (check && tree.pos == -1) fail(craftFailMsg("Start position of node not set: ", astContext)); + // Ignore ast position validation on lombok generated nodes. + if (lombokGeneratedNodes.isEmpty()) { + Integer expectedPos = nodePositionMapper.nodePositions.get(tree); + if (expectedPos != null && !expectedPos.equals(tree.pos)) { + fail(craftFailMsg(String.format("Expected node position %d, actual node position %d: ", expectedPos, tree.pos), astContext)); + } + } if (check && Javac.getEndPosition(tree, unit) == -1) { - fail(craftFailMsg("End", astContext)); + fail(craftFailMsg("End position of node not set: ", astContext)); } } finally { try { super.scan(tree); } finally { - astContext.pop(); + JCTree _tree = astContext.pop(); + if (!lombokGeneratedNodes.isEmpty() && lombokGeneratedNodes.peek().equals(_tree)) { + lombokGeneratedNodes.pop(); + } } } } From d32de67f16c762c0ca56502c55670e31ab9b295d Mon Sep 17 00:00:00 2001 From: Anshuman Mishra Date: Sat, 28 Dec 2024 09:34:28 -0800 Subject: [PATCH 115/118] Syntax as pre Pre JDK 8 --- test/core/src/lombok/RunTestsViaDelombok.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/src/lombok/RunTestsViaDelombok.java b/test/core/src/lombok/RunTestsViaDelombok.java index 1051cec85a..8b3efc17dc 100644 --- a/test/core/src/lombok/RunTestsViaDelombok.java +++ b/test/core/src/lombok/RunTestsViaDelombok.java @@ -112,7 +112,7 @@ public TransformationResult transformCode(final File file, TestParameters parame } public static class NodePositionMapper extends TreeProcessor { - Map nodePositions = new HashMap<>(); + Map nodePositions = new HashMap(); @Override void processCompilationUnit(final JCCompilationUnit unit) { unit.accept(new TreeScanner() { From 9536c297eac49753792dcc20297e0e043661f209 Mon Sep 17 00:00:00 2001 From: Anshuman Mishra Date: Fri, 3 Jan 2025 13:04:26 -0800 Subject: [PATCH 116/118] Remove annotation skip for duplicate check --- AUTHORS | 1 + test/core/src/lombok/RunTestsViaDelombok.java | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/AUTHORS b/AUTHORS index a8c9bcc459..ebbc5b3765 100755 --- a/AUTHORS +++ b/AUTHORS @@ -4,6 +4,7 @@ Adam Juraszek Aleksandr Zhelezniak Amine Touzani Andre Brait +Anshuman Mishra Bulgakov Alexander Caleb Brinkman Christian Nüssgens diff --git a/test/core/src/lombok/RunTestsViaDelombok.java b/test/core/src/lombok/RunTestsViaDelombok.java index 8b3efc17dc..80eb24bed1 100644 --- a/test/core/src/lombok/RunTestsViaDelombok.java +++ b/test/core/src/lombok/RunTestsViaDelombok.java @@ -34,7 +34,6 @@ import java.util.Collections; import java.util.Deque; import java.util.HashMap; -import java.util.HashSet; import java.util.IdentityHashMap; import java.util.List; import java.util.Locale; @@ -343,14 +342,6 @@ public void scan(JCTree tree) { super.scan(tree); parents.pop(); } - - /** - * We always generate shallow copies for annotations - */ - @Override - public void visitAnnotation(JCAnnotation tree) { - return; - } }); } From ba3c92236096be9896d4d37404b62a2193ce9607 Mon Sep 17 00:00:00 2001 From: Anshuman Mishra Date: Fri, 3 Jan 2025 13:08:23 -0800 Subject: [PATCH 117/118] Nit --- src/core/lombok/javac/handlers/HandleGetter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index 41d4e09245..03dd566c06 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.java @@ -250,7 +250,7 @@ public JCMethodDecl createGetter(long access, JavacNode field, JavacTreeMaker tr List copyableAnnotations = findCopyableAnnotations(field); List delegates = findDelegatesAndRemoveFromField(field); - List annsOnMethod = copyAnnotations(onMethod, field.getTreeMaker()).appendList(copyableAnnotations); + List annsOnMethod = copyAnnotations(onMethod, treeMaker).appendList(copyableAnnotations); if (field.isFinal()) { if (getCheckerFrameworkVersion(field).generatePure()) annsOnMethod = annsOnMethod.prepend(treeMaker.Annotation(genTypeRef(field, CheckerFrameworkVersion.NAME__PURE), List.nil())); } else { From 9f9668f18b731118c67c6e31f09f36f612a0a038 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 7 Jan 2025 10:38:22 +0100 Subject: [PATCH 118/118] Remove Fern as sponsor --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 88fc6e534f..afc38a7237 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,5 @@ # Project Lombok -Sponsored Content -> [![Sponsor logo Fern](https://projectlombok.org/files/logos/fern.png)](https://form.typeform.com/to/bShdJw7z) -> Offer API docs that look as good as Stripe's using our sponsor [Fern](https://form.typeform.com/to/bShdJw7z). Request a [preview of your docs](https://form.typeform.com/to/bShdJw7z) on Fern. - -
- **Project Lombok** is a java library that automatically plugs into your editor and build tools, spicing up your java. Never write another getter or equals method again, with one annotation your class has a fully featured builder, automate your logging variables, and much more.