diff --git a/README.md b/README.md index 38d3d85e7..b44cc805c 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ lombok-intellij-plugin [![Donate](https://www.paypal.com/en_US/i/btn/btn_donateC Provides support for lombok annotations to write great Java code with IntelliJ IDEA. -**Last version (0.25) released on 01.05.2019** +**Last version (0.27) released on 03.10.2019** -Thirty version of plugin released. Contains a lot of bugfixes and some new features! +32nd version of plugin released. Contains a lot of bugfixes and long awaiting feature @SuperBuilder! Install it automatically from IntelliJ Idea plugin repository. -Tested and supports IntelliJ versions: 2016.2, 2016.3, 2017.X, 2018.X, 2019.1 +Tested and supports IntelliJ versions: 2016.2, 2016.3, 2017.X, 2018.X, 2019.1 and 2019.2 Last support for IntelliJ 15.0.6 and 2016.1 by plugin version 0.19! @@ -56,8 +56,6 @@ Features / Supports Many features of the plugin (including warnings) could be disabled through per-project settings. -__Note:__ To make use of plugin features like `@UtilityClass` and for _better_ `val` and `Value` support while using IntelliJ 14.1 - 2016.1, you need to enable "Runtime patching" in Plugin settings. This is __not__ needed with 2016.2 and higher. - Installation ------------ ### Plugin Installation @@ -87,7 +85,7 @@ In your `build.gradle`: ```groovy // 'compile' can be changed to 'compileOnly' for Gradle 2.12+ // or 'provided' if using 'propdeps' plugin from SpringSource -compile "org.projectlombok:lombok:1.18.8" +compile "org.projectlombok:lombok:1.18.10" ``` ##### Maven @@ -97,7 +95,7 @@ In your `pom.xml`: org.projectlombok lombok - 1.18.8 + 1.18.10 provided @@ -106,7 +104,7 @@ In your `pom.xml`: ##### Ivy In your `ivy.xml`: ```xml - + ``` IntelliJ and Eclipse compiler diff --git a/build.gradle b/build.gradle index 7a3093205..4bad80090 100644 --- a/build.gradle +++ b/build.gradle @@ -88,7 +88,7 @@ dependencies { lombok group: 'org.projectlombok', name: 'lombok', version: '1.18.10', classifier: 'sources', ext: 'jar' testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile group: 'org.mockito', name: 'mockito-core', version: '3.0.0' + testCompile group: 'org.mockito', name: 'mockito-core', version: '3.1.0' } // Tasks diff --git a/testData/inspection/lib/lombok-1.18.8.jar b/lib/lombok-1.18.10.jar similarity index 64% rename from testData/inspection/lib/lombok-1.18.8.jar rename to lib/lombok-1.18.10.jar index b1dd5a837..57ca61428 100644 Binary files a/testData/inspection/lib/lombok-1.18.8.jar and b/lib/lombok-1.18.10.jar differ diff --git a/parts/pluginChanges.html b/parts/pluginChanges.html index a82fac75d..52569ec74 100644 --- a/parts/pluginChanges.html +++ b/parts/pluginChanges.html @@ -9,6 +9,7 @@
  • Fixed #526: StackOverflow with LombokLightParameterListBuilder.equals
  • Fixed #660: Performance problems in autocomplete/code analysis
  • Fixed #663: Method with varArgs gives an error in IntelliJ
    • +
  • Fixed #670: Non-idempotent computation issue with @Delegate usages
  • Fixed #673: Add support for @With
    • diff --git a/parts/pluginDescription.html b/parts/pluginDescription.html index b41a9141f..87e4f7fc1 100644 --- a/parts/pluginDescription.html +++ b/parts/pluginDescription.html @@ -35,10 +35,10 @@

    IntelliJ Lombok plugin

  • @Wither
  • @With
  • @SneakyThrows
    • -
  • from Intellij 14.1 @val
    • -
  • from Intellij 15.0.2 @var
    • -
  • from Intellij 14.1 @var
    • -
  • from Intellij 2016.2 @UtilityClass
    • +
  • @val
    • +
  • @var
    • +
  • experimental @var
    • +
  • @UtilityClass
  • Lombok config system
  • Code inspections
  • Refactoring actions (lombok and delombok)
    • diff --git a/src/main/java/de/plushnikov/intellij/plugin/Version.java b/src/main/java/de/plushnikov/intellij/plugin/Version.java index 6051ef74c..a8a403450 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/Version.java +++ b/src/main/java/de/plushnikov/intellij/plugin/Version.java @@ -9,5 +9,5 @@ public interface Version { /** * Current version of lombok plugin */ - String LAST_LOMBOK_VERSION = "1.18.8"; + String LAST_LOMBOK_VERSION = "1.18.10"; } diff --git a/src/main/java/de/plushnikov/intellij/plugin/action/generate/LombokGenerateConstructorHandler.java b/src/main/java/de/plushnikov/intellij/plugin/action/generate/LombokGenerateConstructorHandler.java index 7c7f3c04e..38c66cb53 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/action/generate/LombokGenerateConstructorHandler.java +++ b/src/main/java/de/plushnikov/intellij/plugin/action/generate/LombokGenerateConstructorHandler.java @@ -6,7 +6,6 @@ import com.intellij.codeInsight.generation.GenerationInfo; import com.intellij.codeInsight.generation.PsiFieldMember; import com.intellij.codeInsight.generation.PsiGenerationInfo; -import com.intellij.openapi.extensions.Extensions; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiField; import com.intellij.psi.PsiModifier; @@ -27,7 +26,7 @@ public class LombokGenerateConstructorHandler extends GenerateConstructorHandler protected ClassMember[] getAllOriginalMembers(PsiClass aClass) { PsiField[] fields = aClass.getFields(); ArrayList array = new ArrayList<>(); - ImplicitUsageProvider[] implicitUsageProviders = Extensions.getExtensions(ImplicitUsageProvider.EP_NAME); + List implicitUsageProviders = ImplicitUsageProvider.EP_NAME.getExtensionList(); fieldLoop: for (PsiField field : fields) { if (field.hasModifierProperty(PsiModifier.STATIC)) { diff --git a/src/main/java/de/plushnikov/intellij/plugin/language/LombokConfigParserDefinition.java b/src/main/java/de/plushnikov/intellij/plugin/language/LombokConfigParserDefinition.java index 3b8af4d86..6ba70fa90 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/language/LombokConfigParserDefinition.java +++ b/src/main/java/de/plushnikov/intellij/plugin/language/LombokConfigParserDefinition.java @@ -58,10 +58,6 @@ public PsiFile createFile(FileViewProvider viewProvider) { return new LombokConfigFile(viewProvider); } - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { - return SpaceRequirements.MAY; - } - @NotNull public PsiElement createElement(ASTNode node) { return LombokConfigTypes.Factory.createElement(node); diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/SynchronizedProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/SynchronizedProcessor.java index 82f5dcbd0..9f4c91321 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/SynchronizedProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/SynchronizedProcessor.java @@ -9,7 +9,6 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiType; -import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import de.plushnikov.intellij.plugin.problem.LombokProblem; import de.plushnikov.intellij.plugin.problem.ProblemNewBuilder; @@ -63,7 +62,7 @@ public Collection verifyAnnotation(@NotNull PsiAnnotation psiAnno PsiQuickFixFactory.createModifierListFix(lockField, PsiModifier.FINAL, true, false)); } } else { - final PsiClassType javaLangObjectType = PsiType.getJavaLangObject(containingClass.getManager(), GlobalSearchScope.allScope(containingClass.getProject())); + final PsiClassType javaLangObjectType = PsiType.getJavaLangObject(containingClass.getManager(), containingClass.getResolveScope()); problemNewBuilder.addError(String.format("The field %s does not exist.", lockFieldName), PsiQuickFixFactory.createNewFieldFix(containingClass, lockFieldName, javaLangObjectType, "new Object()", PsiModifier.PRIVATE, PsiModifier.FINAL)); diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/ValProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/ValProcessor.java index c8c10a9a1..c91b261e0 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/ValProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/ValProcessor.java @@ -8,7 +8,6 @@ import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.RecursionManager; import com.intellij.psi.*; -import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.TypeConversionUtil; import de.plushnikov.intellij.plugin.problem.LombokProblem; import de.plushnikov.intellij.plugin.settings.ProjectSettings; @@ -166,7 +165,7 @@ public PsiType inferType(PsiTypeElement typeElement) { } if (null == psiType) { - psiType = PsiType.getJavaLangObject(typeElement.getManager(), GlobalSearchScope.allScope(typeElement.getProject())); + psiType = PsiType.getJavaLangObject(typeElement.getManager(), typeElement.getResolveScope()); } } return psiType; diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java index 40249c287..35c702661 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java @@ -3,7 +3,6 @@ import com.intellij.codeInspection.LocalQuickFix; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTypesUtil; import de.plushnikov.intellij.plugin.lombokconfig.ConfigKey; import de.plushnikov.intellij.plugin.problem.ProblemBuilder; @@ -172,7 +171,7 @@ private PsiMethod createEqualsMethod(@NotNull PsiClass psiClass, @NotNull PsiAnn .withMethodReturnType(PsiType.BOOLEAN) .withContainingClass(psiClass) .withNavigationElement(psiAnnotation) - .withFinalParameter("o", PsiType.getJavaLangObject(psiManager, GlobalSearchScope.allScope(psiClass.getProject()))); + .withFinalParameter("o", PsiType.getJavaLangObject(psiManager, psiClass.getResolveScope())); methodBuilder.withBody(PsiMethodUtil.createCodeBlockFromText(blockText, methodBuilder)); return methodBuilder; } @@ -201,7 +200,7 @@ private PsiMethod createCanEqualMethod(@NotNull PsiClass psiClass, @NotNull PsiA .withMethodReturnType(PsiType.BOOLEAN) .withContainingClass(psiClass) .withNavigationElement(psiAnnotation) - .withFinalParameter("other", PsiType.getJavaLangObject(psiManager, GlobalSearchScope.allScope(psiClass.getProject()))); + .withFinalParameter("other", PsiType.getJavaLangObject(psiManager, psiClass.getResolveScope())); methodBuilder.withBody(PsiMethodUtil.createCodeBlockFromText(blockText, methodBuilder)); return methodBuilder; } diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/handler/DelegateHandler.java b/src/main/java/de/plushnikov/intellij/plugin/processor/handler/DelegateHandler.java index 835ec3855..531451992 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/handler/DelegateHandler.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/handler/DelegateHandler.java @@ -1,9 +1,7 @@ package de.plushnikov.intellij.plugin.processor.handler; -import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.psi.*; -import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTypesUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.psi.util.TypeConversionUtil; @@ -20,7 +18,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; /** @@ -95,16 +93,15 @@ private Collection collectExcludeTypes(PsiAnnotation psiAnnotation) { } public void generateElements(@NotNull T psiElement, @NotNull PsiType psiElementType, @NotNull PsiAnnotation psiAnnotation, @NotNull List target) { - final Project project = psiElement.getProject(); final PsiManager manager = psiElement.getContainingFile().getManager(); - final Collection> includesMethods = new HashSet<>(); + final Collection> includesMethods = new LinkedHashSet<>(); final Collection types = collectDelegateTypes(psiAnnotation, psiElementType); addMethodsOfTypes(types, includesMethods); - final Collection> excludeMethods = new HashSet<>(); - PsiClassType javaLangObjectType = PsiType.getJavaLangObject(manager, GlobalSearchScope.allScope(project)); + final Collection> excludeMethods = new LinkedHashSet<>(); + PsiClassType javaLangObjectType = PsiType.getJavaLangObject(manager, psiElement.getResolveScope()); addMethodsOfType(javaLangObjectType, excludeMethods); final Collection excludes = collectExcludeTypes(psiAnnotation); @@ -121,7 +118,6 @@ public void generateElements(@NotNull T } } - private void addMethodsOfTypes(Collection types, Collection> includesMethods) { for (PsiType type : types) { addMethodsOfType(type, includesMethods); diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/handler/SuperBuilderHandler.java b/src/main/java/de/plushnikov/intellij/plugin/processor/handler/SuperBuilderHandler.java index 8c820b37f..44d4f222f 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/handler/SuperBuilderHandler.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/handler/SuperBuilderHandler.java @@ -157,6 +157,17 @@ private boolean shouldGenerateToBuilderMethods(@NotNull PsiAnnotation psiAnnotat return PsiAnnotationUtil.getBooleanAnnotationValue(psiAnnotation, TO_BUILDER_ANNOTATION_KEY, false); } + private String selectNonClashingNameFor(String classGenericName, Collection typeParamStrings) { + String result = classGenericName; + if (typeParamStrings.contains(classGenericName)) { + int counter = 2; + do { + result = classGenericName + counter++; + } while (typeParamStrings.contains(result)); + } + return result; + } + @NotNull public PsiClass createBuilderBaseClass(@NotNull PsiClass psiClass, @NotNull PsiAnnotation psiAnnotation) { String builderClassName = getBuilderClassName(psiClass); @@ -170,11 +181,13 @@ public PsiClass createBuilderBaseClass(@NotNull PsiClass psiClass, @NotNull PsiA .withModifier(PsiModifier.STATIC) .withModifier(PsiModifier.ABSTRACT); - final LightTypeParameterBuilder c = new LightTypeParameterBuilder("C", baseClassBuilder, 0); + final List typeParamNames = Stream.of(psiClass.getTypeParameters()).map(PsiTypeParameter::getName).collect(Collectors.toList()); + + final LightTypeParameterBuilder c = new LightTypeParameterBuilder(selectNonClashingNameFor("C", typeParamNames), baseClassBuilder, 0); c.getExtendsList().addReference(PsiClassUtil.getTypeWithGenerics(psiClass)); baseClassBuilder.withParameterType(c); - final LightTypeParameterBuilder b = new LightTypeParameterBuilder("B", baseClassBuilder, 1); + final LightTypeParameterBuilder b = new LightTypeParameterBuilder(selectNonClashingNameFor("B", typeParamNames), baseClassBuilder, 1); baseClassBuilder.withParameterType(b); b.getExtendsList().addReference(PsiClassUtil.getTypeWithGenerics(baseClassBuilder)); @@ -237,6 +250,7 @@ public Collection createAllMethodsOfBaseBuilder(@NotNull PsiClass psi bTypeClass = typeParameters[typeParameters.length - 1]; cTypeClass = typeParameters[typeParameters.length - 2]; } else { + //Fallback only bTypeClass = new LightTypeParameterBuilder("B", psiBuilderClass, 1); cTypeClass = new LightTypeParameterBuilder("C", psiBuilderClass, 0); } diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularMapHandler.java b/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularMapHandler.java index d1a8253d5..2a7a8fecd 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularMapHandler.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularMapHandler.java @@ -141,11 +141,11 @@ public String renderBuildCode(@NotNull PsiVariable psiVariable, @NotNull String final String selectedFormat; if (collectionQualifiedName.equals(SingularCollectionClassNames.JAVA_UTIL_SORTED_MAP)) { selectedFormat = "java.util.SortedMap<{1}, {2}> {0} = new java.util.TreeMap<{1}, {2}>();\n" + - " if ({3}.{0}$key != null) for (int $i = 0; $i < ({3}.{0}$key == null ? 0 : {3}.{0}$key.size()); $i++) {0}.put({3}.{0}$key.get($i), {3}.{0}$value.get($i));\n" + + " if ({3}.{0}$key != null) for (int $i = 0; $i < ({3}.{0}$key == null ? 0 : {3}.{0}$key.size()); $i++) {0}.put({3}.{0}$key.get($i), ({2}){3}.{0}$value.get($i));\n" + " {0} = java.util.Collections.unmodifiableSortedMap({0});\n"; } else if (collectionQualifiedName.equals(SingularCollectionClassNames.JAVA_UTIL_NAVIGABLE_MAP)) { selectedFormat = "java.util.NavigableMap<{1}, {2}> {0} = new java.util.TreeMap<{1}, {2}>();\n" + - " if ({3}.{0}$key != null) for (int $i = 0; $i < ({3}.{0}$key == null ? 0 : {3}.{0}$key.size()); $i++) {0}.put({3}.{0}$key.get($i), {3}.{0}$value.get($i));\n" + + " if ({3}.{0}$key != null) for (int $i = 0; $i < ({3}.{0}$key == null ? 0 : {3}.{0}$key.size()); $i++) {0}.put({3}.{0}$key.get($i), ({2}){3}.{0}$value.get($i));\n" + " {0} = java.util.Collections.unmodifiableNavigableMap({0});\n"; } else { selectedFormat = "java.util.Map<{1}, {2}> {0};\n" + @@ -158,7 +158,7 @@ public String renderBuildCode(@NotNull PsiVariable psiVariable, @NotNull String " break;\n" + " default:\n" + " {0} = new java.util.LinkedHashMap<{1}, {2}>({3}.{0}$key.size() < 1073741824 ? 1 + {3}.{0}$key.size() + ({3}.{0}$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE);\n" + - " for (int $i = 0; $i < {3}.{0}$key.size(); $i++) {0}.put({3}.{0}$key.get($i), {3}.{0}$value.get($i));\n" + + " for (int $i = 0; $i < {3}.{0}$key.size(); $i++) {0}.put({3}.{0}$key.get($i), ({2}){3}.{0}$value.get($i));\n" + " {0} = java.util.Collections.unmodifiableMap({0});\n" + " '}'\n"; } @@ -167,7 +167,9 @@ public String renderBuildCode(@NotNull PsiVariable psiVariable, @NotNull String } public String renderSuperBuilderConstruction(@NotNull PsiVariable psiVariable, @NotNull String fieldName) { - return renderBuildCode(psiVariable, fieldName, "b"); + final String basicCode = renderBuildCode(psiVariable, fieldName, "b"); + final String assignment = "this." + psiVariable.getName() + "=" + fieldName + ";\n"; + return basicCode + assignment; } @Override diff --git a/src/main/resources/messages/lombokBundle.properties b/src/main/resources/messages/lombokBundle.properties index 3d86e43bf..8524cbcdb 100644 --- a/src/main/resources/messages/lombokBundle.properties +++ b/src/main/resources/messages/lombokBundle.properties @@ -31,6 +31,7 @@ Fixes:
    \ - Fixed (#648): IDEA 2019.2 highlights builder() method invocation as an error
    \ - Fixed (#660): Performance problems in autocomplete/code analysis
    \ - Fixed (#663): Method with varArgs gives an error in IntelliJ
    \ +- Fixed (#670): 'Non-idempotent computation' issue with @Delegate usages
    \ - Fixed (#673): Add support for @With
    \
    \ If you find my plugin helpful, donate me using
    \ diff --git a/src/test/java/de/plushnikov/TestUtil.java b/src/test/java/de/plushnikov/TestUtil.java deleted file mode 100644 index 490709547..000000000 --- a/src/test/java/de/plushnikov/TestUtil.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.plushnikov; - -import java.io.File; - -public class TestUtil { - public static String getTestDataPath(String relativePath) { - return getTestDataFile(relativePath).getPath() + File.separator; - } - - private static File getTestDataFile(String relativePath) { - return new File(getTestDataRoot(), relativePath); - } - - private static File getTestDataRoot() { - return new File("testData").getAbsoluteFile(); - } - -} diff --git a/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java b/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java index 500a36626..1351fa758 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java +++ b/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java @@ -1,18 +1,11 @@ package de.plushnikov.intellij.plugin; -import com.intellij.openapi.module.Module; -import com.intellij.openapi.projectRoots.JavaSdk; -import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.roots.ContentEntry; -import com.intellij.openapi.roots.LanguageLevelModuleExtension; -import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.PsiFile; import com.intellij.testFramework.LightProjectDescriptor; +import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.util.PathUtil; @@ -21,11 +14,8 @@ import java.io.File; import java.io.IOException; -import java.util.List; -import java.util.regex.Pattern; public abstract class AbstractLombokLightCodeInsightTestCase extends LightCodeInsightFixtureTestCase { - private static final String LOMBOK_SRC_PATH = "./generated/src/lombok"; @Override protected String getTestDataPath() { @@ -40,37 +30,18 @@ protected String getBasePath() { @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return new DefaultLightProjectDescriptor() { - @Override - public Sdk getSdk() { - return JavaSdk.getInstance().createJdk("java 1.8", "lib/mockJDK-1.8", false); - } - - @Override - public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) { - model.getModuleExtension(LanguageLevelModuleExtension.class).setLanguageLevel(LanguageLevel.JDK_1_8); - } - }; + return LombokTestUtil.getProjectDescriptor(); } @Override public void setUp() throws Exception { - VfsRootAccess.allowRootAccess(new File(getTestDataPath(), getBasePath()).getCanonicalPath(), - new File(LOMBOK_SRC_PATH).getCanonicalPath()); - super.setUp(); - loadLombokFilesFrom(LOMBOK_SRC_PATH); - } - protected void loadLombokFilesFrom(final String srcPath) { - List filesByMask = FileUtil.findFilesByMask(Pattern.compile(".*\\.java"), new File(srcPath)); - filesByMask.stream().map(File::getPath).filter(this::acceptLombokFile).map(PathUtil::toSystemIndependentName).forEach( - filePath -> myFixture.copyFileToProject(filePath, filePath.substring(srcPath.lastIndexOf("/") + 1)) - ); + loadLombokLibrary(); } - protected boolean acceptLombokFile(String javaFilePath) { - return true; + protected void loadLombokLibrary() { + LombokTestUtil.loadLombokLibrary(myFixture.getProjectDisposable(), getModule()); } protected PsiFile loadToPsiFile(String fileName) { diff --git a/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokParsingTestCase.java b/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokParsingTestCase.java index a79acd535..46330ccbf 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokParsingTestCase.java +++ b/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokParsingTestCase.java @@ -113,7 +113,8 @@ private void compareFields(PsiClass beforeClass, PsiClass afterClass) { LOG.debug("IntelliJ fields for class " + beforeClass.getName() + ": " + Arrays.toString(beforeClassFields)); LOG.debug("Theirs fields for class " + afterClass.getName() + ": " + Arrays.toString(afterClassFields)); - assertEquals("Field counts are different for Class " + beforeClass.getName(), afterClassFields.length, beforeClassFields.length); + assertEquals("Field are different for Class: " + beforeClass.getName(), + Arrays.toString(toList(afterClassFields)), Arrays.toString(toList(beforeClassFields))); for (PsiField afterField : afterClassFields) { boolean compared = false; @@ -255,8 +256,9 @@ private Collection mapToTypeString(PsiParameterList compareMethodParamet return result; } - private String[] toList(PsiMethod[] beforeMethods) { - return Arrays.stream(beforeMethods).map(PsiMethod::getName).sorted(String.CASE_INSENSITIVE_ORDER).toArray(String[]::new); + private String[] toList(PsiNamedElement[] beforeMethods) { + return Arrays.stream(beforeMethods).map(PsiNamedElement::getName) + .filter(java.util.Objects::isNull).sorted(String.CASE_INSENSITIVE_ORDER).toArray(String[]::new); } private void compareThrows(PsiReferenceList beforeThrows, PsiReferenceList afterThrows, PsiMethod psiMethod) { diff --git a/src/test/java/de/plushnikov/intellij/plugin/LombokTestUtil.java b/src/test/java/de/plushnikov/intellij/plugin/LombokTestUtil.java new file mode 100644 index 000000000..3bf334ddc --- /dev/null +++ b/src/test/java/de/plushnikov/intellij/plugin/LombokTestUtil.java @@ -0,0 +1,43 @@ +package de.plushnikov.intellij.plugin; + +import com.intellij.openapi.Disposable; +import com.intellij.openapi.module.Module; +import com.intellij.openapi.projectRoots.JavaSdk; +import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.openapi.roots.ContentEntry; +import com.intellij.openapi.roots.LanguageLevelModuleExtension; +import com.intellij.openapi.roots.ModifiableRootModel; +import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; +import com.intellij.pom.java.LanguageLevel; +import com.intellij.testFramework.LightProjectDescriptor; +import com.intellij.testFramework.PsiTestUtil; +import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor; +import com.intellij.util.PathUtil; +import org.jetbrains.annotations.NotNull; + +import java.io.File; + +public class LombokTestUtil { + private static final String LOMBOK_LIBRARY_DIRECTORY = "lib"; + private static final String LOMBOK_JAR_NAME = "lombok-1.18.10.jar"; + + public static void loadLombokLibrary(@NotNull Disposable projectDisposable, @NotNull Module module) { + final String lombokLibPath = PathUtil.toSystemIndependentName(new File(LOMBOK_LIBRARY_DIRECTORY).getAbsolutePath()); + VfsRootAccess.allowRootAccess(projectDisposable, lombokLibPath); + PsiTestUtil.addLibrary(projectDisposable, module, "Lombok Library", lombokLibPath, LOMBOK_JAR_NAME); + } + + public static LightProjectDescriptor getProjectDescriptor() { + return new DefaultLightProjectDescriptor() { + @Override + public Sdk getSdk() { + return JavaSdk.getInstance().createJdk("java 1.8", "lib/mockJDK-1.8", false); + } + + @Override + public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) { + model.getModuleExtension(LanguageLevelModuleExtension.class).setLanguageLevel(LanguageLevel.JDK_1_8); + } + }; + } +} diff --git a/src/test/java/de/plushnikov/intellij/plugin/inspection/LombokInspectionTest.java b/src/test/java/de/plushnikov/intellij/plugin/inspection/LombokInspectionTest.java index ae01b00db..176ded47c 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/inspection/LombokInspectionTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/inspection/LombokInspectionTest.java @@ -1,25 +1,15 @@ package de.plushnikov.intellij.plugin.inspection; -import com.intellij.openapi.Disposable; -import com.intellij.openapi.module.Module; -import com.intellij.openapi.projectRoots.JavaSdk; -import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.roots.ContentEntry; -import com.intellij.openapi.roots.LanguageLevelModuleExtension; -import com.intellij.openapi.roots.ModifiableRootModel; -import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import com.intellij.pom.java.LanguageLevel; +import com.intellij.openapi.util.registry.Registry; import com.intellij.testFramework.LightProjectDescriptor; +import com.siyeh.ig.LightJavaInspectionTestCase; +import de.plushnikov.intellij.plugin.LombokTestUtil; import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor; import com.intellij.util.PathUtil; import com.siyeh.ig.LightInspectionTestCase; import org.jetbrains.annotations.NotNull; -import java.io.File; - -import static com.intellij.testFramework.LightPlatformTestCase.getModule; - public abstract class LombokInspectionTest extends LightInspectionTestCase { static final String TEST_DATA_INSPECTION_DIRECTORY = "testData/inspection"; @@ -27,25 +17,12 @@ public abstract class LombokInspectionTest extends LightInspectionTestCase { public void setUp() throws Exception { super.setUp(); - final String lombokLibPath = PathUtil.toSystemIndependentName(new File(TEST_DATA_INSPECTION_DIRECTORY, "lib").getAbsolutePath()); - final Disposable projectDisposable = myFixture.getProjectDisposable(); - VfsRootAccess.allowRootAccess(projectDisposable, lombokLibPath); - PsiTestUtil.addLibrary(projectDisposable, getModule(), "Lombok Library", lombokLibPath, "lombok-1.18.8.jar"); + LombokTestUtil.loadLombokLibrary(myFixture.getProjectDisposable(), getModule()); } @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return new DefaultLightProjectDescriptor() { - @Override - public Sdk getSdk() { - return JavaSdk.getInstance().createJdk("java 1.8", "lib/mockJDK-1.8", false); - } - - @Override - public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) { - model.getModuleExtension(LanguageLevelModuleExtension.class).setLanguageLevel(LanguageLevel.JDK_1_8); - } - }; + return LombokTestUtil.getProjectDescriptor(); } } diff --git a/src/test/java/de/plushnikov/intellij/plugin/postfix/NonIdempotentComputationIssue670Test.java b/src/test/java/de/plushnikov/intellij/plugin/postfix/NonIdempotentComputationIssue670Test.java new file mode 100644 index 000000000..64737bd89 --- /dev/null +++ b/src/test/java/de/plushnikov/intellij/plugin/postfix/NonIdempotentComputationIssue670Test.java @@ -0,0 +1,32 @@ +package de.plushnikov.intellij.plugin.postfix; + +import com.intellij.openapi.util.registry.Registry; +import com.intellij.psi.PsiDocumentManager; +import com.intellij.psi.PsiMethod; +import de.plushnikov.intellij.plugin.AbstractLombokLightCodeInsightTestCase; + +import java.util.Arrays; + +import static org.junit.Assert.assertArrayEquals; + +public class NonIdempotentComputationIssue670Test extends AbstractLombokLightCodeInsightTestCase { + + public void testIssue670() { + Registry.get("platform.random.idempotence.check.rate").setValue(1, getTestRootDisposable()); + + myFixture.configureByFile((getBasePath() + "/postfix/issue670/" + getTestName(false)) + ".java"); + + final PsiMethod[] firstCallGetMethods = myFixture.findClass("Issue670").getMethods(); + assertNotEmpty(Arrays.asList(firstCallGetMethods)); + + // change something in the file + myFixture.type('0'); + PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); + + final PsiMethod[] secondCallGetMethods = myFixture.findClass("Issue670").getMethods(); + assertNotEmpty(Arrays.asList(secondCallGetMethods)); + + // all methods should be in same order + assertArrayEquals(firstCallGetMethods, secondCallGetMethods); + } +} diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java index efcbf6482..76cba54a0 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java @@ -108,7 +108,7 @@ public void setUp() throws Exception { doTest(true); } - public void testBuilder$BuilderGenerics() { + public void testBuilder$ObjectApiResponse() { doTest(true); } diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java index 95e9273c2..4f8f43a76 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java @@ -1,32 +1,51 @@ package de.plushnikov.intellij.plugin.processor; +import com.intellij.openapi.Disposable; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; +import com.intellij.util.PathUtil; import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase; import java.io.File; +import java.util.List; +import java.util.regex.Pattern; /** * Unit tests for @FieldNameConstants annotation from old version of lombok */ public class FieldNameConstantsOldTest extends AbstractLombokParsingTestCase { + private static final String LOMBOK_SRC_PATH = "./generated/src/lombok"; private static final String OLD_LOMBOK_SRC_PATH = "./old"; @Override public void setUp() throws Exception { - VfsRootAccess.allowRootAccess(new File(getTestDataPath(), getBasePath()).getCanonicalPath(), - new File(OLD_LOMBOK_SRC_PATH).getCanonicalPath()); - super.setUp(); + final Disposable projectDisposable = myFixture.getProjectDisposable(); + final String basePath = new File(getTestDataPath(), getBasePath()).getCanonicalPath(); + VfsRootAccess.allowRootAccess(projectDisposable, basePath, new File(LOMBOK_SRC_PATH).getCanonicalPath()); + VfsRootAccess.allowRootAccess(projectDisposable, basePath, new File(OLD_LOMBOK_SRC_PATH).getCanonicalPath()); } public void testFieldnameconstants$FieldNameConstantsOldBasic() { - super.loadLombokFilesFrom(OLD_LOMBOK_SRC_PATH); + loadLombokFilesFrom(LOMBOK_SRC_PATH); + loadLombokFilesFrom(OLD_LOMBOK_SRC_PATH); doTest(true); } - @Override - protected boolean acceptLombokFile(String javaFilePath) { + private void loadLombokFilesFrom(final String srcPath) { + List filesByMask = FileUtil.findFilesByMask(Pattern.compile(".*\\.java"), new File(srcPath)); + filesByMask.stream().map(File::getPath).filter(this::acceptLombokFile).map(PathUtil::toSystemIndependentName).forEach( + filePath -> myFixture.copyFileToProject(filePath, filePath.substring(srcPath.lastIndexOf("/") + 1)) + ); + } + + private boolean acceptLombokFile(String javaFilePath) { return !javaFilePath.endsWith("FieldNameConstants.java") || javaFilePath.startsWith("." + File.separator + "old"); } + + @Override + protected void loadLombokLibrary() { + // do nothing here + } } diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderSingularTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderSingularTest.java new file mode 100644 index 000000000..f638930a0 --- /dev/null +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderSingularTest.java @@ -0,0 +1,85 @@ +package de.plushnikov.intellij.plugin.processor; + +import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase; + +/** + * Unit tests for IntelliJPlugin for Lombok, based on lombok test classes + */ +public class SuperBuilderSingularTest extends AbstractLombokParsingTestCase { + @Override + public void setUp() throws Exception { + super.setUp(); + // Add dummy classes, which are absent in mockJDK + myFixture.addClass("package java.util;\n public interface NavigableSet extends java.util.SortedSet {}"); + myFixture.addClass("package java.util;\n public interface NavigableMap extends java.util.SortedMap {}"); + } + + public void testSuperbuilder$Singular$Generic$Guava$SingularGuavaBiMap() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Guava$SingularGuavaCollection() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Guava$SingularGuavaList() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Guava$SingularGuavaMap() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Guava$SingularGuavaSet() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Guava$SingularGuavaSortedMap() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Guava$SingularGuavaSortedSet() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Guava$SingularGuavaTable() { + doTest(true); + } + + + public void testSuperbuilder$Singular$Generic$Util$Collection$SingularCollection() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Util$Collection$SingularIterable() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Util$Collection$SingularList() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Util$Collection$SingularNavigableSet() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Util$Collection$SingularSet() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Util$Collection$SingularSortedSet() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Util$Map$SingularMap() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Util$Map$SingularNavigableMap() { + doTest(true); + } + + public void testSuperbuilder$Singular$Generic$Util$Map$SingularSortedMap() { + doTest(true); + } +} diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/UtilityClassModifierTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/UtilityClassModifierTest.java index 818b4a9e7..56a7695be 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/UtilityClassModifierTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/UtilityClassModifierTest.java @@ -7,12 +7,12 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiModifier; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; /** * @author Florian Böhm */ -public class UtilityClassModifierTest extends LightCodeInsightFixtureTestCase { +public class UtilityClassModifierTest extends LightJavaCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java index 7c091af74..3c283254f 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java @@ -6,12 +6,12 @@ import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiType; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; /** * @author Alexej Kubarev */ -public class ValModifierTest extends LightCodeInsightFixtureTestCase { +public class ValModifierTest extends LightJavaCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValueModifierTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValueModifierTest.java index 3e891b0fa..14688405a 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValueModifierTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValueModifierTest.java @@ -6,12 +6,12 @@ import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiModifierList; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; /** * @author Alexej Kubarev */ -public class ValueModifierTest extends LightCodeInsightFixtureTestCase { +public class ValueModifierTest extends LightJavaCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/VarModifierTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/VarModifierTest.java index f38529f50..3f7a0e234 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/VarModifierTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/VarModifierTest.java @@ -1,13 +1,17 @@ package de.plushnikov.intellij.plugin.processor.modifier; -import com.intellij.psi.*; +import com.intellij.psi.PsiDocumentManager; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiLocalVariable; +import com.intellij.psi.PsiModifier; +import com.intellij.psi.PsiPrimitiveType; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; /** * @author Alexej Kubarev */ -public class VarModifierTest extends LightCodeInsightFixtureTestCase { +public class VarModifierTest extends LightJavaCodeInsightFixtureTestCase { @Override protected String getTestDataPath() { @@ -27,7 +31,7 @@ public void testVarModifiers() { assertNotNull(var); assertNotNull(var.getModifierList()); boolean isFinal = var.getModifierList().hasModifierProperty(PsiModifier.FINAL); - assertTrue("var doesn't make variable final", !isFinal); + assertFalse("var doesn't make variable final", isFinal); } public void testVarModifiersEditing() { @@ -43,6 +47,6 @@ public void testVarModifiersEditing() { assertNotNull(var.getModifierList()); boolean isFinal = var.getModifierList().hasModifierProperty(PsiModifier.FINAL); - assertTrue("var doesn't make variable final", !isFinal); + assertFalse("var doesn't make variable final", isFinal); } } diff --git a/test-manual/src/main/java/de/plushnikov/superbuilder/Issue513.java b/test-manual/src/main/java/de/plushnikov/superbuilder/Issue513.java new file mode 100644 index 000000000..12141a2c1 --- /dev/null +++ b/test-manual/src/main/java/de/plushnikov/superbuilder/Issue513.java @@ -0,0 +1,35 @@ +package de.plushnikov.superbuilder; + +import lombok.experimental.SuperBuilder; + +import java.util.Optional; + +public class Issue513 { + @SuperBuilder + public static class A { + public String field1; + } + + @SuperBuilder + public static class B extends A { + public String field2; + } + + public static class OtherClass { + public String method(int something) { + return Integer.toOctalString(something); + } + } + + public static void main(String[] args) { + Optional someOptional = Optional.of(args[0]); + String value = "value"; + OtherClass otherClass = new OtherClass(); + int something = 1; + + A a = someOptional + .map(item -> (A) A.builder().field1(value).build()) + .orElseGet(() -> A.builder().field1(value).build()); + System.out.println(a); + } +} diff --git a/testData/action/delombok/builder/afterBuilderSingularMap.java b/testData/action/delombok/builder/afterBuilderSingularMap.java index bb78ed8a4..adcc02b56 100644 --- a/testData/action/delombok/builder/afterBuilderSingularMap.java +++ b/testData/action/delombok/builder/afterBuilderSingularMap.java @@ -63,7 +63,7 @@ public BuilderSingularMap build() { default: myMap = new java.util.LinkedHashMap(this.myMap$key.size() < 1073741824 ? 1 + this.myMap$key.size() + (this.myMap$key.size() - 3) / 3 : Integer.MAX_VALUE); for (int $i = 0; $i < this.myMap$key.size(); $i++) - myMap.put(this.myMap$key.get($i), this.myMap$value.get($i)); + myMap.put(this.myMap$key.get($i), (String)this.myMap$value.get($i)); myMap = java.util.Collections.unmodifiableMap(myMap); } diff --git a/testData/after/CleanupName.java b/testData/after/CleanupName.java index 56d060e10..ef0889908 100644 --- a/testData/after/CleanupName.java +++ b/testData/after/CleanupName.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class CleanupName { void test() { diff --git a/testData/after/CleanupPlain.java b/testData/after/CleanupPlain.java index d302d3fbf..25128aae6 100644 --- a/testData/after/CleanupPlain.java +++ b/testData/after/CleanupPlain.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.io.*; diff --git a/testData/after/FieldDefaults.java b/testData/after/FieldDefaults.java index fdf1efc34..258303d5b 100644 --- a/testData/after/FieldDefaults.java +++ b/testData/after/FieldDefaults.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class FieldDefaults1 { final int x; diff --git a/testData/after/FieldDefaultsNoop.java b/testData/after/FieldDefaultsNoop.java index 4433df86e..cac8cca18 100644 --- a/testData/after/FieldDefaultsNoop.java +++ b/testData/after/FieldDefaultsNoop.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class FieldDefaultsNoop { } diff --git a/testData/after/InjectField.java b/testData/after/InjectField.java index 8d7b7b55c..58c02871a 100644 --- a/testData/after/InjectField.java +++ b/testData/after/InjectField.java @@ -1,17 +1,14 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.logging.Level; enum InjectField1 { A, B; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName()); @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private final java.lang.Object $lock = new java.lang.Object[0]; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final java.lang.Object $LOCK = new java.lang.Object[0]; private static final String LOG_MESSAGE = "static initializer"; private String fieldA; @@ -37,10 +34,8 @@ static void generateStaticLockField() { class InjectField2 { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName()); @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private final java.lang.Object $lock = new java.lang.Object[0]; private static final String LOG_MESSAGE = "static initializer"; @@ -57,7 +52,6 @@ void generateLockField() { class InjectField3 { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName()); static { diff --git a/testData/after/MixGetterVal.java b/testData/after/MixGetterVal.java index 94e147f4f..0eea2f3d7 100644 --- a/testData/after/MixGetterVal.java +++ b/testData/after/MixGetterVal.java @@ -9,7 +9,6 @@ public void test() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } diff --git a/testData/after/NonNullOnParameter.java b/testData/after/NonNullOnParameter.java index 4f20fc70d..0f88a9f7b 100644 --- a/testData/after/NonNullOnParameter.java +++ b/testData/after/NonNullOnParameter.java @@ -1,27 +1,27 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class NonNullOnParameter extends Thread { NonNullOnParameter(@lombok.NonNull String arg) { this(arg, ""); if (arg == null) { - throw new java.lang.NullPointerException("arg"); + throw new java.lang.NullPointerException("arg is marked non-null but is null"); } } NonNullOnParameter(@lombok.NonNull String arg, @lombok.NonNull String arg2) { super(arg); if (arg2 == null) { - throw new java.lang.NullPointerException("arg2"); + throw new java.lang.NullPointerException("arg2 is marked non-null but is null"); } if (arg == null) throw new NullPointerException(); } public void test2(@lombok.NonNull String arg, @lombok.NonNull String arg2, @lombok.NonNull String arg3) { if (arg == null) { - throw new java.lang.NullPointerException("arg"); + throw new java.lang.NullPointerException("arg is marked non-null but is null"); } if (arg3 == null) { - throw new java.lang.NullPointerException("arg3"); + throw new java.lang.NullPointerException("arg3 is marked non-null but is null"); } if (arg2 == null) { throw new NullPointerException("arg2"); @@ -31,23 +31,23 @@ public void test2(@lombok.NonNull String arg, @lombok.NonNull String arg2, @lomb public void test3(@lombok.NonNull String arg) { if (arg == null) { - throw new java.lang.NullPointerException("arg"); + throw new java.lang.NullPointerException("arg is marked non-null but is null"); } if (arg != null) throw new IllegalStateException(); } public void test(@lombok.NonNull String stringArg, @lombok.NonNull String arg2, @lombok.NonNull int primitiveArg) { if (stringArg == null) { - throw new java.lang.NullPointerException("stringArg"); + throw new java.lang.NullPointerException("stringArg is marked non-null but is null"); } if (arg2 == null) { - throw new java.lang.NullPointerException("arg2"); + throw new java.lang.NullPointerException("arg2 is marked non-null but is null"); } } public void test(@lombok.NonNull String arg) { if (arg == null) { - throw new java.lang.NullPointerException("arg"); + throw new java.lang.NullPointerException("arg is marked non-null but is null"); } System.out.println("Hey"); if (arg == null) throw new NullPointerException(); diff --git a/testData/after/NonNullPlain.java b/testData/after/NonNullPlain.java index c60bfac8f..2810f4532 100644 --- a/testData/after/NonNullPlain.java +++ b/testData/after/NonNullPlain.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.lang.annotation.*; @@ -16,12 +16,10 @@ class NonNullPlain { public @interface NotNull { } - @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) { if (s == null) { - throw new java.lang.NullPointerException("s"); + throw new java.lang.NullPointerException("s is marked non-null but is null"); } this.i = i; this.s = s; @@ -29,41 +27,35 @@ public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) @lombok.NonNull @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getI() { return this.i; } @lombok.NonNull @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getS() { return this.s; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Object getO() { return this.o; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setI(@lombok.NonNull final int i) { this.i = i; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setS(@lombok.NonNull final String s) { if (s == null) { - throw new java.lang.NullPointerException("s"); + throw new java.lang.NullPointerException("s is marked non-null but is null"); } this.s = s; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setO(final Object o) { this.o = o; } diff --git a/testData/after/SimpleTypeResolution.java b/testData/after/SimpleTypeResolution.java index 8e9a087ff..9fcab11ed 100644 --- a/testData/after/SimpleTypeResolution.java +++ b/testData/after/SimpleTypeResolution.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class SimpleTypeResolutionFail { @Getter @@ -9,7 +9,6 @@ class SimpleTypeResolutionSuccess { private int x; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } diff --git a/testData/after/SneakyThrowsMultiple.java b/testData/after/SneakyThrowsMultiple.java index 3c4fb282e..6f0e2fd71 100644 --- a/testData/after/SneakyThrowsMultiple.java +++ b/testData/after/SneakyThrowsMultiple.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.awt.AWTException; import java.io.IOException; diff --git a/testData/after/SneakyThrowsPlain.java b/testData/after/SneakyThrowsPlain.java index 6a82ccbb7..0df9a1518 100644 --- a/testData/after/SneakyThrowsPlain.java +++ b/testData/after/SneakyThrowsPlain.java @@ -1,7 +1,8 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class SneakyThrowsPlain { SneakyThrowsPlain() { + super(); try { System.out.println("constructor"); } catch (final java.lang.Throwable $ex) { diff --git a/testData/after/SneakyThrowsSingle.java b/testData/after/SneakyThrowsSingle.java index 1dd615ebf..72eaef598 100644 --- a/testData/after/SneakyThrowsSingle.java +++ b/testData/after/SneakyThrowsSingle.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.io.IOException; diff --git a/testData/after/SynchronizedName.java b/testData/after/SynchronizedName.java index 4a202f9ba..5aa838816 100644 --- a/testData/after/SynchronizedName.java +++ b/testData/after/SynchronizedName.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class SynchronizedName { private Object read = new Object(); diff --git a/testData/after/SynchronizedNameNoSuchField.java b/testData/after/SynchronizedNameNoSuchField.java index 9380001cd..6f51496ea 100644 --- a/testData/after/SynchronizedNameNoSuchField.java +++ b/testData/after/SynchronizedNameNoSuchField.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class SynchronizedNameNoSuchField { private Object read = new Object(); diff --git a/testData/after/SynchronizedNameStaticToInstanceRef.java b/testData/after/SynchronizedNameStaticToInstanceRef.java index fba1ab554..c3973b7a2 100644 --- a/testData/after/SynchronizedNameStaticToInstanceRef.java +++ b/testData/after/SynchronizedNameStaticToInstanceRef.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class SynchronizedNameStaticToInstanceRef { private Object read = new Object(); diff --git a/testData/after/SynchronizedPlain.java b/testData/after/SynchronizedPlain.java index 145f50f01..a6f4160c5 100644 --- a/testData/after/SynchronizedPlain.java +++ b/testData/after/SynchronizedPlain.java @@ -1,8 +1,7 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class SynchronizedPlain1 { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private final java.lang.Object $lock = new java.lang.Object[0]; void test() { @@ -20,7 +19,6 @@ void test2() { class SynchronizedPlain2 { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final java.lang.Object $LOCK = new java.lang.Object[0]; static void test() { diff --git a/testData/after/TolerateTest.java b/testData/after/TolerateTest.java index 375d8a978..a2ed28485 100644 --- a/testData/after/TolerateTest.java +++ b/testData/after/TolerateTest.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.regex.Pattern; @@ -10,13 +10,11 @@ public void setPattern(String pattern) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setPattern(final Pattern pattern) { this.pattern = pattern; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Pattern getPattern() { return this.pattern; } @@ -34,20 +32,16 @@ public Tolerate2 withPattern(String nameGlob, String extensionGlob) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Pattern getPattern() { return this.pattern; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Tolerate2 withPattern(final Pattern pattern) { return this.pattern == pattern ? this : new Tolerate2(pattern); } - @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Tolerate2(final Pattern pattern) { this.pattern = pattern; } diff --git a/testData/after/accessors/Accessors.java b/testData/after/accessors/Accessors.java index c92be2c68..2187d924f 100644 --- a/testData/after/accessors/Accessors.java +++ b/testData/after/accessors/Accessors.java @@ -4,13 +4,11 @@ class AccessorsFluent { private String fieldName = ""; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -22,19 +20,16 @@ class AccessorsFluentOnClass { private String otherFieldWithOverride = ""; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -45,7 +40,6 @@ class AccessorsChain { private boolean isRunning; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; @@ -57,7 +51,6 @@ class AccessorsPrefix { private String fActualField; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -68,13 +61,11 @@ class AccessorsPrefix2 { private String fActualField; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setFieldName(final String fieldName) { this.fieldName = fieldName; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -89,14 +80,12 @@ private String getName() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "AccessorsPrefix3(fName=" + this.getName() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof AccessorsPrefix3)) return false; @@ -109,14 +98,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof AccessorsPrefix3; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -134,25 +121,21 @@ class AccessorsPrefix4 { private String bAr; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setUnderscore(final String _underscore) { this._underscore = _underscore; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setDollarSign(final String $DollarSign) { this.$DollarSign = $DollarSign; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setFieldName(final String m_fieldName) { this.m_fieldName = m_fieldName; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setAr(final String bAr) { this.bAr = bAr; } @@ -162,7 +145,6 @@ class AccessorsFluentGenerics { private String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public AccessorsFluentGenerics name(final String name) { this.name = name; return this; @@ -173,7 +155,6 @@ class AccessorsFluentNoChaining { private String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void name(final String name) { this.name = name; } @@ -183,7 +164,6 @@ class AccessorsFluentStatic { private static String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static void name(final String name) { AccessorsFluentStatic.name = name; } diff --git a/testData/after/builder/BuilderAndAllArgsConstructor.java b/testData/after/builder/BuilderAndAllArgsConstructor.java index f3e0d0278..3f538d10c 100644 --- a/testData/after/builder/BuilderAndAllArgsConstructor.java +++ b/testData/after/builder/BuilderAndAllArgsConstructor.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 public class BuilderAndAllArgsConstructor { private String field1; @@ -6,56 +6,46 @@ public class BuilderAndAllArgsConstructor { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderAndAllArgsConstructorBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String field1; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String field2; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderAndAllArgsConstructorBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderAndAllArgsConstructorBuilder field1(final String field1) { this.field1 = field1; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderAndAllArgsConstructorBuilder field2(final String field2) { this.field2 = field2; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderAndAllArgsConstructor build() { return new BuilderAndAllArgsConstructor(field1, field2); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderAndAllArgsConstructor.BuilderAndAllArgsConstructorBuilder(field1=" + this.field1 + ", field2=" + this.field2 + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderAndAllArgsConstructorBuilder builder() { return new BuilderAndAllArgsConstructorBuilder(); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private BuilderAndAllArgsConstructor(final String field1, final String field2) { this.field1 = field1; this.field2 = field2; diff --git a/testData/after/builder/BuilderComplex.java b/testData/after/builder/BuilderComplex.java index 2390880ea..caca0e361 100644 --- a/testData/after/builder/BuilderComplex.java +++ b/testData/after/builder/BuilderComplex.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.List; @@ -8,70 +8,57 @@ private static void testVoidWithGenerics(T number, int arg2, @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class VoidBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private T number; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int arg2; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String arg3; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private BuilderComplex selfRef; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") VoidBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public VoidBuilder number(final T number) { this.number = number; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public VoidBuilder arg2(final int arg2) { this.arg2 = arg2; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public VoidBuilder arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public VoidBuilder selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void execute() { BuilderComplex.testVoidWithGenerics(number, arg2, arg3, selfRef); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderComplex.VoidBuilder(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static VoidBuilder builder() { return new VoidBuilder(); } diff --git a/testData/after/builder/BuilderConstructorException.java b/testData/after/builder/BuilderConstructorException.java index e17905b55..9e9a79385 100644 --- a/testData/after/builder/BuilderConstructorException.java +++ b/testData/after/builder/BuilderConstructorException.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class Exception { } @@ -19,26 +19,21 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderConstructorExceptionBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int i; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderConstructorExceptionBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderConstructorExceptionBuilder i(final int i) { this.i = i; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") //added "throws Exception" to delomboked code public BuilderConstructorException build() throws Exception { return new BuilderConstructorException(i); @@ -46,14 +41,12 @@ public BuilderConstructorException build() throws Exception { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderConstructorException.BuilderConstructorExceptionBuilder(i=" + this.i + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderConstructorExceptionBuilder builder() { return new BuilderConstructorExceptionBuilder(); } diff --git a/testData/after/builder/BuilderExample.java b/testData/after/builder/BuilderExample.java index 2e2057ec3..83c68282c 100644 --- a/testData/after/builder/BuilderExample.java +++ b/testData/after/builder/BuilderExample.java @@ -1,11 +1,10 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 public class BuilderExample { private String name; private int age; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderExample(final String name, final int age) { this.name = name; this.age = age; @@ -13,50 +12,41 @@ public class BuilderExample { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderExampleBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int age; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderExampleBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderExampleBuilder name(final String name) { this.name = name; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderExampleBuilder age(final int age) { this.age = age; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderExample build() { return new BuilderExample(name, age); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderExample.BuilderExampleBuilder(name=" + this.name + ", age=" + this.age + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderExampleBuilder builder() { return new BuilderExampleBuilder(); } diff --git a/testData/after/builder/BuilderExampleCustomized.java b/testData/after/builder/BuilderExampleCustomized.java index 8386f6dbb..af69892b6 100644 --- a/testData/after/builder/BuilderExampleCustomized.java +++ b/testData/after/builder/BuilderExampleCustomized.java @@ -1,40 +1,53 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + public class BuilderExampleCustomized { private String name; private int age; - @java.beans.ConstructorProperties({"name", "age"}) - BuilderExampleCustomized(String name, int age) { + @java.lang.SuppressWarnings("all") + BuilderExampleCustomized(final String name, final int age) { this.name = name; this.age = age; } - public static HelloWorldBuilder helloWorld() { - return new HelloWorldBuilder(); - } + @java.lang.SuppressWarnings("all") public static class HelloWorldBuilder { + @java.lang.SuppressWarnings("all") private String name; + @java.lang.SuppressWarnings("all") private int age; + @java.lang.SuppressWarnings("all") HelloWorldBuilder() { } - public HelloWorldBuilder name(String name) { + @java.lang.SuppressWarnings("all") + public HelloWorldBuilder name(final String name) { this.name = name; return this; } - public HelloWorldBuilder age(int age) { + @java.lang.SuppressWarnings("all") + public HelloWorldBuilder age(final int age) { this.age = age; return this; } + @java.lang.SuppressWarnings("all") public BuilderExampleCustomized execute() { return new BuilderExampleCustomized(name, age); } - public String toString() { + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "BuilderExampleCustomized.HelloWorldBuilder(name=" + this.name + ", age=" + this.age + ")"; } } + + @java.lang.SuppressWarnings("all") + public static HelloWorldBuilder helloWorld() { + return new HelloWorldBuilder(); + } } diff --git a/testData/after/builder/BuilderGenericsOnConstructor.java b/testData/after/builder/BuilderGenericsOnConstructor.java index a73494504..767e35c7a 100644 --- a/testData/after/builder/BuilderGenericsOnConstructor.java +++ b/testData/after/builder/BuilderGenericsOnConstructor.java @@ -1,3 +1,5 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + import lombok.*; import java.math.*; @@ -8,39 +10,35 @@ public BarBar(T content) { this.content = content; } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BarBarBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private T content; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BarBarBuilder() { } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BarBarBuilder content(final T content) { this.content = content; return this; } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BarBar build() { return new BarBar(content); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BarBar.BarBarBuilder(content=" + this.content + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BarBarBuilder builder() { return new BarBarBuilder(); } diff --git a/testData/after/builder/BuilderInstanceMethod.java b/testData/after/builder/BuilderInstanceMethod.java index 6677e6e35..6efa06d46 100644 --- a/testData/after/builder/BuilderInstanceMethod.java +++ b/testData/after/builder/BuilderInstanceMethod.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.List; @@ -9,70 +9,58 @@ public String create(int show, final int yes, List also, int $andMe) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public class StringBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int show; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int yes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private List also; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int $andMe; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") StringBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StringBuilder show(final int show) { this.show = show; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StringBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StringBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String build() { return BuilderInstanceMethod.this.create(show, yes, also, $andMe); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderInstanceMethod.StringBuilder(show=" + this.show + ", yes=" + this.yes + ", also=" + this.also + ", $andMe=" + this.$andMe + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") + // added 'BuilderInstanceMethod.' because Builder-class is not static public StringBuilder builder() { return new BuilderInstanceMethod.StringBuilder(); } diff --git a/testData/after/builder/BuilderMethodException.java b/testData/after/builder/BuilderMethodException.java index 17fcb3771..58b689641 100644 --- a/testData/after/builder/BuilderMethodException.java +++ b/testData/after/builder/BuilderMethodException.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class Exception { } @@ -17,40 +17,33 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class VoidBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int i; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") VoidBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public VoidBuilder i(final int i) { this.i = i; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void build() throws Exception { BuilderMethodException.foo(i); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderMethodException.VoidBuilder(i=" + this.i + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static VoidBuilder builder() { return new VoidBuilder(); } diff --git a/testData/after/builder/BuilderPredefined.java b/testData/after/builder/BuilderPredefined.java index 09893b194..1e3c09c3a 100644 --- a/testData/after/builder/BuilderPredefined.java +++ b/testData/after/builder/BuilderPredefined.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 public class BuilderPredefined { private String name; @@ -12,7 +12,6 @@ public static class FirstInnerClassDefined { public static class BuilderPredefinedBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int age; private String name; @@ -21,40 +20,34 @@ public void age(int age) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderPredefinedBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderPredefinedBuilder name(final String name) { this.name = name; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderPredefined build() { return new BuilderPredefined(name, age); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderPredefined.BuilderPredefinedBuilder(name=" + this.name + ", age=" + this.age + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderPredefined(final String name, final int age) { this.name = name; this.age = age; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderPredefinedBuilder builder() { return new BuilderPredefinedBuilder(); } diff --git a/testData/after/builder/BuilderSimple.java b/testData/after/builder/BuilderSimple.java index cd298f29f..a2623014d 100644 --- a/testData/after/builder/BuilderSimple.java +++ b/testData/after/builder/BuilderSimple.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.List; @@ -9,7 +9,6 @@ class BuilderSimple { private int $butNotMe; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSimple(final int yes, final List also) { this.yes = yes; this.also = also; @@ -17,50 +16,41 @@ class BuilderSimple { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSimpleBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int yes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private List also; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSimpleBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSimpleBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSimple build() { return new BuilderSimple(yes, also); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSimpleBuilder builder() { return new BuilderSimpleBuilder(); } diff --git a/testData/after/builder/BuilderSimpleProtected.java b/testData/after/builder/BuilderSimpleProtected.java index 7648a09c8..c0cb8cfb0 100644 --- a/testData/after/builder/BuilderSimpleProtected.java +++ b/testData/after/builder/BuilderSimpleProtected.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.List; @@ -6,46 +6,39 @@ class BuilderSimpleProtected { private List also; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSimpleProtected(final List also) { this.also = also; } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected static class BuilderSimpleProtectedBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private List also; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSimpleProtectedBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSimpleProtectedBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSimpleProtected build() { return new BuilderSimpleProtected(also); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSimpleProtected.BuilderSimpleProtectedBuilder(also=" + this.also + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected static BuilderSimpleProtectedBuilder builder() { return new BuilderSimpleProtectedBuilder(); } diff --git a/testData/after/builder/BuilderSingularGuavaListsSets.java b/testData/after/builder/BuilderSingularGuavaListsSets.java index c63f148ab..42a7cf7bd 100644 --- a/testData/after/builder/BuilderSingularGuavaListsSets.java +++ b/testData/after/builder/BuilderSingularGuavaListsSets.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableCollection; @@ -15,7 +15,6 @@ class BuilderSingularGuavaListsSets { private ImmutableTable users; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { this.cards = cards; this.frogs = frogs; @@ -26,31 +25,23 @@ class BuilderSingularGuavaListsSets { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularGuavaListsSetsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder cards; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder frogs; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSet.Builder rawSet; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedSet.Builder passes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableTable.Builder users; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder card(final T card) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); @@ -58,7 +49,6 @@ public BuilderSingularGuavaListsSetsBuilder card(final T card) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); @@ -66,14 +56,12 @@ public BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable clearCards() { this.cards = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); @@ -81,7 +69,6 @@ public BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); @@ -89,14 +76,12 @@ public BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable clearFrogs() { this.frogs = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); @@ -104,7 +89,6 @@ public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Object raw } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); @@ -112,14 +96,12 @@ public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable clearRawSet() { this.rawSet = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder pass(final String pass) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); @@ -127,7 +109,6 @@ public BuilderSingularGuavaListsSetsBuilder pass(final String pass) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); @@ -135,14 +116,12 @@ public BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable clearPasses() { this.passes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder user(final Number rowKey, final Number columnKey, final String value) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.put(rowKey, columnKey, value); @@ -150,7 +129,6 @@ public BuilderSingularGuavaListsSetsBuilder user(final Number rowKey, final N } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder users(final com.google.common.collect.Table users) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.putAll(users); @@ -158,14 +136,12 @@ public BuilderSingularGuavaListsSetsBuilder users(final com.google.common.col } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSetsBuilder clearUsers() { this.users = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaListsSets build() { com.google.common.collect.ImmutableList cards = this.cards == null ? com.google.common.collect.ImmutableList.of() : this.cards.build(); com.google.common.collect.ImmutableCollection frogs = this.frogs == null ? com.google.common.collect.ImmutableList.of() : this.frogs.build(); @@ -177,14 +153,12 @@ public BuilderSingularGuavaListsSets build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularGuavaListsSetsBuilder builder() { return new BuilderSingularGuavaListsSetsBuilder(); } diff --git a/testData/after/builder/BuilderSingularGuavaMaps.java b/testData/after/builder/BuilderSingularGuavaMaps.java index cd89bfeb4..652ba1449 100644 --- a/testData/after/builder/BuilderSingularGuavaMaps.java +++ b/testData/after/builder/BuilderSingularGuavaMaps.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableBiMap; @@ -11,7 +11,6 @@ class BuilderSingularGuavaMaps { private ImmutableBiMap rawMap; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { this.battleaxes = battleaxes; this.vertices = vertices; @@ -20,25 +19,19 @@ class BuilderSingularGuavaMaps { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularGuavaMapsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableMap.Builder battleaxes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedMap.Builder vertices; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableBiMap.Builder rawMap; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder battleaxe(final K key, final V value) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.put(key, value); @@ -46,7 +39,6 @@ public BuilderSingularGuavaMapsBuilder battleaxe(final K key, final V valu } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.putAll(battleaxes); @@ -54,14 +46,12 @@ public BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map clearBattleaxes() { this.battleaxes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder vertex(final Integer key, final V value) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.put(key, value); @@ -69,7 +59,6 @@ public BuilderSingularGuavaMapsBuilder vertex(final Integer key, final V v } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.putAll(vertices); @@ -77,14 +66,12 @@ public BuilderSingularGuavaMapsBuilder vertices(final java.util.Map clearVertices() { this.vertices = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder rawMap(final java.lang.Object key, final java.lang.Object value) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.put(key, value); @@ -92,7 +79,6 @@ public BuilderSingularGuavaMapsBuilder rawMap(final java.lang.Object key, } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.putAll(rawMap); @@ -100,14 +86,12 @@ public BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map ra } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMapsBuilder clearRawMap() { this.rawMap = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularGuavaMaps build() { com.google.common.collect.ImmutableMap battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.of() : this.battleaxes.build(); com.google.common.collect.ImmutableSortedMap vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.of() : this.vertices.build(); @@ -117,14 +101,12 @@ public BuilderSingularGuavaMaps build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularGuavaMapsBuilder builder() { return new BuilderSingularGuavaMapsBuilder(); } diff --git a/testData/after/builder/BuilderSingularLists.java b/testData/after/builder/BuilderSingularLists.java index e8e90166d..64e2b62cf 100644 --- a/testData/after/builder/BuilderSingularLists.java +++ b/testData/after/builder/BuilderSingularLists.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.List; import java.util.Collection; @@ -10,7 +10,6 @@ class BuilderSingularLists { private List rawList; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularLists(final List children, final Collection scarves, final List rawList) { this.children = children; this.scarves = scarves; @@ -19,25 +18,19 @@ class BuilderSingularLists { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularListsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList children; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList scarves; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawList; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder child(final T child) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.add(child); @@ -45,7 +38,6 @@ public BuilderSingularListsBuilder child(final T child) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder children(final java.util.Collection children) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.addAll(children); @@ -53,14 +45,12 @@ public BuilderSingularListsBuilder children(final java.util.Collection clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder scarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); @@ -68,7 +58,6 @@ public BuilderSingularListsBuilder scarf(final Number scarf) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.addAll(scarves); @@ -76,14 +65,12 @@ public BuilderSingularListsBuilder scarves(final java.util.Collection clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); @@ -91,7 +78,6 @@ public BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.addAll(rawList); @@ -99,25 +85,21 @@ public BuilderSingularListsBuilder rawList(final java.util.Collection rawL } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularListsBuilder clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularLists build() { java.util.List children; switch (this.children == null ? 0 : this.children.size()) { case 0: children = java.util.Collections.emptyList(); break; - case 1: children = java.util.Collections.singletonList(this.children.get(0)); break; - default: children = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.children)); } @@ -126,11 +108,9 @@ public BuilderSingularLists build() { case 0: scarves = java.util.Collections.emptyList(); break; - case 1: scarves = java.util.Collections.singletonList(this.scarves.get(0)); break; - default: scarves = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.scarves)); } @@ -139,11 +119,9 @@ public BuilderSingularLists build() { case 0: rawList = java.util.Collections.emptyList(); break; - case 1: rawList = java.util.Collections.singletonList(this.rawList.get(0)); break; - default: rawList = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.rawList)); } @@ -152,14 +130,12 @@ public BuilderSingularLists build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularListsBuilder builder() { return new BuilderSingularListsBuilder(); } diff --git a/testData/after/builder/BuilderSingularMaps.java b/testData/after/builder/BuilderSingularMaps.java index 8dc2a4635..875938628 100644 --- a/testData/after/builder/BuilderSingularMaps.java +++ b/testData/after/builder/BuilderSingularMaps.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 //FORMAT: javaLangAsFQN = skip //FORMAT: generated = skip @@ -14,7 +14,6 @@ class BuilderSingularMaps { private Map stringMap; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularMaps(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { this.women = women; this.men = men; @@ -24,40 +23,29 @@ class BuilderSingularMaps { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularMapsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList women$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList women$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList men$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList men$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawMap$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawMap$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList stringMap$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList stringMap$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularMapsBuilder woman(final K womanKey, final V womanValue) { if (this.women$key == null) { this.women$key = new java.util.ArrayList(); @@ -69,7 +57,6 @@ public BuilderSingularMapsBuilder woman(final K womanKey, final V womanVal } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularMapsBuilder women(final java.util.Map women) { if (this.women$key == null) { this.women$key = new java.util.ArrayList(); @@ -83,7 +70,6 @@ public BuilderSingularMapsBuilder women(final java.util.Map clearWomen() { if (this.women$key != null) { this.women$key.clear(); @@ -93,7 +79,6 @@ public BuilderSingularMapsBuilder clearWomen() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularMapsBuilder man(final K manKey, final Number manValue) { if (this.men$key == null) { this.men$key = new java.util.ArrayList(); @@ -105,7 +90,6 @@ public BuilderSingularMapsBuilder man(final K manKey, final Number manValu } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularMapsBuilder men(final java.util.Map men) { if (this.men$key == null) { this.men$key = new java.util.ArrayList(); @@ -119,7 +103,6 @@ public BuilderSingularMapsBuilder men(final java.util.Map clearMen() { if (this.men$key != null) { this.men$key.clear(); @@ -129,7 +112,6 @@ public BuilderSingularMapsBuilder clearMen() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularMapsBuilder rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList(); @@ -141,7 +123,6 @@ public BuilderSingularMapsBuilder rawMap(final java.lang.Object rawMapKey, } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularMapsBuilder rawMap(final java.util.Map rawMap) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList(); @@ -155,7 +136,6 @@ public BuilderSingularMapsBuilder rawMap(final java.util.Map rawMap) } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularMapsBuilder clearRawMap() { if (this.rawMap$key != null) { this.rawMap$key.clear(); @@ -165,7 +145,6 @@ public BuilderSingularMapsBuilder clearRawMap() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularMapsBuilder stringMap(final String stringMapKey, final V stringMapValue) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList(); @@ -177,7 +156,6 @@ public BuilderSingularMapsBuilder stringMap(final String stringMapKey, fin } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularMapsBuilder stringMap(final java.util.Map stringMap) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList(); @@ -191,7 +169,6 @@ public BuilderSingularMapsBuilder stringMap(final java.util.Map clearStringMap() { if (this.stringMap$key != null) { this.stringMap$key.clear(); @@ -201,39 +178,34 @@ public BuilderSingularMapsBuilder clearStringMap() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularMaps build() { java.util.Map women; switch (this.women$key == null ? 0 : this.women$key.size()) { case 0: women = java.util.Collections.emptyMap(); break; - case 1: women = java.util.Collections.singletonMap(this.women$key.get(0), this.women$value.get(0)); break; - default: women = new java.util.LinkedHashMap(this.women$key.size() < 1073741824 ? 1 + this.women$key.size() + (this.women$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); - for (int $i = 0; $i < this.women$key.size(); $i++) women.put(this.women$key.get($i), this.women$value.get($i)); + for (int $i = 0; $i < this.women$key.size(); $i++) women.put(this.women$key.get($i), (V) this.women$value.get($i)); women = java.util.Collections.unmodifiableMap(women); } java.util.SortedMap men = new java.util.TreeMap(); - if (this.men$key != null) for (int $i = 0; $i < (this.men$key == null ? 0 : this.men$key.size()); $i++) men.put(this.men$key.get($i), this.men$value.get($i)); + if (this.men$key != null) for (int $i = 0; $i < (this.men$key == null ? 0 : this.men$key.size()); $i++) men.put(this.men$key.get($i), (Number) this.men$value.get($i)); men = java.util.Collections.unmodifiableSortedMap(men); java.util.Map rawMap; switch (this.rawMap$key == null ? 0 : this.rawMap$key.size()) { case 0: rawMap = java.util.Collections.emptyMap(); break; - case 1: rawMap = java.util.Collections.singletonMap(this.rawMap$key.get(0), this.rawMap$value.get(0)); break; - default: rawMap = new java.util.LinkedHashMap(this.rawMap$key.size() < 1073741824 ? 1 + this.rawMap$key.size() + (this.rawMap$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); - for (int $i = 0; $i < this.rawMap$key.size(); $i++) rawMap.put(this.rawMap$key.get($i), this.rawMap$value.get($i)); + for (int $i = 0; $i < this.rawMap$key.size(); $i++) rawMap.put(this.rawMap$key.get($i), (java.lang.Object) this.rawMap$value.get($i)); rawMap = java.util.Collections.unmodifiableMap(rawMap); } java.util.Map stringMap; @@ -241,14 +213,12 @@ public BuilderSingularMaps build() { case 0: stringMap = java.util.Collections.emptyMap(); break; - case 1: stringMap = java.util.Collections.singletonMap(this.stringMap$key.get(0), this.stringMap$value.get(0)); break; - default: stringMap = new java.util.LinkedHashMap(this.stringMap$key.size() < 1073741824 ? 1 + this.stringMap$key.size() + (this.stringMap$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); - for (int $i = 0; $i < this.stringMap$key.size(); $i++) stringMap.put(this.stringMap$key.get($i), this.stringMap$value.get($i)); + for (int $i = 0; $i < this.stringMap$key.size(); $i++) stringMap.put(this.stringMap$key.get($i), (V) this.stringMap$value.get($i)); stringMap = java.util.Collections.unmodifiableMap(stringMap); } return new BuilderSingularMaps(women, men, rawMap, stringMap); @@ -256,14 +226,12 @@ public BuilderSingularMaps build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public 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 + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularMapsBuilder builder() { return new BuilderSingularMapsBuilder(); } diff --git a/testData/after/builder/BuilderSingularNoAuto.java b/testData/after/builder/BuilderSingularNoAuto.java index e23f3e5d4..a15d73821 100644 --- a/testData/after/builder/BuilderSingularNoAuto.java +++ b/testData/after/builder/BuilderSingularNoAuto.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 //CONF: lombok.singular.auto = false import java.util.List; @@ -9,7 +9,6 @@ class BuilderSingularNoAuto { private List items; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularNoAuto(final List things, final List widgets, final List items) { this.things = things; this.widgets = widgets; @@ -18,25 +17,19 @@ class BuilderSingularNoAuto { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularNoAutoBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList things; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList widgets; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList items; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder thing(final String thing) { if (this.things == null) this.things = new java.util.ArrayList(); this.things.add(thing); @@ -44,7 +37,6 @@ public BuilderSingularNoAutoBuilder thing(final String thing) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder things(final java.util.Collection things) { if (this.things == null) this.things = new java.util.ArrayList(); this.things.addAll(things); @@ -52,14 +44,12 @@ public BuilderSingularNoAutoBuilder things(final java.util.Collection(); this.widgets.add(widget); @@ -67,7 +57,6 @@ public BuilderSingularNoAutoBuilder widget(final String widget) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder widgets(final java.util.Collection widgets) { if (this.widgets == null) this.widgets = new java.util.ArrayList(); this.widgets.addAll(widgets); @@ -75,14 +64,12 @@ public BuilderSingularNoAutoBuilder widgets(final java.util.Collection(); this.items.add(item); @@ -90,7 +77,6 @@ public BuilderSingularNoAutoBuilder item(final String item) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularNoAutoBuilder items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); @@ -98,25 +84,21 @@ public BuilderSingularNoAutoBuilder items(final java.util.Collection things; switch (this.things == null ? 0 : this.things.size()) { case 0: things = java.util.Collections.emptyList(); break; - case 1: things = java.util.Collections.singletonList(this.things.get(0)); break; - default: things = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.things)); } @@ -125,11 +107,9 @@ public BuilderSingularNoAuto build() { case 0: widgets = java.util.Collections.emptyList(); break; - case 1: widgets = java.util.Collections.singletonList(this.widgets.get(0)); break; - default: widgets = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.widgets)); } @@ -138,11 +118,9 @@ public BuilderSingularNoAuto build() { case 0: items = java.util.Collections.emptyList(); break; - case 1: items = java.util.Collections.singletonList(this.items.get(0)); break; - default: items = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.items)); } @@ -151,14 +129,12 @@ public BuilderSingularNoAuto build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAutoBuilder(); } diff --git a/testData/after/builder/BuilderSingularRedirectToGuava.java b/testData/after/builder/BuilderSingularRedirectToGuava.java index 6b843bcb9..3cbeae99b 100644 --- a/testData/after/builder/BuilderSingularRedirectToGuava.java +++ b/testData/after/builder/BuilderSingularRedirectToGuava.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 //CONF: lombok.singular.useGuava = true import java.util.Set; @@ -11,7 +11,6 @@ class BuilderSingularRedirectToGuava { private Collection> doohickeys; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { this.dangerMice = dangerMice; this.things = things; @@ -20,28 +19,21 @@ class BuilderSingularRedirectToGuava { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularRedirectToGuavaBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList dangerMice; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList things$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList things$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList> doohickeys; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); @@ -49,7 +41,6 @@ public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMous } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.util.Collection dangerMice) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList(); this.dangerMice.addAll(dangerMice); @@ -57,14 +48,12 @@ public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.util.Collecti } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder clearDangerMice() { if (this.dangerMice != null) this.dangerMice.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder thing(final Integer thingKey, final Number thingValue) { if (this.things$key == null) { this.things$key = new java.util.ArrayList(); @@ -76,7 +65,6 @@ public BuilderSingularRedirectToGuavaBuilder thing(final Integer thingKey, final } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map things) { if (this.things$key == null) { this.things$key = new java.util.ArrayList(); @@ -90,7 +78,6 @@ public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map doohickey) { if (this.doohickeys == null) this.doohickeys = new java.util.ArrayList>(); this.doohickeys.add(doohickey); @@ -108,7 +94,6 @@ public BuilderSingularRedirectToGuavaBuilder doohickey(final Class doohickey) } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.util.Collection> doohickeys) { if (this.doohickeys == null) this.doohickeys = new java.util.ArrayList>(); this.doohickeys.addAll(doohickeys); @@ -116,43 +101,37 @@ public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.util.Collecti } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { if (this.doohickeys != null) this.doohickeys.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularRedirectToGuava build() { java.util.Set dangerMice; switch (this.dangerMice == null ? 0 : this.dangerMice.size()) { case 0: dangerMice = java.util.Collections.emptySet(); break; - case 1: dangerMice = java.util.Collections.singleton(this.dangerMice.get(0)); break; - default: dangerMice = new java.util.LinkedHashSet(this.dangerMice.size() < 1073741824 ? 1 + this.dangerMice.size() + (this.dangerMice.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); dangerMice.addAll(this.dangerMice); dangerMice = java.util.Collections.unmodifiableSet(dangerMice); } java.util.NavigableMap things = new java.util.TreeMap(); - if (this.things$key != null) for (int $i = 0; $i < (this.things$key == null ? 0 : this.things$key.size()); $i++) things.put(this.things$key.get($i), this.things$value.get($i)); + if (this.things$key != null) for (int $i = 0; $i < (this.things$key == null ? 0 : this.things$key.size()); $i++) things.put(this.things$key.get($i), (Number) this.things$value.get($i)); things = java.util.Collections.unmodifiableNavigableMap(things); java.util.Collection> doohickeys; switch (this.doohickeys == null ? 0 : this.doohickeys.size()) { case 0: doohickeys = java.util.Collections.emptyList(); break; - case 1: doohickeys = java.util.Collections.singletonList(this.doohickeys.get(0)); break; - default: doohickeys = java.util.Collections.unmodifiableList(new java.util.ArrayList>(this.doohickeys)); } @@ -161,14 +140,12 @@ public BuilderSingularRedirectToGuava build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things$key=" + this.things$key + ", things$value=" + this.things$value + ", doohickeys=" + this.doohickeys + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuavaBuilder(); } diff --git a/testData/after/builder/BuilderSingularSets.java b/testData/after/builder/BuilderSingularSets.java index 451593458..d5e7f930a 100644 --- a/testData/after/builder/BuilderSingularSets.java +++ b/testData/after/builder/BuilderSingularSets.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.Set; import java.util.SortedSet; @@ -11,7 +11,6 @@ class BuilderSingularSets { private Set stringSet; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { this.dangerMice = dangerMice; this.octopodes = octopodes; @@ -21,28 +20,21 @@ class BuilderSingularSets { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularSetsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList dangerMice; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList octopodes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawSet; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList stringSet; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularSetsBuilder dangerMouse(final T dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); @@ -50,7 +42,6 @@ public BuilderSingularSetsBuilder dangerMouse(final T dangerMouse) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularSetsBuilder dangerMice(final java.util.Collection dangerMice) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList(); this.dangerMice.addAll(dangerMice); @@ -58,14 +49,12 @@ public BuilderSingularSetsBuilder dangerMice(final java.util.Collection clearDangerMice() { if (this.dangerMice != null) this.dangerMice.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularSetsBuilder octopus(final Number octopus) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); @@ -73,7 +62,6 @@ public BuilderSingularSetsBuilder octopus(final Number octopus) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularSetsBuilder octopodes(final java.util.Collection octopodes) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList(); this.octopodes.addAll(octopodes); @@ -81,14 +69,12 @@ public BuilderSingularSetsBuilder octopodes(final java.util.Collection clearOctopodes() { if (this.octopodes != null) this.octopodes.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularSetsBuilder rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); @@ -96,7 +82,6 @@ public BuilderSingularSetsBuilder rawSet(final java.lang.Object rawSet) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularSetsBuilder rawSet(final java.util.Collection rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList(); this.rawSet.addAll(rawSet); @@ -104,14 +89,12 @@ public BuilderSingularSetsBuilder rawSet(final java.util.Collection rawSet } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularSetsBuilder clearRawSet() { if (this.rawSet != null) this.rawSet.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularSetsBuilder stringSet(final String stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); @@ -119,7 +102,6 @@ public BuilderSingularSetsBuilder stringSet(final String stringSet) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularSetsBuilder stringSet(final java.util.Collection stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList(); this.stringSet.addAll(stringSet); @@ -127,25 +109,21 @@ public BuilderSingularSetsBuilder stringSet(final java.util.Collection clearStringSet() { if (this.stringSet != null) this.stringSet.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularSets build() { java.util.Set dangerMice; switch (this.dangerMice == null ? 0 : this.dangerMice.size()) { case 0: dangerMice = java.util.Collections.emptySet(); break; - case 1: dangerMice = java.util.Collections.singleton(this.dangerMice.get(0)); break; - default: dangerMice = new java.util.LinkedHashSet(this.dangerMice.size() < 1073741824 ? 1 + this.dangerMice.size() + (this.dangerMice.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); dangerMice.addAll(this.dangerMice); @@ -159,11 +137,9 @@ public BuilderSingularSets build() { case 0: rawSet = java.util.Collections.emptySet(); break; - case 1: rawSet = java.util.Collections.singleton(this.rawSet.get(0)); break; - default: rawSet = new java.util.LinkedHashSet(this.rawSet.size() < 1073741824 ? 1 + this.rawSet.size() + (this.rawSet.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); rawSet.addAll(this.rawSet); @@ -174,11 +150,9 @@ public BuilderSingularSets build() { case 0: stringSet = java.util.Collections.emptySet(); break; - case 1: stringSet = java.util.Collections.singleton(this.stringSet.get(0)); break; - default: stringSet = new java.util.LinkedHashSet(this.stringSet.size() < 1073741824 ? 1 + this.stringSet.size() + (this.stringSet.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); stringSet.addAll(this.stringSet); @@ -189,14 +163,12 @@ public BuilderSingularSets build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularSetsBuilder builder() { return new BuilderSingularSetsBuilder(); } diff --git a/testData/after/builder/BuilderSingularWithPrefixes.java b/testData/after/builder/BuilderSingularWithPrefixes.java index 2c5ab8fa2..933fa83f0 100644 --- a/testData/after/builder/BuilderSingularWithPrefixes.java +++ b/testData/after/builder/BuilderSingularWithPrefixes.java @@ -1,29 +1,25 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 +@lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixes { private java.util.List _elems; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularWithPrefixes(final java.util.List elems) { this._elems = elems; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderSingularWithPrefixesBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularWithPrefixesBuilder elem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); @@ -31,7 +27,6 @@ public BuilderSingularWithPrefixesBuilder elem(final String elem) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderSingularWithPrefixesBuilder elems(final java.util.Collection elems) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.addAll(elems); @@ -39,26 +34,22 @@ public BuilderSingularWithPrefixesBuilder elems(final java.util.Collection elems; switch (this.elems == null ? 0 : this.elems.size()) { - case 0: + case 0: elems = java.util.Collections.emptyList(); break; - - case 1: + case 1: elems = java.util.Collections.singletonList(this.elems.get(0)); break; - - default: + default: elems = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.elems)); } return new BuilderSingularWithPrefixes(elems); @@ -66,14 +57,12 @@ public BuilderSingularWithPrefixes build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderSingularWithPrefixesBuilder builder() { return new BuilderSingularWithPrefixesBuilder(); } diff --git a/testData/after/builder/BuilderValueData.java b/testData/after/builder/BuilderValueData.java index d08c6149c..a5c336f33 100644 --- a/testData/after/builder/BuilderValueData.java +++ b/testData/after/builder/BuilderValueData.java @@ -1,42 +1,45 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + import java.util.List; +//added "final" do lombok class final class BuilderAndValue { private final int zero = 0; + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderAndValue() { } + + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderAndValueBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderAndValueBuilder() { } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderAndValue build() { return new BuilderAndValue(); } + @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderAndValue.BuilderAndValueBuilder()"; } } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderAndValueBuilder builder() { return new BuilderAndValueBuilder(); } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getZero() { return this.zero; } + @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndValue)) return false; @@ -44,18 +47,18 @@ public boolean equals(final java.lang.Object o) { if (this.getZero() != other.getZero()) return false; return true; } + @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; result = result * PRIME + this.getZero(); return result; } + @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderAndValue(zero=" + this.getZero() + ")"; } @@ -63,42 +66,42 @@ public java.lang.String toString() { class BuilderAndData { private final int zero = 0; + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderAndData() { } + + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderAndDataBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderAndDataBuilder() { } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderAndData build() { return new BuilderAndData(); } + @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderAndData.BuilderAndDataBuilder()"; } } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderAndDataBuilder builder() { return new BuilderAndDataBuilder(); } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getZero() { return this.zero; } + @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndData)) return false; @@ -107,23 +110,23 @@ public boolean equals(final java.lang.Object o) { if (this.getZero() != other.getZero()) return false; return true; } + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof BuilderAndData; } + @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; result = result * PRIME + this.getZero(); return result; } + @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderAndData(zero=" + this.getZero() + ")"; } diff --git a/testData/after/builder/BuilderWithAccessors.java b/testData/after/builder/BuilderWithAccessors.java index 59965e757..b1a8b66ac 100644 --- a/testData/after/builder/BuilderWithAccessors.java +++ b/testData/after/builder/BuilderWithAccessors.java @@ -1,5 +1,6 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 +@lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors { private final int plower; private final int pUpper; @@ -7,7 +8,6 @@ class BuilderWithAccessors { private int __bar; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { this.plower = plower; this.pUpper = upper; @@ -17,70 +17,57 @@ class BuilderWithAccessors { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderWithAccessorsBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int plower; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int upper; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int foo; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int _bar; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithAccessorsBuilder plower(final int plower) { this.plower = plower; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithAccessorsBuilder upper(final int upper) { this.upper = upper; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithAccessorsBuilder foo(final int foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithAccessorsBuilder _bar(final int _bar) { this._bar = _bar; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithAccessors build() { return new BuilderWithAccessors(plower, upper, foo, _bar); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderWithAccessorsBuilder builder() { return new BuilderWithAccessorsBuilder(); } diff --git a/testData/after/builder/BuilderWithDeprecatedField.java b/testData/after/builder/BuilderWithDeprecatedField.java index 6dd3e71a2..e1b2a9715 100644 --- a/testData/after/builder/BuilderWithDeprecatedField.java +++ b/testData/after/builder/BuilderWithDeprecatedField.java @@ -1,82 +1,94 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + public class BuilderWithDeprecatedField { private String bar; - @Deprecated private String foo; - @Deprecated private java.util.List xyzs; - @java.beans.ConstructorProperties({"bar", "foo", "xyzs"}) - BuilderWithDeprecatedField(String bar, String foo, java.util.List xyzs) { + @java.lang.SuppressWarnings("all") + BuilderWithDeprecatedField(final String bar, final String foo, final java.util.List xyzs) { this.bar = bar; this.foo = foo; this.xyzs = xyzs; } - public static BuilderWithDeprecatedFieldBuilder builder() { - return new BuilderWithDeprecatedFieldBuilder(); - } + @java.lang.SuppressWarnings("all") public static class BuilderWithDeprecatedFieldBuilder { + @java.lang.SuppressWarnings("all") private String bar; + @java.lang.SuppressWarnings("all") private String foo; + @java.lang.SuppressWarnings("all") private java.util.ArrayList xyzs; + @java.lang.SuppressWarnings("all") BuilderWithDeprecatedFieldBuilder() { } - public BuilderWithDeprecatedFieldBuilder bar(String bar) { + @java.lang.SuppressWarnings("all") + public BuilderWithDeprecatedFieldBuilder bar(final String bar) { this.bar = bar; return this; } - @Deprecated - public BuilderWithDeprecatedFieldBuilder foo(String foo) { + @java.lang.Deprecated + @java.lang.SuppressWarnings("all") + public BuilderWithDeprecatedFieldBuilder foo(final String foo) { this.foo = foo; return this; } - @Deprecated - public BuilderWithDeprecatedFieldBuilder xyz(String xyz) { + @java.lang.Deprecated + @java.lang.SuppressWarnings("all") + public BuilderWithDeprecatedFieldBuilder xyz(final String xyz) { if (this.xyzs == null) this.xyzs = new java.util.ArrayList(); this.xyzs.add(xyz); return this; } - @Deprecated - public BuilderWithDeprecatedFieldBuilder xyzs(java.util.Collection xyzs) { + @java.lang.Deprecated + @java.lang.SuppressWarnings("all") + public BuilderWithDeprecatedFieldBuilder xyzs(final java.util.Collection xyzs) { if (this.xyzs == null) this.xyzs = new java.util.ArrayList(); this.xyzs.addAll(xyzs); return this; } - @Deprecated + @java.lang.Deprecated + @java.lang.SuppressWarnings("all") public BuilderWithDeprecatedFieldBuilder clearXyzs() { - if (this.xyzs != null) - this.xyzs.clear(); - + if (this.xyzs != null) this.xyzs.clear(); return this; } + @java.lang.SuppressWarnings("all") public BuilderWithDeprecatedField build() { java.util.List xyzs; switch (this.xyzs == null ? 0 : this.xyzs.size()) { - case 0: - xyzs = java.util.Collections.emptyList(); - break; - case 1: - xyzs = java.util.Collections.singletonList(this.xyzs.get(0)); - break; - default: - xyzs = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.xyzs)); + case 0: + xyzs = java.util.Collections.emptyList(); + break; + case 1: + xyzs = java.util.Collections.singletonList(this.xyzs.get(0)); + break; + default: + xyzs = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.xyzs)); } - return new BuilderWithDeprecatedField(bar, foo, xyzs); } - public String toString() { + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "BuilderWithDeprecatedField.BuilderWithDeprecatedFieldBuilder(bar=" + this.bar + ", foo=" + this.foo + ", xyzs=" + this.xyzs + ")"; } } + + @java.lang.SuppressWarnings("all") + public static BuilderWithDeprecatedFieldBuilder builder() { + return new BuilderWithDeprecatedFieldBuilder(); + } } diff --git a/testData/after/builder/BuilderWithDeprecatedParam.java b/testData/after/builder/BuilderWithDeprecatedParam.java index b59741b7c..30ced86d6 100644 --- a/testData/after/builder/BuilderWithDeprecatedParam.java +++ b/testData/after/builder/BuilderWithDeprecatedParam.java @@ -1,37 +1,49 @@ -public class BuilderWithDeprecatedParam { +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 +public class BuilderWithDeprecatedParam { private static java.util.Collection creator(String bar, @Deprecated String foo) { return java.util.Arrays.asList(bar, foo); } - public static CollectionBuilder builder() { - return new CollectionBuilder(); - } + @java.lang.SuppressWarnings("all") public static class CollectionBuilder { + @java.lang.SuppressWarnings("all") private String bar; + @java.lang.SuppressWarnings("all") private String foo; + @java.lang.SuppressWarnings("all") CollectionBuilder() { } - public CollectionBuilder bar(String bar) { + @java.lang.SuppressWarnings("all") + public CollectionBuilder bar(final String bar) { this.bar = bar; return this; } - @Deprecated - public CollectionBuilder foo(String foo) { + @java.lang.Deprecated + @java.lang.SuppressWarnings("all") + public CollectionBuilder foo(final String foo) { this.foo = foo; return this; } + @java.lang.SuppressWarnings("all") public java.util.Collection build() { return BuilderWithDeprecatedParam.creator(bar, foo); } - public String toString() { + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "BuilderWithDeprecatedParam.CollectionBuilder(bar=" + this.bar + ", foo=" + this.foo + ")"; } } + + @java.lang.SuppressWarnings("all") + public static CollectionBuilder builder() { + return new CollectionBuilder(); + } } diff --git a/testData/after/builder/BuilderWithExistingBuilderClass.java b/testData/after/builder/BuilderWithExistingBuilderClass.java index 5245dd498..b179e55df 100644 --- a/testData/after/builder/BuilderWithExistingBuilderClass.java +++ b/testData/after/builder/BuilderWithExistingBuilderClass.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class BuilderWithExistingBuilderClass { public static BuilderWithExistingBuilderClass staticMethod(Z arg1, boolean arg2, String arg3) { @@ -8,10 +8,8 @@ public static BuilderWithExistingBuilderClass stat public static class BuilderWithExistingBuilderClassBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private boolean arg2; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String arg3; private Z arg1; @@ -19,41 +17,34 @@ public void arg2(boolean arg) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithExistingBuilderClassBuilder arg1(final Z arg1) { this.arg1 = arg1; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithExistingBuilderClassBuilder arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - // added generic parameters to delomboked code - public BuilderWithExistingBuilderClass build() { + public BuilderWithExistingBuilderClass build() { return BuilderWithExistingBuilderClass.staticMethod(arg1, arg2, arg3); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderWithExistingBuilderClassBuilder builder() { return new BuilderWithExistingBuilderClassBuilder(); } diff --git a/testData/after/builder/BuilderWithFieldAccessors.java b/testData/after/builder/BuilderWithFieldAccessors.java index d5c6df2dc..c97d38912 100644 --- a/testData/after/builder/BuilderWithFieldAccessors.java +++ b/testData/after/builder/BuilderWithFieldAccessors.java @@ -1,74 +1,66 @@ -public class BuilderWithFieldAccessors { - private final int pUpper; - private int _foo; - private String mBar; +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - BuilderWithFieldAccessors(final int upper, final int foo, final String bar) { - this.pUpper = upper; - this._foo = foo; - this.mBar = bar; - } +@lombok.experimental.Accessors(prefix = "m") +public class BuilderWithFieldAccessors { + @lombok.experimental.Accessors(prefix = "p") + private final int pUpper; + @lombok.experimental.Accessors(prefix = "_") + private int _foo; + private String mBar; - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public static class BuilderWithFieldAccessorsBuilder { - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - private int upper; + @java.lang.SuppressWarnings("all") + BuilderWithFieldAccessors(final int upper, final int foo, final String bar) { + this.pUpper = upper; + this._foo = foo; + this.mBar = bar; + } - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - private int foo; - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - private String bar; + @java.lang.SuppressWarnings("all") + public static class BuilderWithFieldAccessorsBuilder { + @java.lang.SuppressWarnings("all") + private int upper; + @java.lang.SuppressWarnings("all") + private int foo; + @java.lang.SuppressWarnings("all") + private String bar; - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - BuilderWithFieldAccessorsBuilder() { - } + @java.lang.SuppressWarnings("all") + BuilderWithFieldAccessorsBuilder() { + } - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public BuilderWithFieldAccessorsBuilder upper(final int upper) { - this.upper = upper; - return this; - } + @java.lang.SuppressWarnings("all") + public BuilderWithFieldAccessorsBuilder upper(final int upper) { + this.upper = upper; + return this; + } - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public BuilderWithFieldAccessorsBuilder foo(final int foo) { - this.foo = foo; - return this; - } + @java.lang.SuppressWarnings("all") + public BuilderWithFieldAccessorsBuilder foo(final int foo) { + this.foo = foo; + return this; + } - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public BuilderWithFieldAccessorsBuilder bar(final String bar) { - this.bar = bar; - return this; - } + @java.lang.SuppressWarnings("all") + public BuilderWithFieldAccessorsBuilder bar(final String bar) { + this.bar = bar; + return this; + } - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public BuilderWithFieldAccessors build() { - return new BuilderWithFieldAccessors(upper, foo, bar); - } + @java.lang.SuppressWarnings("all") + public BuilderWithFieldAccessors build() { + return new BuilderWithFieldAccessors(upper, foo, bar); + } - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public java.lang.String toString() { - return "BuilderWithFieldAccessors.BuilderWithFieldAccessorsBuilder(upper=" + this.upper + ", foo=" + this.foo + ", bar=" + this.bar + ")"; - } - } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "BuilderWithFieldAccessors.BuilderWithFieldAccessorsBuilder(upper=" + this.upper + ", foo=" + this.foo + ", bar=" + this.bar + ")"; + } + } - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public static BuilderWithFieldAccessorsBuilder builder() { - return new BuilderWithFieldAccessorsBuilder(); - } + @java.lang.SuppressWarnings("all") + public static BuilderWithFieldAccessorsBuilder builder() { + return new BuilderWithFieldAccessorsBuilder(); + } } diff --git a/testData/after/builder/BuilderWithNoBuilderMethod.java b/testData/after/builder/BuilderWithNoBuilderMethod.java index 35e2c79e8..384055898 100644 --- a/testData/after/builder/BuilderWithNoBuilderMethod.java +++ b/testData/after/builder/BuilderWithNoBuilderMethod.java @@ -1,31 +1,41 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class BuilderWithNoBuilderMethod { private String a = ""; + @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod(final String a) { this.a = a; } + + @java.lang.SuppressWarnings("all") public static class BuilderWithNoBuilderMethodBuilder { @java.lang.SuppressWarnings("all") private String a; + @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodBuilder() { } + @java.lang.SuppressWarnings("all") public BuilderWithNoBuilderMethodBuilder a(final String a) { this.a = a; return this; } + @java.lang.SuppressWarnings("all") public BuilderWithNoBuilderMethod build() { return new BuilderWithNoBuilderMethod(a); } + @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { return "BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder(a=" + this.a + ")"; } } + @java.lang.SuppressWarnings("all") public BuilderWithNoBuilderMethodBuilder toBuilder() { return new BuilderWithNoBuilderMethodBuilder().a(this.a); diff --git a/testData/after/builder/BuilderWithToBuilder.java b/testData/after/builder/BuilderWithToBuilder.java index a8db21da6..503936b6f 100644 --- a/testData/after/builder/BuilderWithToBuilder.java +++ b/testData/after/builder/BuilderWithToBuilder.java @@ -13,7 +13,6 @@ public static K rrr(BuilderWithToBuilder x) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderWithToBuilder(final String one, final String two, final T foo, final List bars) { this.mOne = one; this.mTwo = two; @@ -23,49 +22,39 @@ public static K rrr(BuilderWithToBuilder x) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderWithToBuilderBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String one; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String two; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private T foo; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList bars; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderBuilder one(final String one) { this.one = one; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderBuilder two(final String two) { this.two = two; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderBuilder foo(final T foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderBuilder bar(final T bar) { if (this.bars == null) this.bars = new java.util.ArrayList(); this.bars.add(bar); @@ -73,7 +62,6 @@ public BuilderWithToBuilderBuilder bar(final T bar) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderBuilder bars(final java.util.Collection bars) { if (this.bars == null) this.bars = new java.util.ArrayList(); this.bars.addAll(bars); @@ -81,14 +69,12 @@ public BuilderWithToBuilderBuilder bars(final java.util.Collection clearBars() { if (this.bars != null) this.bars.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilder build() { java.util.List bars; switch (this.bars == null ? 0 : this.bars.size()) { @@ -108,20 +94,17 @@ public BuilderWithToBuilder build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderWithToBuilderBuilder builder() { return new BuilderWithToBuilderBuilder(); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderBuilder toBuilder() { return new BuilderWithToBuilderBuilder().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars==null?java.util.Collections.emptyList():this.bars); } @@ -138,56 +121,46 @@ public ConstructorWithToBuilder(String mOne, T bar) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class ConstructorWithToBuilderBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String mOne; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private T bar; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ConstructorWithToBuilderBuilder mOne(final String mOne) { this.mOne = mOne; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ConstructorWithToBuilderBuilder bar(final T bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ConstructorWithToBuilder build() { return new ConstructorWithToBuilder(mOne, bar); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static ConstructorWithToBuilderBuilder builder() { return new ConstructorWithToBuilderBuilder(); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ConstructorWithToBuilderBuilder toBuilder() { return new ConstructorWithToBuilderBuilder().mOne(this.mOne).bar(this.foo); } @@ -206,56 +179,46 @@ public static StaticWithToBuilder test(String mOne, Z bar) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class StaticWithToBuilderBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String mOne; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private Z bar; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StaticWithToBuilderBuilder mOne(final String mOne) { this.mOne = mOne; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StaticWithToBuilderBuilder bar(final Z bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StaticWithToBuilder build() { return StaticWithToBuilder.test(mOne, bar); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "StaticWithToBuilder.StaticWithToBuilderBuilder(mOne=" + this.mOne + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static StaticWithToBuilderBuilder builder() { return new StaticWithToBuilderBuilder(); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public StaticWithToBuilderBuilder toBuilder() { return new StaticWithToBuilderBuilder().mOne(this.mOne).bar(this.foo); } diff --git a/testData/after/builder/BuilderWithToBuilderOnClass.java b/testData/after/builder/BuilderWithToBuilderOnClass.java index 9436b16eb..aa1702fbd 100644 --- a/testData/after/builder/BuilderWithToBuilderOnClass.java +++ b/testData/after/builder/BuilderWithToBuilderOnClass.java @@ -11,7 +11,6 @@ public static K rrr(BuilderWithToBuilderOnClass x) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderWithToBuilderOnClass(final String one, final String two, final T foo, final int bar) { this.one = one; this.two = two; @@ -21,76 +20,62 @@ public static K rrr(BuilderWithToBuilderOnClass x) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderWithToBuilderOnClassBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String one; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String two; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private T foo; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int bar; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderWithToBuilderOnClassBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnClassBuilder one(final String one) { this.one = one; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnClassBuilder two(final String two) { this.two = two; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnClassBuilder foo(final T foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnClassBuilder bar(final int bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnClass build() { return new BuilderWithToBuilderOnClass(one, two, foo, bar); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderWithToBuilderOnClass.BuilderWithToBuilderOnClassBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderWithToBuilderOnClassBuilder builder() { return new BuilderWithToBuilderOnClassBuilder(); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnClassBuilder toBuilder() { return new BuilderWithToBuilderOnClassBuilder().one(this.one).two(this.two).foo(BuilderWithToBuilderOnClass.rrr(this)).bar(this.bar); } diff --git a/testData/after/builder/BuilderWithToBuilderOnConstructor.java b/testData/after/builder/BuilderWithToBuilderOnConstructor.java index 981643e5a..8cdf28571 100644 --- a/testData/after/builder/BuilderWithToBuilderOnConstructor.java +++ b/testData/after/builder/BuilderWithToBuilderOnConstructor.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class BuilderWithToBuilderOnConstructor { private String one; @@ -11,56 +11,46 @@ public BuilderWithToBuilderOnConstructor(String one, T bar) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderWithToBuilderOnConstructorBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String one; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private T bar; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderWithToBuilderOnConstructorBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnConstructorBuilder one(final String one) { this.one = one; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnConstructorBuilder bar(final T bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnConstructor build() { return new BuilderWithToBuilderOnConstructor(one, bar); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderWithToBuilderOnConstructor.BuilderWithToBuilderOnConstructorBuilder(one=" + this.one + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderWithToBuilderOnConstructorBuilder builder() { return new BuilderWithToBuilderOnConstructorBuilder(); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnConstructorBuilder toBuilder() { return new BuilderWithToBuilderOnConstructorBuilder().one(this.one).bar(this.foo); } diff --git a/testData/after/builder/BuilderWithToBuilderOnMethod.java b/testData/after/builder/BuilderWithToBuilderOnMethod.java index 3790570fb..e78050083 100644 --- a/testData/after/builder/BuilderWithToBuilderOnMethod.java +++ b/testData/after/builder/BuilderWithToBuilderOnMethod.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class BuilderWithToBuilderOnMethod { private String one; @@ -13,56 +13,46 @@ public static BuilderWithToBuilderOnMethod test(String one, Z bar @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class BuilderWithToBuilderOnMethodBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String one; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private Z bar; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") BuilderWithToBuilderOnMethodBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnMethodBuilder one(final String one) { this.one = one; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnMethodBuilder bar(final Z bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnMethod build() { return BuilderWithToBuilderOnMethod.test(one, bar); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "BuilderWithToBuilderOnMethod.BuilderWithToBuilderOnMethodBuilder(one=" + this.one + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static BuilderWithToBuilderOnMethodBuilder builder() { return new BuilderWithToBuilderOnMethodBuilder(); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public BuilderWithToBuilderOnMethodBuilder toBuilder() { return new BuilderWithToBuilderOnMethodBuilder().one(this.one).bar(this.foo); } diff --git a/testData/after/builder/BuilderWithTolerate.java b/testData/after/builder/BuilderWithTolerate.java index e83f1b90d..0a4d633b0 100644 --- a/testData/after/builder/BuilderWithTolerate.java +++ b/testData/after/builder/BuilderWithTolerate.java @@ -1,40 +1,52 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + import lombok.experimental.Tolerate; public class BuilderWithTolerate { private final int value; + public static void main(String[] args) { BuilderWithTolerate.builder().value("42").build(); } + + public static class BuilderWithTolerateBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private int value; + @Tolerate public BuilderWithTolerateBuilder value(String s) { return this.value(Integer.parseInt(s)); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") BuilderWithTolerateBuilder() { } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public BuilderWithTolerateBuilder value(final int value) { this.value = value; return this; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public BuilderWithTolerate build() { return new BuilderWithTolerate(value); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value + ")"; } } - @SuppressWarnings("all") - BuilderWithTolerate(final int value) { + + @java.lang.SuppressWarnings("all") + BuilderWithTolerate(final int value) { this.value = value; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static BuilderWithTolerateBuilder builder() { return new BuilderWithTolerateBuilder(); } diff --git a/testData/after/builder/BuilderGenerics.java b/testData/after/builder/ObjectApiResponse.java similarity index 91% rename from testData/after/builder/BuilderGenerics.java rename to testData/after/builder/ObjectApiResponse.java index ddb9d0820..7a93f89c4 100644 --- a/testData/after/builder/BuilderGenerics.java +++ b/testData/after/builder/ObjectApiResponse.java @@ -1,10 +1,8 @@ -import lombok.Singular; public class ObjectApiResponse { private K response; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") ObjectApiResponse(K response) { this.response = response; } @@ -15,21 +13,18 @@ public static void create(Z res, ObjectApiResponseBuilder builder) { public static class ObjectApiResponseBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private T response; ObjectApiResponseBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ObjectApiResponseBuilder response(T response) { this.response=response; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ObjectApiResponse build() { return new ObjectApiResponse(response); } diff --git a/testData/after/builder/Singular/Generic/Guava/SingularGuavaBiMap.java b/testData/after/builder/Singular/Generic/Guava/SingularGuavaBiMap.java index e7950134a..3af663159 100644 --- a/testData/after/builder/Singular/Generic/Guava/SingularGuavaBiMap.java +++ b/testData/after/builder/Singular/Generic/Guava/SingularGuavaBiMap.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import com.google.common.collect.ImmutableBiMap; @@ -12,7 +12,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaBiMap(final ImmutableBiMap rawTypes, final ImmutableBiMap integers, final ImmutableBiMap generics, final ImmutableBiMap extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -22,28 +21,21 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularGuavaBiMapBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableBiMap.Builder rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableBiMap.Builder integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableBiMap.Builder generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableBiMap.Builder extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaBiMapBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaBiMapBuilder rawType(final java.lang.Object key, final java.lang.Object value) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableBiMap.builder(); this.rawTypes.put(key, value); @@ -51,7 +43,6 @@ public SingularGuavaBiMapBuilder rawType(final java.lang.Object key, final } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaBiMapBuilder rawTypes(final java.util.Map rawTypes) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableBiMap.builder(); this.rawTypes.putAll(rawTypes); @@ -59,14 +50,12 @@ public SingularGuavaBiMapBuilder rawTypes(final java.util.Map rawTyp } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaBiMapBuilder clearRawTypes() { this.rawTypes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaBiMapBuilder integer(final Integer key, final Float value) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableBiMap.builder(); this.integers.put(key, value); @@ -74,7 +63,6 @@ public SingularGuavaBiMapBuilder integer(final Integer key, final Float va } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaBiMapBuilder integers(final java.util.Map integers) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableBiMap.builder(); this.integers.putAll(integers); @@ -82,14 +70,12 @@ public SingularGuavaBiMapBuilder integers(final java.util.Map clearIntegers() { this.integers = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaBiMapBuilder generic(final A key, final B value) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableBiMap.builder(); this.generics.put(key, value); @@ -97,7 +83,6 @@ public SingularGuavaBiMapBuilder generic(final A key, final B value) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaBiMapBuilder generics(final java.util.Map generics) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableBiMap.builder(); this.generics.putAll(generics); @@ -105,14 +90,12 @@ public SingularGuavaBiMapBuilder generics(final java.util.Map clearGenerics() { this.generics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaBiMapBuilder extendsGeneric(final Number key, final String value) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableBiMap.builder(); this.extendsGenerics.put(key, value); @@ -120,7 +103,6 @@ public SingularGuavaBiMapBuilder extendsGeneric(final Number key, final St } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaBiMapBuilder extendsGenerics(final java.util.Map extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableBiMap.builder(); this.extendsGenerics.putAll(extendsGenerics); @@ -128,14 +110,12 @@ public SingularGuavaBiMapBuilder extendsGenerics(final java.util.Map clearExtendsGenerics() { this.extendsGenerics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaBiMap build() { com.google.common.collect.ImmutableBiMap rawTypes = this.rawTypes == null ? com.google.common.collect.ImmutableBiMap.of() : this.rawTypes.build(); com.google.common.collect.ImmutableBiMap integers = this.integers == null ? com.google.common.collect.ImmutableBiMap.of() : this.integers.build(); @@ -146,14 +126,12 @@ public SingularGuavaBiMap build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularGuavaBiMap.SingularGuavaBiMapBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularGuavaBiMapBuilder builder() { return new SingularGuavaBiMapBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Guava/SingularGuavaCollection.java b/testData/after/builder/Singular/Generic/Guava/SingularGuavaCollection.java index 70e804f1f..fc879451b 100644 --- a/testData/after/builder/Singular/Generic/Guava/SingularGuavaCollection.java +++ b/testData/after/builder/Singular/Generic/Guava/SingularGuavaCollection.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import com.google.common.collect.ImmutableCollection; @@ -12,7 +12,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaCollection(final ImmutableCollection rawTypes, final ImmutableCollection integers, final ImmutableCollection generics, final ImmutableCollection extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -22,28 +21,21 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularGuavaCollectionBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaCollectionBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollectionBuilder rawType(final java.lang.Object rawType) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableList.builder(); this.rawTypes.add(rawType); @@ -51,7 +43,6 @@ public SingularGuavaCollectionBuilder rawType(final java.lang.Object rawType) } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollectionBuilder rawTypes(final java.lang.Iterable rawTypes) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableList.builder(); this.rawTypes.addAll(rawTypes); @@ -59,14 +50,12 @@ public SingularGuavaCollectionBuilder rawTypes(final java.lang.Iterable ra } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollectionBuilder clearRawTypes() { this.rawTypes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollectionBuilder integer(final Integer integer) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableList.builder(); this.integers.add(integer); @@ -74,7 +63,6 @@ public SingularGuavaCollectionBuilder integer(final Integer integer) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollectionBuilder integers(final java.lang.Iterable integers) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableList.builder(); this.integers.addAll(integers); @@ -82,14 +70,12 @@ public SingularGuavaCollectionBuilder integers(final java.lang.Iterable clearIntegers() { this.integers = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollectionBuilder generic(final T generic) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableList.builder(); this.generics.add(generic); @@ -97,7 +83,6 @@ public SingularGuavaCollectionBuilder generic(final T generic) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollectionBuilder generics(final java.lang.Iterable generics) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableList.builder(); this.generics.addAll(generics); @@ -105,14 +90,12 @@ public SingularGuavaCollectionBuilder generics(final java.lang.Iterable clearGenerics() { this.generics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollectionBuilder extendsGeneric(final Number extendsGeneric) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableList.builder(); this.extendsGenerics.add(extendsGeneric); @@ -120,7 +103,6 @@ public SingularGuavaCollectionBuilder extendsGeneric(final Number extendsGene } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollectionBuilder extendsGenerics(final java.lang.Iterable extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableList.builder(); this.extendsGenerics.addAll(extendsGenerics); @@ -128,14 +110,12 @@ public SingularGuavaCollectionBuilder extendsGenerics(final java.lang.Iterabl } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollectionBuilder clearExtendsGenerics() { this.extendsGenerics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaCollection build() { com.google.common.collect.ImmutableCollection rawTypes = this.rawTypes == null ? com.google.common.collect.ImmutableList.of() : this.rawTypes.build(); com.google.common.collect.ImmutableCollection integers = this.integers == null ? com.google.common.collect.ImmutableList.of() : this.integers.build(); @@ -146,14 +126,12 @@ public SingularGuavaCollection build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularGuavaCollection.SingularGuavaCollectionBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularGuavaCollectionBuilder builder() { return new SingularGuavaCollectionBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Guava/SingularGuavaList.java b/testData/after/builder/Singular/Generic/Guava/SingularGuavaList.java index 410eb0835..fd82fef32 100644 --- a/testData/after/builder/Singular/Generic/Guava/SingularGuavaList.java +++ b/testData/after/builder/Singular/Generic/Guava/SingularGuavaList.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import com.google.common.collect.ImmutableList; @@ -12,7 +12,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaList(final ImmutableList rawTypes, final ImmutableList integers, final ImmutableList generics, final ImmutableList extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -22,28 +21,21 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularGuavaListBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableList.Builder extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaListBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaListBuilder rawType(final java.lang.Object rawType) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableList.builder(); this.rawTypes.add(rawType); @@ -51,7 +43,6 @@ public SingularGuavaListBuilder rawType(final java.lang.Object rawType) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaListBuilder rawTypes(final java.lang.Iterable rawTypes) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableList.builder(); this.rawTypes.addAll(rawTypes); @@ -59,14 +50,12 @@ public SingularGuavaListBuilder rawTypes(final java.lang.Iterable rawTypes } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaListBuilder clearRawTypes() { this.rawTypes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaListBuilder integer(final Integer integer) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableList.builder(); this.integers.add(integer); @@ -74,7 +63,6 @@ public SingularGuavaListBuilder integer(final Integer integer) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaListBuilder integers(final java.lang.Iterable integers) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableList.builder(); this.integers.addAll(integers); @@ -82,14 +70,12 @@ public SingularGuavaListBuilder integers(final java.lang.Iterable clearIntegers() { this.integers = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaListBuilder generic(final T generic) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableList.builder(); this.generics.add(generic); @@ -97,7 +83,6 @@ public SingularGuavaListBuilder generic(final T generic) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaListBuilder generics(final java.lang.Iterable generics) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableList.builder(); this.generics.addAll(generics); @@ -105,14 +90,12 @@ public SingularGuavaListBuilder generics(final java.lang.Iterable clearGenerics() { this.generics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaListBuilder extendsGeneric(final Number extendsGeneric) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableList.builder(); this.extendsGenerics.add(extendsGeneric); @@ -120,7 +103,6 @@ public SingularGuavaListBuilder extendsGeneric(final Number extendsGeneric) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaListBuilder extendsGenerics(final java.lang.Iterable extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableList.builder(); this.extendsGenerics.addAll(extendsGenerics); @@ -128,14 +110,12 @@ public SingularGuavaListBuilder extendsGenerics(final java.lang.Iterable clearExtendsGenerics() { this.extendsGenerics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaList build() { com.google.common.collect.ImmutableList rawTypes = this.rawTypes == null ? com.google.common.collect.ImmutableList.of() : this.rawTypes.build(); com.google.common.collect.ImmutableList integers = this.integers == null ? com.google.common.collect.ImmutableList.of() : this.integers.build(); @@ -146,14 +126,12 @@ public SingularGuavaList build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularGuavaList.SingularGuavaListBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularGuavaListBuilder builder() { return new SingularGuavaListBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Guava/SingularGuavaMap.java b/testData/after/builder/Singular/Generic/Guava/SingularGuavaMap.java index fcd83a3c2..615d8fd80 100644 --- a/testData/after/builder/Singular/Generic/Guava/SingularGuavaMap.java +++ b/testData/after/builder/Singular/Generic/Guava/SingularGuavaMap.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -13,7 +13,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaMap(final ImmutableMap rawTypes, final ImmutableMap integers, final ImmutableMap generics, final ImmutableMap extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -23,28 +22,21 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularGuavaMapBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableMap.Builder rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableMap.Builder integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableMap.Builder generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableMap.Builder extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaMapBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaMapBuilder rawType(final java.lang.Object key, final java.lang.Object value) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableMap.builder(); this.rawTypes.put(key, value); @@ -52,7 +44,6 @@ public SingularGuavaMapBuilder rawType(final java.lang.Object key, final j } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaMapBuilder rawTypes(final java.util.Map rawTypes) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableMap.builder(); this.rawTypes.putAll(rawTypes); @@ -60,14 +51,12 @@ public SingularGuavaMapBuilder rawTypes(final java.util.Map rawTypes } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaMapBuilder clearRawTypes() { this.rawTypes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaMapBuilder integer(final Integer key, final Float value) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableMap.builder(); this.integers.put(key, value); @@ -75,7 +64,6 @@ public SingularGuavaMapBuilder integer(final Integer key, final Float valu } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaMapBuilder integers(final java.util.Map integers) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableMap.builder(); this.integers.putAll(integers); @@ -83,14 +71,12 @@ public SingularGuavaMapBuilder integers(final java.util.Map clearIntegers() { this.integers = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaMapBuilder generic(final A key, final B value) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableMap.builder(); this.generics.put(key, value); @@ -98,7 +84,6 @@ public SingularGuavaMapBuilder generic(final A key, final B value) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaMapBuilder generics(final java.util.Map generics) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableMap.builder(); this.generics.putAll(generics); @@ -106,14 +91,12 @@ public SingularGuavaMapBuilder generics(final java.util.Map clearGenerics() { this.generics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaMapBuilder extendsGeneric(final Number key, final String value) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableMap.builder(); this.extendsGenerics.put(key, value); @@ -121,7 +104,6 @@ public SingularGuavaMapBuilder extendsGeneric(final Number key, final Stri } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaMapBuilder extendsGenerics(final java.util.Map extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableMap.builder(); this.extendsGenerics.putAll(extendsGenerics); @@ -129,14 +111,12 @@ public SingularGuavaMapBuilder extendsGenerics(final java.util.Map clearExtendsGenerics() { this.extendsGenerics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaMap build() { com.google.common.collect.ImmutableMap rawTypes = this.rawTypes == null ? com.google.common.collect.ImmutableMap.of() : this.rawTypes.build(); com.google.common.collect.ImmutableMap integers = this.integers == null ? com.google.common.collect.ImmutableMap.of() : this.integers.build(); @@ -147,14 +127,12 @@ public SingularGuavaMap build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularGuavaMap.SingularGuavaMapBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularGuavaMapBuilder builder() { return new SingularGuavaMapBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Guava/SingularGuavaSet.java b/testData/after/builder/Singular/Generic/Guava/SingularGuavaSet.java index 05c51e30f..d965aba45 100644 --- a/testData/after/builder/Singular/Generic/Guava/SingularGuavaSet.java +++ b/testData/after/builder/Singular/Generic/Guava/SingularGuavaSet.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import com.google.common.collect.ImmutableSet; @@ -12,7 +12,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaSet(final ImmutableSet rawTypes, final ImmutableSet integers, final ImmutableSet generics, final ImmutableSet extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -22,28 +21,21 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularGuavaSetBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSet.Builder rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSet.Builder integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSet.Builder generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSet.Builder extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaSetBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSetBuilder rawType(final java.lang.Object rawType) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSet.builder(); this.rawTypes.add(rawType); @@ -51,7 +43,6 @@ public SingularGuavaSetBuilder rawType(final java.lang.Object rawType) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSetBuilder rawTypes(final java.lang.Iterable rawTypes) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSet.builder(); this.rawTypes.addAll(rawTypes); @@ -59,14 +50,12 @@ public SingularGuavaSetBuilder rawTypes(final java.lang.Iterable rawTypes) } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSetBuilder clearRawTypes() { this.rawTypes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSetBuilder integer(final Integer integer) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableSet.builder(); this.integers.add(integer); @@ -74,7 +63,6 @@ public SingularGuavaSetBuilder integer(final Integer integer) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSetBuilder integers(final java.lang.Iterable integers) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableSet.builder(); this.integers.addAll(integers); @@ -82,14 +70,12 @@ public SingularGuavaSetBuilder integers(final java.lang.Iterable clearIntegers() { this.integers = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSetBuilder generic(final T generic) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableSet.builder(); this.generics.add(generic); @@ -97,7 +83,6 @@ public SingularGuavaSetBuilder generic(final T generic) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSetBuilder generics(final java.lang.Iterable generics) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableSet.builder(); this.generics.addAll(generics); @@ -105,14 +90,12 @@ public SingularGuavaSetBuilder generics(final java.lang.Iterable } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSetBuilder clearGenerics() { this.generics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSetBuilder extendsGeneric(final Number extendsGeneric) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSet.builder(); this.extendsGenerics.add(extendsGeneric); @@ -120,7 +103,6 @@ public SingularGuavaSetBuilder extendsGeneric(final Number extendsGeneric) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSetBuilder extendsGenerics(final java.lang.Iterable extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSet.builder(); this.extendsGenerics.addAll(extendsGenerics); @@ -128,14 +110,12 @@ public SingularGuavaSetBuilder extendsGenerics(final java.lang.Iterable clearExtendsGenerics() { this.extendsGenerics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSet build() { com.google.common.collect.ImmutableSet rawTypes = this.rawTypes == null ? com.google.common.collect.ImmutableSet.of() : this.rawTypes.build(); com.google.common.collect.ImmutableSet integers = this.integers == null ? com.google.common.collect.ImmutableSet.of() : this.integers.build(); @@ -146,14 +126,12 @@ public SingularGuavaSet build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularGuavaSet.SingularGuavaSetBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularGuavaSetBuilder builder() { return new SingularGuavaSetBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Guava/SingularGuavaSortedMap.java b/testData/after/builder/Singular/Generic/Guava/SingularGuavaSortedMap.java index ceb460b79..193ed8daf 100644 --- a/testData/after/builder/Singular/Generic/Guava/SingularGuavaSortedMap.java +++ b/testData/after/builder/Singular/Generic/Guava/SingularGuavaSortedMap.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import com.google.common.collect.ImmutableSortedMap; @@ -12,7 +12,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaSortedMap(final ImmutableSortedMap rawTypes, final ImmutableSortedMap integers, final ImmutableSortedMap generics, final ImmutableSortedMap extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -22,28 +21,21 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularGuavaSortedMapBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedMap.Builder rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedMap.Builder integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedMap.Builder generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedMap.Builder extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaSortedMapBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedMapBuilder rawType(final java.lang.Object key, final java.lang.Object value) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.rawTypes.put(key, value); @@ -51,7 +43,6 @@ public SingularGuavaSortedMapBuilder rawType(final java.lang.Object key, f } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedMapBuilder rawTypes(final java.util.Map rawTypes) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.rawTypes.putAll(rawTypes); @@ -59,14 +50,12 @@ public SingularGuavaSortedMapBuilder rawTypes(final java.util.Map ra } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedMapBuilder clearRawTypes() { this.rawTypes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedMapBuilder integer(final Integer key, final Float value) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.integers.put(key, value); @@ -74,7 +63,6 @@ public SingularGuavaSortedMapBuilder integer(final Integer key, final Floa } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedMapBuilder integers(final java.util.Map integers) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.integers.putAll(integers); @@ -82,14 +70,12 @@ public SingularGuavaSortedMapBuilder integers(final java.util.Map clearIntegers() { this.integers = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedMapBuilder generic(final A key, final B value) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.generics.put(key, value); @@ -97,7 +83,6 @@ public SingularGuavaSortedMapBuilder generic(final A key, final B value) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedMapBuilder generics(final java.util.Map generics) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.generics.putAll(generics); @@ -105,14 +90,12 @@ public SingularGuavaSortedMapBuilder generics(final java.util.Map clearGenerics() { this.generics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedMapBuilder extendsGeneric(final Number key, final String value) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.extendsGenerics.put(key, value); @@ -120,7 +103,6 @@ public SingularGuavaSortedMapBuilder extendsGeneric(final Number key, fina } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedMapBuilder extendsGenerics(final java.util.Map extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.extendsGenerics.putAll(extendsGenerics); @@ -128,14 +110,12 @@ public SingularGuavaSortedMapBuilder extendsGenerics(final java.util.Map clearExtendsGenerics() { this.extendsGenerics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedMap build() { com.google.common.collect.ImmutableSortedMap rawTypes = this.rawTypes == null ? com.google.common.collect.ImmutableSortedMap.of() : this.rawTypes.build(); com.google.common.collect.ImmutableSortedMap integers = this.integers == null ? com.google.common.collect.ImmutableSortedMap.of() : this.integers.build(); @@ -146,14 +126,12 @@ public SingularGuavaSortedMap build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularGuavaSortedMap.SingularGuavaSortedMapBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularGuavaSortedMapBuilder builder() { return new SingularGuavaSortedMapBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Guava/SingularGuavaSortedSet.java b/testData/after/builder/Singular/Generic/Guava/SingularGuavaSortedSet.java index c025f964a..6671730a6 100644 --- a/testData/after/builder/Singular/Generic/Guava/SingularGuavaSortedSet.java +++ b/testData/after/builder/Singular/Generic/Guava/SingularGuavaSortedSet.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import com.google.common.collect.ImmutableSortedSet; @@ -12,7 +12,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaSortedSet(final ImmutableSortedSet rawTypes, final ImmutableSortedSet integers, final ImmutableSortedSet generics, final ImmutableSortedSet extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -22,28 +21,21 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularGuavaSortedSetBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedSet.Builder rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedSet.Builder integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedSet.Builder generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableSortedSet.Builder extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaSortedSetBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSetBuilder rawType(final java.lang.Object rawType) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.rawTypes.add(rawType); @@ -51,7 +43,6 @@ public SingularGuavaSortedSetBuilder rawType(final java.lang.Object rawType) } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSetBuilder rawTypes(final java.lang.Iterable rawTypes) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.rawTypes.addAll(rawTypes); @@ -59,14 +50,12 @@ public SingularGuavaSortedSetBuilder rawTypes(final java.lang.Iterable raw } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSetBuilder clearRawTypes() { this.rawTypes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSetBuilder integer(final Integer integer) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.integers.add(integer); @@ -74,7 +63,6 @@ public SingularGuavaSortedSetBuilder integer(final Integer integer) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSetBuilder integers(final java.lang.Iterable integers) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.integers.addAll(integers); @@ -82,14 +70,12 @@ public SingularGuavaSortedSetBuilder integers(final java.lang.Iterable clearIntegers() { this.integers = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSetBuilder generic(final T generic) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.generics.add(generic); @@ -97,7 +83,6 @@ public SingularGuavaSortedSetBuilder generic(final T generic) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSetBuilder generics(final java.lang.Iterable generics) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.generics.addAll(generics); @@ -105,14 +90,12 @@ public SingularGuavaSortedSetBuilder generics(final java.lang.Iterable clearGenerics() { this.generics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSetBuilder extendsGeneric(final Number extendsGeneric) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.extendsGenerics.add(extendsGeneric); @@ -120,7 +103,6 @@ public SingularGuavaSortedSetBuilder extendsGeneric(final Number extendsGener } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSetBuilder extendsGenerics(final java.lang.Iterable extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.extendsGenerics.addAll(extendsGenerics); @@ -128,14 +110,12 @@ public SingularGuavaSortedSetBuilder extendsGenerics(final java.lang.Iterable } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSetBuilder clearExtendsGenerics() { this.extendsGenerics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaSortedSet build() { com.google.common.collect.ImmutableSortedSet rawTypes = this.rawTypes == null ? com.google.common.collect.ImmutableSortedSet.of() : this.rawTypes.build(); com.google.common.collect.ImmutableSortedSet integers = this.integers == null ? com.google.common.collect.ImmutableSortedSet.of() : this.integers.build(); @@ -146,14 +126,12 @@ public SingularGuavaSortedSet build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularGuavaSortedSet.SingularGuavaSortedSetBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularGuavaSortedSetBuilder builder() { return new SingularGuavaSortedSetBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Guava/SingularGuavaTable.java b/testData/after/builder/Singular/Generic/Guava/SingularGuavaTable.java index e342d8707..88df90a3a 100644 --- a/testData/after/builder/Singular/Generic/Guava/SingularGuavaTable.java +++ b/testData/after/builder/Singular/Generic/Guava/SingularGuavaTable.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import com.google.common.collect.ImmutableTable; import java.util.Map; @@ -13,7 +13,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaTable(final ImmutableTable rawTypes, final ImmutableTable integers, final ImmutableTable generics, final ImmutableTable extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -23,28 +22,21 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularGuavaTableBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableTable.Builder rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableTable.Builder integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableTable.Builder generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private com.google.common.collect.ImmutableTable.Builder extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularGuavaTableBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder rawType(final java.lang.Object rowKey, final java.lang.Object columnKey, final java.lang.Object value) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableTable.builder(); this.rawTypes.put(rowKey, columnKey, value); @@ -52,7 +44,6 @@ public SingularGuavaTableBuilder rawType(final java.lang.Object rowKey, } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder rawTypes(final com.google.common.collect.Table rawTypes) { if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableTable.builder(); this.rawTypes.putAll(rawTypes); @@ -60,14 +51,12 @@ public SingularGuavaTableBuilder rawTypes(final com.google.common.colle } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder clearRawTypes() { this.rawTypes = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder integer(final Integer rowKey, final Float columnKey, final String value) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableTable.builder(); this.integers.put(rowKey, columnKey, value); @@ -75,7 +64,6 @@ public SingularGuavaTableBuilder integer(final Integer rowKey, final Fl } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder integers(final com.google.common.collect.Table integers) { if (this.integers == null) this.integers = com.google.common.collect.ImmutableTable.builder(); this.integers.putAll(integers); @@ -83,14 +71,12 @@ public SingularGuavaTableBuilder integers(final com.google.common.colle } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder clearIntegers() { this.integers = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder generic(final A rowKey, final B columnKey, final C value) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableTable.builder(); this.generics.put(rowKey, columnKey, value); @@ -98,7 +84,6 @@ public SingularGuavaTableBuilder generic(final A rowKey, final B column } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder generics(final com.google.common.collect.Table generics) { if (this.generics == null) this.generics = com.google.common.collect.ImmutableTable.builder(); this.generics.putAll(generics); @@ -106,14 +91,12 @@ public SingularGuavaTableBuilder generics(final com.google.common.colle } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder clearGenerics() { this.generics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder extendsGeneric(final Number rowKey, final Float columnKey, final String value) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableTable.builder(); this.extendsGenerics.put(rowKey, columnKey, value); @@ -121,7 +104,6 @@ public SingularGuavaTableBuilder extendsGeneric(final Number rowKey, fi } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder extendsGenerics(final com.google.common.collect.Table extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableTable.builder(); this.extendsGenerics.putAll(extendsGenerics); @@ -129,14 +111,12 @@ public SingularGuavaTableBuilder extendsGenerics(final com.google.commo } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTableBuilder clearExtendsGenerics() { this.extendsGenerics = null; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularGuavaTable build() { com.google.common.collect.ImmutableTable rawTypes = this.rawTypes == null ? com.google.common.collect.ImmutableTable.of() : this.rawTypes.build(); com.google.common.collect.ImmutableTable integers = this.integers == null ? com.google.common.collect.ImmutableTable.of() : this.integers.build(); @@ -147,14 +127,12 @@ public SingularGuavaTable build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularGuavaTable.SingularGuavaTableBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularGuavaTableBuilder builder() { return new SingularGuavaTableBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Util/Collection/SingularCollection.java b/testData/after/builder/Singular/Generic/Util/Collection/SingularCollection.java index 7fb370c56..3b06459f3 100644 --- a/testData/after/builder/Singular/Generic/Util/Collection/SingularCollection.java +++ b/testData/after/builder/Singular/Generic/Util/Collection/SingularCollection.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.ArrayList; import java.util.Collection; @@ -13,7 +13,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularCollection(final Collection rawTypes, final Collection integers, final Collection generics, final Collection extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -23,28 +22,21 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularCollectionBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularCollectionBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularCollectionBuilder rawType(final java.lang.Object rawType) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.add(rawType); @@ -52,7 +44,6 @@ public SingularCollectionBuilder rawType(final java.lang.Object rawType) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularCollectionBuilder rawTypes(final java.util.Collection rawTypes) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.addAll(rawTypes); @@ -60,14 +51,12 @@ public SingularCollectionBuilder rawTypes(final java.util.Collection rawTy } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularCollectionBuilder clearRawTypes() { if (this.rawTypes != null) this.rawTypes.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularCollectionBuilder integer(final Integer integer) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.add(integer); @@ -75,7 +64,6 @@ public SingularCollectionBuilder integer(final Integer integer) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularCollectionBuilder integers(final java.util.Collection integers) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.addAll(integers); @@ -83,14 +71,12 @@ public SingularCollectionBuilder integers(final java.util.Collection clearIntegers() { if (this.integers != null) this.integers.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularCollectionBuilder generic(final T generic) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.add(generic); @@ -98,7 +84,6 @@ public SingularCollectionBuilder generic(final T generic) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularCollectionBuilder generics(final java.util.Collection generics) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.addAll(generics); @@ -106,14 +91,12 @@ public SingularCollectionBuilder generics(final java.util.Collection clearGenerics() { if (this.generics != null) this.generics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularCollectionBuilder extendsGeneric(final Number extendsGeneric) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.add(extendsGeneric); @@ -121,7 +104,6 @@ public SingularCollectionBuilder extendsGeneric(final Number extendsGeneric) } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularCollectionBuilder extendsGenerics(final java.util.Collection extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.addAll(extendsGenerics); @@ -129,25 +111,21 @@ public SingularCollectionBuilder extendsGenerics(final java.util.Collection clearExtendsGenerics() { if (this.extendsGenerics != null) this.extendsGenerics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularCollection build() { java.util.Collection rawTypes; switch (this.rawTypes == null ? 0 : this.rawTypes.size()) { case 0: rawTypes = java.util.Collections.emptyList(); break; - case 1: rawTypes = java.util.Collections.singletonList(this.rawTypes.get(0)); break; - default: rawTypes = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.rawTypes)); } @@ -156,11 +134,9 @@ public SingularCollection build() { case 0: integers = java.util.Collections.emptyList(); break; - case 1: integers = java.util.Collections.singletonList(this.integers.get(0)); break; - default: integers = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.integers)); } @@ -169,11 +145,9 @@ public SingularCollection build() { case 0: generics = java.util.Collections.emptyList(); break; - case 1: generics = java.util.Collections.singletonList(this.generics.get(0)); break; - default: generics = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.generics)); } @@ -182,11 +156,9 @@ public SingularCollection build() { case 0: extendsGenerics = java.util.Collections.emptyList(); break; - case 1: extendsGenerics = java.util.Collections.singletonList(this.extendsGenerics.get(0)); break; - default: extendsGenerics = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.extendsGenerics)); } @@ -195,14 +167,12 @@ public SingularCollection build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularCollection.SingularCollectionBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularCollectionBuilder builder() { return new SingularCollectionBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Util/Collection/SingularIterable.java b/testData/after/builder/Singular/Generic/Util/Collection/SingularIterable.java index d1093fc6e..4ea3c5eab 100644 --- a/testData/after/builder/Singular/Generic/Util/Collection/SingularIterable.java +++ b/testData/after/builder/Singular/Generic/Util/Collection/SingularIterable.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 public class SingularIterable { private Iterable rawTypes; @@ -7,7 +7,6 @@ public class SingularIterable { private Iterable extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularIterable(final Iterable rawTypes, final Iterable integers, final Iterable generics, final Iterable extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -17,28 +16,21 @@ public class SingularIterable { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularIterableBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularIterableBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularIterableBuilder rawType(final java.lang.Object rawType) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.add(rawType); @@ -46,7 +38,6 @@ public SingularIterableBuilder rawType(final java.lang.Object rawType) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularIterableBuilder rawTypes(final java.util.Collection rawTypes) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.addAll(rawTypes); @@ -54,14 +45,12 @@ public SingularIterableBuilder rawTypes(final java.util.Collection rawType } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularIterableBuilder clearRawTypes() { if (this.rawTypes != null) this.rawTypes.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularIterableBuilder integer(final Integer integer) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.add(integer); @@ -69,7 +58,6 @@ public SingularIterableBuilder integer(final Integer integer) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularIterableBuilder integers(final java.util.Collection integers) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.addAll(integers); @@ -77,14 +65,12 @@ public SingularIterableBuilder integers(final java.util.Collection clearIntegers() { if (this.integers != null) this.integers.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularIterableBuilder generic(final T generic) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.add(generic); @@ -92,7 +78,6 @@ public SingularIterableBuilder generic(final T generic) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularIterableBuilder generics(final java.util.Collection generics) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.addAll(generics); @@ -100,14 +85,12 @@ public SingularIterableBuilder generics(final java.util.Collection clearGenerics() { if (this.generics != null) this.generics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularIterableBuilder extendsGeneric(final Number extendsGeneric) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.add(extendsGeneric); @@ -115,7 +98,6 @@ public SingularIterableBuilder extendsGeneric(final Number extendsGeneric) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularIterableBuilder extendsGenerics(final java.util.Collection extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.addAll(extendsGenerics); @@ -123,25 +105,21 @@ public SingularIterableBuilder extendsGenerics(final java.util.Collection clearExtendsGenerics() { if (this.extendsGenerics != null) this.extendsGenerics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularIterable build() { java.lang.Iterable rawTypes; switch (this.rawTypes == null ? 0 : this.rawTypes.size()) { case 0: rawTypes = java.util.Collections.emptyList(); break; - case 1: rawTypes = java.util.Collections.singletonList(this.rawTypes.get(0)); break; - default: rawTypes = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.rawTypes)); } @@ -150,11 +128,9 @@ public SingularIterable build() { case 0: integers = java.util.Collections.emptyList(); break; - case 1: integers = java.util.Collections.singletonList(this.integers.get(0)); break; - default: integers = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.integers)); } @@ -163,11 +139,9 @@ public SingularIterable build() { case 0: generics = java.util.Collections.emptyList(); break; - case 1: generics = java.util.Collections.singletonList(this.generics.get(0)); break; - default: generics = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.generics)); } @@ -176,11 +150,9 @@ public SingularIterable build() { case 0: extendsGenerics = java.util.Collections.emptyList(); break; - case 1: extendsGenerics = java.util.Collections.singletonList(this.extendsGenerics.get(0)); break; - default: extendsGenerics = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.extendsGenerics)); } @@ -189,14 +161,12 @@ public SingularIterable build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularIterable.SingularIterableBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularIterableBuilder builder() { return new SingularIterableBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Util/Collection/SingularList.java b/testData/after/builder/Singular/Generic/Util/Collection/SingularList.java index 1d75e9b6d..bb71bc630 100644 --- a/testData/after/builder/Singular/Generic/Util/Collection/SingularList.java +++ b/testData/after/builder/Singular/Generic/Util/Collection/SingularList.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.List; @@ -9,7 +9,6 @@ public class SingularList { private List extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularList(final List rawTypes, final List integers, final List generics, final List extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -19,28 +18,21 @@ public class SingularList { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularListBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularListBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularListBuilder rawType(final java.lang.Object rawType) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.add(rawType); @@ -48,7 +40,6 @@ public SingularListBuilder rawType(final java.lang.Object rawType) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularListBuilder rawTypes(final java.util.Collection rawTypes) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.addAll(rawTypes); @@ -56,14 +47,12 @@ public SingularListBuilder rawTypes(final java.util.Collection rawTypes) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularListBuilder clearRawTypes() { if (this.rawTypes != null) this.rawTypes.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularListBuilder integer(final Integer integer) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.add(integer); @@ -71,7 +60,6 @@ public SingularListBuilder integer(final Integer integer) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularListBuilder integers(final java.util.Collection integers) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.addAll(integers); @@ -79,14 +67,12 @@ public SingularListBuilder integers(final java.util.Collection clearIntegers() { if (this.integers != null) this.integers.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularListBuilder generic(final T generic) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.add(generic); @@ -94,7 +80,6 @@ public SingularListBuilder generic(final T generic) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularListBuilder generics(final java.util.Collection generics) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.addAll(generics); @@ -102,14 +87,12 @@ public SingularListBuilder generics(final java.util.Collection g } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularListBuilder clearGenerics() { if (this.generics != null) this.generics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularListBuilder extendsGeneric(final Number extendsGeneric) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.add(extendsGeneric); @@ -117,7 +100,6 @@ public SingularListBuilder extendsGeneric(final Number extendsGeneric) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularListBuilder extendsGenerics(final java.util.Collection extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.addAll(extendsGenerics); @@ -125,25 +107,21 @@ public SingularListBuilder extendsGenerics(final java.util.Collection clearExtendsGenerics() { if (this.extendsGenerics != null) this.extendsGenerics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularList build() { java.util.List rawTypes; switch (this.rawTypes == null ? 0 : this.rawTypes.size()) { case 0: rawTypes = java.util.Collections.emptyList(); break; - case 1: rawTypes = java.util.Collections.singletonList(this.rawTypes.get(0)); break; - default: rawTypes = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.rawTypes)); } @@ -152,11 +130,9 @@ public SingularList build() { case 0: integers = java.util.Collections.emptyList(); break; - case 1: integers = java.util.Collections.singletonList(this.integers.get(0)); break; - default: integers = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.integers)); } @@ -165,11 +141,9 @@ public SingularList build() { case 0: generics = java.util.Collections.emptyList(); break; - case 1: generics = java.util.Collections.singletonList(this.generics.get(0)); break; - default: generics = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.generics)); } @@ -178,11 +152,9 @@ public SingularList build() { case 0: extendsGenerics = java.util.Collections.emptyList(); break; - case 1: extendsGenerics = java.util.Collections.singletonList(this.extendsGenerics.get(0)); break; - default: extendsGenerics = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.extendsGenerics)); } @@ -191,14 +163,12 @@ public SingularList build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularList.SingularListBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularListBuilder builder() { return new SingularListBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Util/Collection/SingularNavigableSet.java b/testData/after/builder/Singular/Generic/Util/Collection/SingularNavigableSet.java index 824639444..f9124f2a2 100644 --- a/testData/after/builder/Singular/Generic/Util/Collection/SingularNavigableSet.java +++ b/testData/after/builder/Singular/Generic/Util/Collection/SingularNavigableSet.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.NavigableSet; @@ -9,7 +9,6 @@ public class SingularNavigableSet { private NavigableSet extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularNavigableSet(final NavigableSet rawTypes, final NavigableSet integers, final NavigableSet generics, final NavigableSet extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -19,28 +18,21 @@ public class SingularNavigableSet { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularNavigableSetBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularNavigableSetBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSetBuilder rawType(final java.lang.Object rawType) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.add(rawType); @@ -48,7 +40,6 @@ public SingularNavigableSetBuilder rawType(final java.lang.Object rawType) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSetBuilder rawTypes(final java.util.Collection rawTypes) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.addAll(rawTypes); @@ -56,14 +47,12 @@ public SingularNavigableSetBuilder rawTypes(final java.util.Collection raw } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSetBuilder clearRawTypes() { if (this.rawTypes != null) this.rawTypes.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSetBuilder integer(final Integer integer) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.add(integer); @@ -71,7 +60,6 @@ public SingularNavigableSetBuilder integer(final Integer integer) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSetBuilder integers(final java.util.Collection integers) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.addAll(integers); @@ -79,14 +67,12 @@ public SingularNavigableSetBuilder integers(final java.util.Collection clearIntegers() { if (this.integers != null) this.integers.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSetBuilder generic(final T generic) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.add(generic); @@ -94,7 +80,6 @@ public SingularNavigableSetBuilder generic(final T generic) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSetBuilder generics(final java.util.Collection generics) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.addAll(generics); @@ -102,14 +87,12 @@ public SingularNavigableSetBuilder generics(final java.util.Collection clearGenerics() { if (this.generics != null) this.generics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSetBuilder extendsGeneric(final Number extendsGeneric) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.add(extendsGeneric); @@ -117,7 +100,6 @@ public SingularNavigableSetBuilder extendsGeneric(final Number extendsGeneric } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSetBuilder extendsGenerics(final java.util.Collection extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.addAll(extendsGenerics); @@ -125,14 +107,12 @@ public SingularNavigableSetBuilder extendsGenerics(final java.util.Collection } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSetBuilder clearExtendsGenerics() { if (this.extendsGenerics != null) this.extendsGenerics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableSet build() { java.util.NavigableSet rawTypes = new java.util.TreeSet(); if (this.rawTypes != null) rawTypes.addAll(this.rawTypes); @@ -151,14 +131,12 @@ public SingularNavigableSet build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularNavigableSet.SingularNavigableSetBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularNavigableSetBuilder builder() { return new SingularNavigableSetBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Util/Collection/SingularSet.java b/testData/after/builder/Singular/Generic/Util/Collection/SingularSet.java index 133f3c295..80d2e8e1e 100644 --- a/testData/after/builder/Singular/Generic/Util/Collection/SingularSet.java +++ b/testData/after/builder/Singular/Generic/Util/Collection/SingularSet.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.Set; @@ -9,7 +9,6 @@ public class SingularSet { private Set extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularSet(final Set rawTypes, final Set integers, final Set generics, final Set extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -19,28 +18,21 @@ public class SingularSet { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularSetBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularSetBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSetBuilder rawType(final java.lang.Object rawType) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.add(rawType); @@ -48,7 +40,6 @@ public SingularSetBuilder rawType(final java.lang.Object rawType) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSetBuilder rawTypes(final java.util.Collection rawTypes) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.addAll(rawTypes); @@ -56,14 +47,12 @@ public SingularSetBuilder rawTypes(final java.util.Collection rawTypes) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSetBuilder clearRawTypes() { if (this.rawTypes != null) this.rawTypes.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSetBuilder integer(final Integer integer) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.add(integer); @@ -71,7 +60,6 @@ public SingularSetBuilder integer(final Integer integer) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSetBuilder integers(final java.util.Collection integers) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.addAll(integers); @@ -79,14 +67,12 @@ public SingularSetBuilder integers(final java.util.Collection clearIntegers() { if (this.integers != null) this.integers.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSetBuilder generic(final T generic) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.add(generic); @@ -94,7 +80,6 @@ public SingularSetBuilder generic(final T generic) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSetBuilder generics(final java.util.Collection generics) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.addAll(generics); @@ -102,14 +87,12 @@ public SingularSetBuilder generics(final java.util.Collection ge } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSetBuilder clearGenerics() { if (this.generics != null) this.generics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSetBuilder extendsGeneric(final Number extendsGeneric) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.add(extendsGeneric); @@ -117,7 +100,6 @@ public SingularSetBuilder extendsGeneric(final Number extendsGeneric) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSetBuilder extendsGenerics(final java.util.Collection extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.addAll(extendsGenerics); @@ -125,25 +107,21 @@ public SingularSetBuilder extendsGenerics(final java.util.Collection clearExtendsGenerics() { if (this.extendsGenerics != null) this.extendsGenerics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSet build() { java.util.Set rawTypes; switch (this.rawTypes == null ? 0 : this.rawTypes.size()) { case 0: rawTypes = java.util.Collections.emptySet(); break; - case 1: rawTypes = java.util.Collections.singleton(this.rawTypes.get(0)); break; - default: rawTypes = new java.util.LinkedHashSet(this.rawTypes.size() < 1073741824 ? 1 + this.rawTypes.size() + (this.rawTypes.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); rawTypes.addAll(this.rawTypes); @@ -154,11 +132,9 @@ public SingularSet build() { case 0: integers = java.util.Collections.emptySet(); break; - case 1: integers = java.util.Collections.singleton(this.integers.get(0)); break; - default: integers = new java.util.LinkedHashSet(this.integers.size() < 1073741824 ? 1 + this.integers.size() + (this.integers.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); integers.addAll(this.integers); @@ -169,11 +145,9 @@ public SingularSet build() { case 0: generics = java.util.Collections.emptySet(); break; - case 1: generics = java.util.Collections.singleton(this.generics.get(0)); break; - default: generics = new java.util.LinkedHashSet(this.generics.size() < 1073741824 ? 1 + this.generics.size() + (this.generics.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); generics.addAll(this.generics); @@ -184,11 +158,9 @@ public SingularSet build() { case 0: extendsGenerics = java.util.Collections.emptySet(); break; - case 1: extendsGenerics = java.util.Collections.singleton(this.extendsGenerics.get(0)); break; - default: extendsGenerics = new java.util.LinkedHashSet(this.extendsGenerics.size() < 1073741824 ? 1 + this.extendsGenerics.size() + (this.extendsGenerics.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); extendsGenerics.addAll(this.extendsGenerics); @@ -199,14 +171,12 @@ public SingularSet build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularSet.SingularSetBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularSetBuilder builder() { return new SingularSetBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Util/Collection/SingularSortedSet.java b/testData/after/builder/Singular/Generic/Util/Collection/SingularSortedSet.java index 8b8203317..9808715ae 100644 --- a/testData/after/builder/Singular/Generic/Util/Collection/SingularSortedSet.java +++ b/testData/after/builder/Singular/Generic/Util/Collection/SingularSortedSet.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.SortedSet; @@ -9,7 +9,6 @@ public class SingularSortedSet { private SortedSet extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularSortedSet(final SortedSet rawTypes, final SortedSet integers, final SortedSet generics, final SortedSet extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -19,28 +18,21 @@ public class SingularSortedSet { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularSortedSetBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularSortedSetBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedSetBuilder rawType(final java.lang.Object rawType) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.add(rawType); @@ -48,7 +40,6 @@ public SingularSortedSetBuilder rawType(final java.lang.Object rawType) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedSetBuilder rawTypes(final java.util.Collection rawTypes) { if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); this.rawTypes.addAll(rawTypes); @@ -56,14 +47,12 @@ public SingularSortedSetBuilder rawTypes(final java.util.Collection rawTyp } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedSetBuilder clearRawTypes() { if (this.rawTypes != null) this.rawTypes.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedSetBuilder integer(final Integer integer) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.add(integer); @@ -71,7 +60,6 @@ public SingularSortedSetBuilder integer(final Integer integer) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedSetBuilder integers(final java.util.Collection integers) { if (this.integers == null) this.integers = new java.util.ArrayList(); this.integers.addAll(integers); @@ -79,14 +67,12 @@ public SingularSortedSetBuilder integers(final java.util.Collection clearIntegers() { if (this.integers != null) this.integers.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedSetBuilder generic(final T generic) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.add(generic); @@ -94,7 +80,6 @@ public SingularSortedSetBuilder generic(final T generic) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedSetBuilder generics(final java.util.Collection generics) { if (this.generics == null) this.generics = new java.util.ArrayList(); this.generics.addAll(generics); @@ -102,14 +87,12 @@ public SingularSortedSetBuilder generics(final java.util.Collection clearGenerics() { if (this.generics != null) this.generics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedSetBuilder extendsGeneric(final Number extendsGeneric) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.add(extendsGeneric); @@ -117,7 +100,6 @@ public SingularSortedSetBuilder extendsGeneric(final Number extendsGeneric) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedSetBuilder extendsGenerics(final java.util.Collection extendsGenerics) { if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); this.extendsGenerics.addAll(extendsGenerics); @@ -125,14 +107,12 @@ public SingularSortedSetBuilder extendsGenerics(final java.util.Collection clearExtendsGenerics() { if (this.extendsGenerics != null) this.extendsGenerics.clear(); return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedSet build() { java.util.SortedSet rawTypes = new java.util.TreeSet(); if (this.rawTypes != null) rawTypes.addAll(this.rawTypes); @@ -151,14 +131,12 @@ public SingularSortedSet build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularSortedSet.SingularSortedSetBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularSortedSetBuilder builder() { return new SingularSortedSetBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Util/Map/SingularMap.java b/testData/after/builder/Singular/Generic/Util/Map/SingularMap.java index cd98055bd..508b2a3b7 100644 --- a/testData/after/builder/Singular/Generic/Util/Map/SingularMap.java +++ b/testData/after/builder/Singular/Generic/Util/Map/SingularMap.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.Map; @@ -12,7 +12,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularMap(final Map rawTypes, final Map integers, final Map generics, final Map extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -22,40 +21,29 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularMapBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularMapBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularMapBuilder rawType(final java.lang.Object rawTypeKey, final java.lang.Object rawTypeValue) { if (this.rawTypes$key == null) { this.rawTypes$key = new java.util.ArrayList(); @@ -67,7 +55,6 @@ public SingularMapBuilder rawType(final java.lang.Object rawTypeKey, final } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularMapBuilder rawTypes(final java.util.Map rawTypes) { if (this.rawTypes$key == null) { this.rawTypes$key = new java.util.ArrayList(); @@ -81,7 +68,6 @@ public SingularMapBuilder rawTypes(final java.util.Map rawTypes) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularMapBuilder clearRawTypes() { if (this.rawTypes$key != null) { this.rawTypes$key.clear(); @@ -91,7 +77,6 @@ public SingularMapBuilder clearRawTypes() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularMapBuilder integer(final Integer integerKey, final Float integerValue) { if (this.integers$key == null) { this.integers$key = new java.util.ArrayList(); @@ -103,7 +88,6 @@ public SingularMapBuilder integer(final Integer integerKey, final Float in } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularMapBuilder integers(final java.util.Map integers) { if (this.integers$key == null) { this.integers$key = new java.util.ArrayList(); @@ -117,7 +101,6 @@ public SingularMapBuilder integers(final java.util.Map clearIntegers() { if (this.integers$key != null) { this.integers$key.clear(); @@ -127,7 +110,6 @@ public SingularMapBuilder clearIntegers() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularMapBuilder generic(final A genericKey, final B genericValue) { if (this.generics$key == null) { this.generics$key = new java.util.ArrayList(); @@ -139,7 +121,6 @@ public SingularMapBuilder generic(final A genericKey, final B genericValue } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularMapBuilder generics(final java.util.Map generics) { if (this.generics$key == null) { this.generics$key = new java.util.ArrayList(); @@ -153,7 +134,6 @@ public SingularMapBuilder generics(final java.util.Map clearGenerics() { if (this.generics$key != null) { this.generics$key.clear(); @@ -163,7 +143,6 @@ public SingularMapBuilder clearGenerics() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularMapBuilder extendsGeneric(final Number extendsGenericKey, final String extendsGenericValue) { if (this.extendsGenerics$key == null) { this.extendsGenerics$key = new java.util.ArrayList(); @@ -175,7 +154,6 @@ public SingularMapBuilder extendsGeneric(final Number extendsGenericKey, f } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularMapBuilder extendsGenerics(final java.util.Map extendsGenerics) { if (this.extendsGenerics$key == null) { this.extendsGenerics$key = new java.util.ArrayList(); @@ -189,7 +167,6 @@ public SingularMapBuilder extendsGenerics(final java.util.Map clearExtendsGenerics() { if (this.extendsGenerics$key != null) { this.extendsGenerics$key.clear(); @@ -199,21 +176,18 @@ public SingularMapBuilder clearExtendsGenerics() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularMap build() { java.util.Map rawTypes; switch (this.rawTypes$key == null ? 0 : this.rawTypes$key.size()) { case 0: rawTypes = java.util.Collections.emptyMap(); break; - case 1: rawTypes = java.util.Collections.singletonMap(this.rawTypes$key.get(0), this.rawTypes$value.get(0)); break; - default: rawTypes = new java.util.LinkedHashMap(this.rawTypes$key.size() < 1073741824 ? 1 + this.rawTypes$key.size() + (this.rawTypes$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); - for (int $i = 0; $i < this.rawTypes$key.size(); $i++) rawTypes.put(this.rawTypes$key.get($i), this.rawTypes$value.get($i)); + for (int $i = 0; $i < this.rawTypes$key.size(); $i++) rawTypes.put(this.rawTypes$key.get($i), (java.lang.Object) this.rawTypes$value.get($i)); rawTypes = java.util.Collections.unmodifiableMap(rawTypes); } java.util.Map integers; @@ -221,14 +195,12 @@ public SingularMap build() { case 0: integers = java.util.Collections.emptyMap(); break; - case 1: integers = java.util.Collections.singletonMap(this.integers$key.get(0), this.integers$value.get(0)); break; - default: integers = new java.util.LinkedHashMap(this.integers$key.size() < 1073741824 ? 1 + this.integers$key.size() + (this.integers$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); - for (int $i = 0; $i < this.integers$key.size(); $i++) integers.put(this.integers$key.get($i), this.integers$value.get($i)); + for (int $i = 0; $i < this.integers$key.size(); $i++) integers.put(this.integers$key.get($i), (Float) this.integers$value.get($i)); integers = java.util.Collections.unmodifiableMap(integers); } java.util.Map generics; @@ -236,14 +208,12 @@ public SingularMap build() { case 0: generics = java.util.Collections.emptyMap(); break; - case 1: generics = java.util.Collections.singletonMap(this.generics$key.get(0), this.generics$value.get(0)); break; - default: generics = new java.util.LinkedHashMap(this.generics$key.size() < 1073741824 ? 1 + this.generics$key.size() + (this.generics$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); - for (int $i = 0; $i < this.generics$key.size(); $i++) generics.put(this.generics$key.get($i), this.generics$value.get($i)); + for (int $i = 0; $i < this.generics$key.size(); $i++) generics.put(this.generics$key.get($i), (B) this.generics$value.get($i)); generics = java.util.Collections.unmodifiableMap(generics); } java.util.Map extendsGenerics; @@ -251,14 +221,12 @@ public SingularMap build() { case 0: extendsGenerics = java.util.Collections.emptyMap(); break; - case 1: extendsGenerics = java.util.Collections.singletonMap(this.extendsGenerics$key.get(0), this.extendsGenerics$value.get(0)); break; - default: extendsGenerics = new java.util.LinkedHashMap(this.extendsGenerics$key.size() < 1073741824 ? 1 + this.extendsGenerics$key.size() + (this.extendsGenerics$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); - for (int $i = 0; $i < this.extendsGenerics$key.size(); $i++) extendsGenerics.put(this.extendsGenerics$key.get($i), this.extendsGenerics$value.get($i)); + for (int $i = 0; $i < this.extendsGenerics$key.size(); $i++) extendsGenerics.put(this.extendsGenerics$key.get($i), (String) this.extendsGenerics$value.get($i)); extendsGenerics = java.util.Collections.unmodifiableMap(extendsGenerics); } return new SingularMap(rawTypes, integers, generics, extendsGenerics); @@ -266,14 +234,12 @@ public SingularMap build() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularMap.SingularMapBuilder(rawTypes$key=" + this.rawTypes$key + ", rawTypes$value=" + this.rawTypes$value + ", integers$key=" + this.integers$key + ", integers$value=" + this.integers$value + ", generics$key=" + this.generics$key + ", generics$value=" + this.generics$value + ", extendsGenerics$key=" + this.extendsGenerics$key + ", extendsGenerics$value=" + this.extendsGenerics$value + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularMapBuilder builder() { return new SingularMapBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Util/Map/SingularNavigableMap.java b/testData/after/builder/Singular/Generic/Util/Map/SingularNavigableMap.java index 531a2ae4a..91c22f5b9 100644 --- a/testData/after/builder/Singular/Generic/Util/Map/SingularNavigableMap.java +++ b/testData/after/builder/Singular/Generic/Util/Map/SingularNavigableMap.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.Map; import java.util.NavigableMap; @@ -13,7 +13,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularNavigableMap(final NavigableMap rawTypes, final NavigableMap integers, final NavigableMap generics, final NavigableMap extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -23,40 +22,29 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularNavigableMapBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularNavigableMapBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableMapBuilder rawType(final java.lang.Object rawTypeKey, final java.lang.Object rawTypeValue) { if (this.rawTypes$key == null) { this.rawTypes$key = new java.util.ArrayList(); @@ -68,7 +56,6 @@ public SingularNavigableMapBuilder rawType(final java.lang.Object rawTypeK } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableMapBuilder rawTypes(final java.util.Map rawTypes) { if (this.rawTypes$key == null) { this.rawTypes$key = new java.util.ArrayList(); @@ -82,7 +69,6 @@ public SingularNavigableMapBuilder rawTypes(final java.util.Map rawT } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableMapBuilder clearRawTypes() { if (this.rawTypes$key != null) { this.rawTypes$key.clear(); @@ -92,7 +78,6 @@ public SingularNavigableMapBuilder clearRawTypes() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableMapBuilder integer(final Integer integerKey, final Float integerValue) { if (this.integers$key == null) { this.integers$key = new java.util.ArrayList(); @@ -104,7 +89,6 @@ public SingularNavigableMapBuilder integer(final Integer integerKey, final } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableMapBuilder integers(final java.util.Map integers) { if (this.integers$key == null) { this.integers$key = new java.util.ArrayList(); @@ -118,7 +102,6 @@ public SingularNavigableMapBuilder integers(final java.util.Map clearIntegers() { if (this.integers$key != null) { this.integers$key.clear(); @@ -128,7 +111,6 @@ public SingularNavigableMapBuilder clearIntegers() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableMapBuilder generic(final A genericKey, final B genericValue) { if (this.generics$key == null) { this.generics$key = new java.util.ArrayList(); @@ -140,7 +122,6 @@ public SingularNavigableMapBuilder generic(final A genericKey, final B gen } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableMapBuilder generics(final java.util.Map generics) { if (this.generics$key == null) { this.generics$key = new java.util.ArrayList(); @@ -154,7 +135,6 @@ public SingularNavigableMapBuilder generics(final java.util.Map clearGenerics() { if (this.generics$key != null) { this.generics$key.clear(); @@ -164,7 +144,6 @@ public SingularNavigableMapBuilder clearGenerics() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableMapBuilder extendsGeneric(final Number extendsGenericKey, final String extendsGenericValue) { if (this.extendsGenerics$key == null) { this.extendsGenerics$key = new java.util.ArrayList(); @@ -176,7 +155,6 @@ public SingularNavigableMapBuilder extendsGeneric(final Number extendsGene } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableMapBuilder extendsGenerics(final java.util.Map extendsGenerics) { if (this.extendsGenerics$key == null) { this.extendsGenerics$key = new java.util.ArrayList(); @@ -190,7 +168,6 @@ public SingularNavigableMapBuilder extendsGenerics(final java.util.Map clearExtendsGenerics() { if (this.extendsGenerics$key != null) { this.extendsGenerics$key.clear(); @@ -200,33 +177,30 @@ public SingularNavigableMapBuilder clearExtendsGenerics() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularNavigableMap build() { java.util.NavigableMap rawTypes = new java.util.TreeMap(); - if (this.rawTypes$key != null) for (int $i = 0; $i < (this.rawTypes$key == null ? 0 : this.rawTypes$key.size()); $i++) rawTypes.put(this.rawTypes$key.get($i), this.rawTypes$value.get($i)); + if (this.rawTypes$key != null) for (int $i = 0; $i < (this.rawTypes$key == null ? 0 : this.rawTypes$key.size()); $i++) rawTypes.put(this.rawTypes$key.get($i), (java.lang.Object) this.rawTypes$value.get($i)); rawTypes = java.util.Collections.unmodifiableNavigableMap(rawTypes); java.util.NavigableMap integers = new java.util.TreeMap(); - if (this.integers$key != null) for (int $i = 0; $i < (this.integers$key == null ? 0 : this.integers$key.size()); $i++) integers.put(this.integers$key.get($i), this.integers$value.get($i)); + if (this.integers$key != null) for (int $i = 0; $i < (this.integers$key == null ? 0 : this.integers$key.size()); $i++) integers.put(this.integers$key.get($i), (Float) this.integers$value.get($i)); integers = java.util.Collections.unmodifiableNavigableMap(integers); java.util.NavigableMap generics = new java.util.TreeMap(); - if (this.generics$key != null) for (int $i = 0; $i < (this.generics$key == null ? 0 : this.generics$key.size()); $i++) generics.put(this.generics$key.get($i), this.generics$value.get($i)); + if (this.generics$key != null) for (int $i = 0; $i < (this.generics$key == null ? 0 : this.generics$key.size()); $i++) generics.put(this.generics$key.get($i), (B) this.generics$value.get($i)); generics = java.util.Collections.unmodifiableNavigableMap(generics); java.util.NavigableMap extendsGenerics = new java.util.TreeMap(); - if (this.extendsGenerics$key != null) for (int $i = 0; $i < (this.extendsGenerics$key == null ? 0 : this.extendsGenerics$key.size()); $i++) extendsGenerics.put(this.extendsGenerics$key.get($i), this.extendsGenerics$value.get($i)); + if (this.extendsGenerics$key != null) for (int $i = 0; $i < (this.extendsGenerics$key == null ? 0 : this.extendsGenerics$key.size()); $i++) extendsGenerics.put(this.extendsGenerics$key.get($i), (String) this.extendsGenerics$value.get($i)); extendsGenerics = java.util.Collections.unmodifiableNavigableMap(extendsGenerics); return new SingularNavigableMap(rawTypes, integers, generics, extendsGenerics); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularNavigableMap.SingularNavigableMapBuilder(rawTypes$key=" + this.rawTypes$key + ", rawTypes$value=" + this.rawTypes$value + ", integers$key=" + this.integers$key + ", integers$value=" + this.integers$value + ", generics$key=" + this.generics$key + ", generics$value=" + this.generics$value + ", extendsGenerics$key=" + this.extendsGenerics$key + ", extendsGenerics$value=" + this.extendsGenerics$value + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularNavigableMapBuilder builder() { return new SingularNavigableMapBuilder(); } diff --git a/testData/after/builder/Singular/Generic/Util/Map/SingularSortedMap.java b/testData/after/builder/Singular/Generic/Util/Map/SingularSortedMap.java index 921884f1b..f527225fc 100644 --- a/testData/after/builder/Singular/Generic/Util/Map/SingularSortedMap.java +++ b/testData/after/builder/Singular/Generic/Util/Map/SingularSortedMap.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 16:42:02 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 import java.util.Map; import java.util.SortedMap; @@ -13,7 +13,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularSortedMap(final SortedMap rawTypes, final SortedMap integers, final SortedMap generics, final SortedMap extendsGenerics) { this.rawTypes = rawTypes; this.integers = integers; @@ -23,40 +22,29 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class SingularSortedMapBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList rawTypes$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList integers$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList generics$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics$key; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private java.util.ArrayList extendsGenerics$value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") SingularSortedMapBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedMapBuilder rawType(final java.lang.Object rawTypeKey, final java.lang.Object rawTypeValue) { if (this.rawTypes$key == null) { this.rawTypes$key = new java.util.ArrayList(); @@ -68,7 +56,6 @@ public SingularSortedMapBuilder rawType(final java.lang.Object rawTypeKey, } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedMapBuilder rawTypes(final java.util.Map rawTypes) { if (this.rawTypes$key == null) { this.rawTypes$key = new java.util.ArrayList(); @@ -82,7 +69,6 @@ public SingularSortedMapBuilder rawTypes(final java.util.Map rawType } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedMapBuilder clearRawTypes() { if (this.rawTypes$key != null) { this.rawTypes$key.clear(); @@ -92,7 +78,6 @@ public SingularSortedMapBuilder clearRawTypes() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedMapBuilder integer(final Integer integerKey, final Float integerValue) { if (this.integers$key == null) { this.integers$key = new java.util.ArrayList(); @@ -104,7 +89,6 @@ public SingularSortedMapBuilder integer(final Integer integerKey, final Fl } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedMapBuilder integers(final java.util.Map integers) { if (this.integers$key == null) { this.integers$key = new java.util.ArrayList(); @@ -118,7 +102,6 @@ public SingularSortedMapBuilder integers(final java.util.Map clearIntegers() { if (this.integers$key != null) { this.integers$key.clear(); @@ -128,7 +111,6 @@ public SingularSortedMapBuilder clearIntegers() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedMapBuilder generic(final A genericKey, final B genericValue) { if (this.generics$key == null) { this.generics$key = new java.util.ArrayList(); @@ -140,7 +122,6 @@ public SingularSortedMapBuilder generic(final A genericKey, final B generi } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedMapBuilder generics(final java.util.Map generics) { if (this.generics$key == null) { this.generics$key = new java.util.ArrayList(); @@ -154,7 +135,6 @@ public SingularSortedMapBuilder generics(final java.util.Map clearGenerics() { if (this.generics$key != null) { this.generics$key.clear(); @@ -164,7 +144,6 @@ public SingularSortedMapBuilder clearGenerics() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedMapBuilder extendsGeneric(final Number extendsGenericKey, final String extendsGenericValue) { if (this.extendsGenerics$key == null) { this.extendsGenerics$key = new java.util.ArrayList(); @@ -176,7 +155,6 @@ public SingularSortedMapBuilder extendsGeneric(final Number extendsGeneric } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedMapBuilder extendsGenerics(final java.util.Map extendsGenerics) { if (this.extendsGenerics$key == null) { this.extendsGenerics$key = new java.util.ArrayList(); @@ -190,7 +168,6 @@ public SingularSortedMapBuilder extendsGenerics(final java.util.Map clearExtendsGenerics() { if (this.extendsGenerics$key != null) { this.extendsGenerics$key.clear(); @@ -200,33 +177,30 @@ public SingularSortedMapBuilder clearExtendsGenerics() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public SingularSortedMap build() { java.util.SortedMap rawTypes = new java.util.TreeMap(); - if (this.rawTypes$key != null) for (int $i = 0; $i < (this.rawTypes$key == null ? 0 : this.rawTypes$key.size()); $i++) rawTypes.put(this.rawTypes$key.get($i), this.rawTypes$value.get($i)); + if (this.rawTypes$key != null) for (int $i = 0; $i < (this.rawTypes$key == null ? 0 : this.rawTypes$key.size()); $i++) rawTypes.put(this.rawTypes$key.get($i), (java.lang.Object) this.rawTypes$value.get($i)); rawTypes = java.util.Collections.unmodifiableSortedMap(rawTypes); java.util.SortedMap integers = new java.util.TreeMap(); - if (this.integers$key != null) for (int $i = 0; $i < (this.integers$key == null ? 0 : this.integers$key.size()); $i++) integers.put(this.integers$key.get($i), this.integers$value.get($i)); + if (this.integers$key != null) for (int $i = 0; $i < (this.integers$key == null ? 0 : this.integers$key.size()); $i++) integers.put(this.integers$key.get($i), (Float) this.integers$value.get($i)); integers = java.util.Collections.unmodifiableSortedMap(integers); java.util.SortedMap generics = new java.util.TreeMap(); - if (this.generics$key != null) for (int $i = 0; $i < (this.generics$key == null ? 0 : this.generics$key.size()); $i++) generics.put(this.generics$key.get($i), this.generics$value.get($i)); + if (this.generics$key != null) for (int $i = 0; $i < (this.generics$key == null ? 0 : this.generics$key.size()); $i++) generics.put(this.generics$key.get($i), (B) this.generics$value.get($i)); generics = java.util.Collections.unmodifiableSortedMap(generics); java.util.SortedMap extendsGenerics = new java.util.TreeMap(); - if (this.extendsGenerics$key != null) for (int $i = 0; $i < (this.extendsGenerics$key == null ? 0 : this.extendsGenerics$key.size()); $i++) extendsGenerics.put(this.extendsGenerics$key.get($i), this.extendsGenerics$value.get($i)); + if (this.extendsGenerics$key != null) for (int $i = 0; $i < (this.extendsGenerics$key == null ? 0 : this.extendsGenerics$key.size()); $i++) extendsGenerics.put(this.extendsGenerics$key.get($i), (String) this.extendsGenerics$value.get($i)); extendsGenerics = java.util.Collections.unmodifiableSortedMap(extendsGenerics); return new SingularSortedMap(rawTypes, integers, generics, extendsGenerics); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "SingularSortedMap.SingularSortedMapBuilder(rawTypes$key=" + this.rawTypes$key + ", rawTypes$value=" + this.rawTypes$value + ", integers$key=" + this.integers$key + ", integers$value=" + this.integers$value + ", generics$key=" + this.generics$key + ", generics$value=" + this.generics$value + ", extendsGenerics$key=" + this.extendsGenerics$key + ", extendsGenerics$value=" + this.extendsGenerics$value + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static SingularSortedMapBuilder builder() { return new SingularSortedMapBuilder(); } diff --git a/testData/after/constructors/AllArgsConstructorStaticNameAccess.java b/testData/after/constructors/AllArgsConstructorStaticNameAccess.java index 0e1db55ad..33465637d 100644 --- a/testData/after/constructors/AllArgsConstructorStaticNameAccess.java +++ b/testData/after/constructors/AllArgsConstructorStaticNameAccess.java @@ -9,14 +9,12 @@ class AllArgsConstructorStaticNameAccessPrivate { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private AllArgsConstructorStaticNameAccessPrivate(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static AllArgsConstructorStaticNameAccessPrivate of(final int x, final String name) { return new AllArgsConstructorStaticNameAccessPrivate(x, name); } @@ -28,14 +26,12 @@ class AllArgsConstructorStaticNameAccessProtected { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private AllArgsConstructorStaticNameAccessProtected(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected static AllArgsConstructorStaticNameAccessProtected of(final int x, final String name) { return new AllArgsConstructorStaticNameAccessProtected(x, name); } @@ -47,14 +43,12 @@ class AllArgsConstructorStaticNameAccessPackage { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private AllArgsConstructorStaticNameAccessPackage(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") static AllArgsConstructorStaticNameAccessPackage of(final int x, final String name) { return new AllArgsConstructorStaticNameAccessPackage(x, name); } @@ -66,14 +60,12 @@ class AllArgsConstructorStaticNameAccessModule { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private AllArgsConstructorStaticNameAccessModule(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") static AllArgsConstructorStaticNameAccessModule of(final int x, final String name) { return new AllArgsConstructorStaticNameAccessModule(x, name); } @@ -85,14 +77,12 @@ class AllArgsConstructorStaticNameAccessPublic { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private AllArgsConstructorStaticNameAccessPublic(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static AllArgsConstructorStaticNameAccessPublic of(final int x, final String name) { return new AllArgsConstructorStaticNameAccessPublic(x, name); } diff --git a/testData/after/constructors/ConflictingStaticConstructorNames.java b/testData/after/constructors/ConflictingStaticConstructorNames.java index d2d63bca7..32a1cc06f 100644 --- a/testData/after/constructors/ConflictingStaticConstructorNames.java +++ b/testData/after/constructors/ConflictingStaticConstructorNames.java @@ -3,7 +3,6 @@ class ConflictingStaticConstructorNames { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ConflictingStaticConstructorNames)) return false; @@ -13,14 +12,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof ConflictingStaticConstructorNames; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { int result = 1; return result; @@ -28,13 +25,11 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ConflictingStaticConstructorNames()"; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ConflictingStaticConstructorNames() { } } diff --git a/testData/after/constructors/ConstructorEnum.java b/testData/after/constructors/ConstructorEnum.java index 425a0f346..7d82d28de 100644 --- a/testData/after/constructors/ConstructorEnum.java +++ b/testData/after/constructors/ConstructorEnum.java @@ -5,13 +5,11 @@ public enum ConstructorEnum { private final int x; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private ConstructorEnum(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } diff --git a/testData/after/constructors/Constructors.java b/testData/after/constructors/Constructors.java index 268d0a2f4..36906503f 100644 --- a/testData/after/constructors/Constructors.java +++ b/testData/after/constructors/Constructors.java @@ -6,7 +6,6 @@ class RequiredArgsConstructor1 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public RequiredArgsConstructor1(final int x) { this.x = x; } @@ -18,7 +17,6 @@ class RequiredArgsConstructorAccess { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected RequiredArgsConstructorAccess(final int x) { this.x = x; } @@ -29,13 +27,11 @@ class RequiredArgsConstructorStaticName { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private RequiredArgsConstructorStaticName(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static RequiredArgsConstructorStaticName staticname(final int x) { return new RequiredArgsConstructorStaticName(x); } @@ -48,7 +44,6 @@ class RequiredArgsConstructorWithAnnotations { @java.beans.ConstructorProperties({"x"}) @Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public RequiredArgsConstructorWithAnnotations(final int x) { this.x = x; } @@ -60,7 +55,6 @@ class AllArgsConstructor1 { @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public AllArgsConstructor1(final int x, final String name) { this.x = x; this.name = name; @@ -72,7 +66,6 @@ class NoArgsConstructor1 { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public NoArgsConstructor1() { } } @@ -82,13 +75,11 @@ class RequiredArgsConstructorStaticNameGenerics { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private RequiredArgsConstructorStaticNameGenerics(final T x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static RequiredArgsConstructorStaticNameGenerics of(final T x) { return new RequiredArgsConstructorStaticNameGenerics(x); } @@ -99,13 +90,11 @@ class RequiredArgsConstructorStaticNameGenerics2 { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private RequiredArgsConstructorStaticNameGenerics2(final Class x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static RequiredArgsConstructorStaticNameGenerics2 of(final Class x) { return new RequiredArgsConstructorStaticNameGenerics2(x); } diff --git a/testData/after/constructors/NoArgsConstructorForced.java b/testData/after/constructors/NoArgsConstructorForced.java index c648db0a0..57777590a 100644 --- a/testData/after/constructors/NoArgsConstructorForced.java +++ b/testData/after/constructors/NoArgsConstructorForced.java @@ -14,7 +14,6 @@ public class NoArgsConstructorForced { // this.c = '\000'; // this.f = 0.0F; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public NoArgsConstructorForced() { this.x = 0; this.y = 0; diff --git a/testData/after/constructors/RequiredArgsConstructorStaticNameAccess.java b/testData/after/constructors/RequiredArgsConstructorStaticNameAccess.java index 4ab8f89d6..15d1bb36c 100644 --- a/testData/after/constructors/RequiredArgsConstructorStaticNameAccess.java +++ b/testData/after/constructors/RequiredArgsConstructorStaticNameAccess.java @@ -6,13 +6,11 @@ class RequiredArgsConstructorStaticNameAccessPrivate { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private RequiredArgsConstructorStaticNameAccessPrivate(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static RequiredArgsConstructorStaticNameAccessPrivate of(final int x) { return new RequiredArgsConstructorStaticNameAccessPrivate(x); } @@ -24,13 +22,11 @@ class RequiredArgsConstructorStaticNameAccessProtected { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private RequiredArgsConstructorStaticNameAccessProtected(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected static RequiredArgsConstructorStaticNameAccessProtected of(final int x) { return new RequiredArgsConstructorStaticNameAccessProtected(x); } @@ -42,13 +38,11 @@ class RequiredArgsConstructorStaticNameAccessPackage { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private RequiredArgsConstructorStaticNameAccessPackage(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") static RequiredArgsConstructorStaticNameAccessPackage of(final int x) { return new RequiredArgsConstructorStaticNameAccessPackage(x); } @@ -60,13 +54,11 @@ class RequiredArgsConstructorStaticNameAccessModule { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private RequiredArgsConstructorStaticNameAccessModule(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") static RequiredArgsConstructorStaticNameAccessModule of(final int x) { return new RequiredArgsConstructorStaticNameAccessModule(x); } @@ -78,13 +70,11 @@ class RequiredArgsConstructorStaticNameAccessPublic { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private RequiredArgsConstructorStaticNameAccessPublic(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static RequiredArgsConstructorStaticNameAccessPublic of(final int x) { return new RequiredArgsConstructorStaticNameAccessPublic(x); } diff --git a/testData/after/constructors/RequiredArgsConstructorWithGeneric136.java b/testData/after/constructors/RequiredArgsConstructorWithGeneric136.java index 035278af6..93ea0e110 100644 --- a/testData/after/constructors/RequiredArgsConstructorWithGeneric136.java +++ b/testData/after/constructors/RequiredArgsConstructorWithGeneric136.java @@ -11,26 +11,22 @@ static Foo of(T object, int i) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public T getObject() { return this.object; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getI() { return this.i; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private Foo(final T object, final int i) { this.object = object; this.i = i; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static Foo of2(final T object, final int i) { return new Foo(object, i); } diff --git a/testData/after/constructors/RequiredArgsConstructorWithGeneric157.java b/testData/after/constructors/RequiredArgsConstructorWithGeneric157.java index 102fc34ff..8e1c3a2db 100644 --- a/testData/after/constructors/RequiredArgsConstructorWithGeneric157.java +++ b/testData/after/constructors/RequiredArgsConstructorWithGeneric157.java @@ -13,13 +13,11 @@ Map buildBar() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private Foo(final Map bar) { this.bar = bar; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static Foo of(final Map bar) { return new Foo(bar); } diff --git a/testData/after/data/DataExtended.java b/testData/after/data/DataExtended.java index 1d757e00a..a06ae4b33 100644 --- a/testData/after/data/DataExtended.java +++ b/testData/after/data/DataExtended.java @@ -4,25 +4,21 @@ class DataExtended { int x; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public DataExtended() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setX(final int x) { this.x = x; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataExtended)) return false; @@ -33,14 +29,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof DataExtended; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -50,7 +44,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "DataExtended(x=" + this.x + ")"; } diff --git a/testData/after/data/DataIgnore.java b/testData/after/data/DataIgnore.java index f6ab50583..23a720dd2 100644 --- a/testData/after/data/DataIgnore.java +++ b/testData/after/data/DataIgnore.java @@ -6,20 +6,17 @@ class DataIgnore { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public DataIgnore(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataIgnore)) return false; @@ -30,14 +27,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof DataIgnore; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -47,7 +42,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "DataIgnore(x=" + this.getX() + ")"; } diff --git a/testData/after/data/DataOnEnum.java b/testData/after/data/DataOnEnum.java index 99b890ad9..cf9c90478 100644 --- a/testData/after/data/DataOnEnum.java +++ b/testData/after/data/DataOnEnum.java @@ -5,20 +5,17 @@ public enum DataOnEnum { private final String someField; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getSomeField() { return this.someField; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "DataOnEnum(someField=" + this.getSomeField() + ")"; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private DataOnEnum(final String someField) { this.someField = someField; } diff --git a/testData/after/data/DataOnLocalClass.java b/testData/after/data/DataOnLocalClass.java index 667d397be..f9089dc38 100644 --- a/testData/after/data/DataOnLocalClass.java +++ b/testData/after/data/DataOnLocalClass.java @@ -8,32 +8,27 @@ class Local { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Local(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getName() { return this.name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local)) return false; @@ -47,14 +42,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof Local; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -66,7 +59,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Local(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -86,7 +78,6 @@ class InnerLocal { String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public InnerLocal(@lombok.NonNull final String name) { if (name == null) { throw new java.lang.NullPointerException("name"); @@ -96,13 +87,11 @@ public InnerLocal(@lombok.NonNull final String name) { @lombok.NonNull @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getName() { return this.name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setName(@lombok.NonNull final String name) { if (name == null) { throw new java.lang.NullPointerException("name"); @@ -112,7 +101,6 @@ public void setName(@lombok.NonNull final String name) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local.InnerLocal)) return false; @@ -125,14 +113,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof Local.InnerLocal; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -143,27 +129,23 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Local.InnerLocal(name=" + this.getName() + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Local(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local)) return false; @@ -174,14 +156,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof Local; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -191,7 +171,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Local(x=" + this.getX() + ")"; } diff --git a/testData/after/data/DataPlain.java b/testData/after/data/DataPlain.java index cf00b756b..2464579fa 100644 --- a/testData/after/data/DataPlain.java +++ b/testData/after/data/DataPlain.java @@ -6,32 +6,27 @@ class Data1 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Data1(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getName() { return this.name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data1)) return false; @@ -45,14 +40,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof Data1; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -64,7 +57,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Data1(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -76,32 +68,27 @@ class Data2 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Data2(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getName() { return this.name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data2)) return false; @@ -115,14 +102,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof Data2; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -134,7 +119,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Data2(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -146,32 +130,27 @@ final class Data3 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Data3(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getName() { return this.name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data3)) return false; @@ -185,7 +164,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -197,7 +175,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Data3(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -210,27 +187,23 @@ final class Data4 extends java.util.Calendar { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setX(final int x) { this.x = x; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Data4(x=" + this.getX() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data4)) return false; @@ -242,14 +215,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof Data4; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -261,13 +232,11 @@ public int hashCode() { class Data5 { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Data5() { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data5)) return false; @@ -277,14 +246,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof Data5; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { int result = 1; return result; @@ -292,7 +259,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Data5()"; } @@ -300,13 +266,11 @@ public java.lang.String toString() { final class Data6 { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Data6() { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data6)) return false; @@ -315,7 +279,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { int result = 1; return result; @@ -323,7 +286,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Data6()"; } diff --git a/testData/after/data/DataStaticConstructor.java b/testData/after/data/DataStaticConstructor.java index 3e429e613..b2de4f2bd 100644 --- a/testData/after/data/DataStaticConstructor.java +++ b/testData/after/data/DataStaticConstructor.java @@ -4,26 +4,22 @@ class Entity { private final String field; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private Entity(final String field) { this.field = field; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static Entity of(final String field) { return new Entity(field); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getField() { return this.field; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Entity)) return false; @@ -36,14 +32,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof Entity; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -54,7 +48,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Entity(field=" + this.getField() + ")"; } diff --git a/testData/after/data/DataWithGeneric176.java b/testData/after/data/DataWithGeneric176.java index 8813f7631..c71528d64 100644 --- a/testData/after/data/DataWithGeneric176.java +++ b/testData/after/data/DataWithGeneric176.java @@ -22,33 +22,28 @@ public void run() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private DataWithGeneric176(final T command, final Runnable callback) { this.command = command; this.callback = callback; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static DataWithGeneric176 of(final T command, final Runnable callback) { return new DataWithGeneric176(command, callback); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public T getCommand() { return this.command; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Runnable getCallback() { return this.callback; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGeneric176)) return false; @@ -64,14 +59,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGeneric176; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -84,7 +77,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "DataWithGeneric176(command=" + this.getCommand() + ", callback=" + this.getCallback() + ")"; } diff --git a/testData/after/data/DataWithGetter.java b/testData/after/data/DataWithGetter.java index f75df4c71..f02d32cc2 100644 --- a/testData/after/data/DataWithGetter.java +++ b/testData/after/data/DataWithGetter.java @@ -7,26 +7,22 @@ class DataWithGetter { @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public DataWithGetter(final String z) { this.z = z; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setX(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setY(final int y) { this.y = y; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGetter)) return false; @@ -41,14 +37,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGetter; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -61,25 +55,21 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "DataWithGetter(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")"; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getY() { return this.y; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getZ() { return this.z; } diff --git a/testData/after/data/DataWithGetterNone.java b/testData/after/data/DataWithGetterNone.java index 2c674c34d..ac73e9f34 100644 --- a/testData/after/data/DataWithGetterNone.java +++ b/testData/after/data/DataWithGetterNone.java @@ -7,26 +7,22 @@ class DataWithGetterNone { @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public DataWithGetterNone(final String z) { this.z = z; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setX(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setY(final int y) { this.y = y; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGetterNone)) return false; @@ -41,14 +37,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGetterNone; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -61,7 +55,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "DataWithGetterNone(x=" + this.x + ", y=" + this.y + ", z=" + this.z + ")"; } diff --git a/testData/after/equalsandhashcode/EqualsAndHashCodeExplicitEmptyOf.java b/testData/after/equalsandhashcode/EqualsAndHashCodeExplicitEmptyOf.java index d73b1c79e..0df916f4a 100644 --- a/testData/after/equalsandhashcode/EqualsAndHashCodeExplicitEmptyOf.java +++ b/testData/after/equalsandhashcode/EqualsAndHashCodeExplicitEmptyOf.java @@ -7,7 +7,6 @@ class EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode)) return false; @@ -17,14 +16,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { int result = 1; return result; @@ -40,7 +37,6 @@ final class EqualsAndHashCode2 { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode2)) return false; @@ -50,7 +46,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { int result = 1; return result; diff --git a/testData/after/equalsandhashcode/EqualsAndHashCodeExplicitOfAndExclude.java b/testData/after/equalsandhashcode/EqualsAndHashCodeExplicitOfAndExclude.java index b7c6f33b8..a0c51b949 100644 --- a/testData/after/equalsandhashcode/EqualsAndHashCodeExplicitOfAndExclude.java +++ b/testData/after/equalsandhashcode/EqualsAndHashCodeExplicitOfAndExclude.java @@ -7,7 +7,6 @@ class EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode)) return false; @@ -19,14 +18,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/testData/after/getter/ClassNamedAfterGetter.java b/testData/after/getter/ClassNamedAfterGetter.java index 60f264bc0..d7e994d48 100644 --- a/testData/after/getter/ClassNamedAfterGetter.java +++ b/testData/after/getter/ClassNamedAfterGetter.java @@ -4,7 +4,6 @@ class GetFoo { private int foo; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getFoo() { return this.foo; } diff --git a/testData/after/getter/CommentsInterspersed.java b/testData/after/getter/CommentsInterspersed.java index 41e413b21..c7bdb27b0 100644 --- a/testData/after/getter/CommentsInterspersed.java +++ b/testData/after/getter/CommentsInterspersed.java @@ -15,10 +15,9 @@ public class CommentsInterspersed { }-*/ @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getTest() { return this.test; } } //haha! //hahaha! -//hahahaha! \ No newline at end of file +//hahahaha! diff --git a/testData/after/getter/GetterAccessLevel.java b/testData/after/getter/GetterAccessLevel.java index 0ccb7531e..2afb452e7 100644 --- a/testData/after/getter/GetterAccessLevel.java +++ b/testData/after/getter/GetterAccessLevel.java @@ -14,55 +14,46 @@ class GetterAccessLevel { String value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private boolean isPrivate() { return this.isPrivate; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") boolean isPackage() { return this.isPackage; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean isProtected() { return this.isProtected; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isPublic() { return this.isPublic; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String getPrivateString() { return this.privateString; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") String getPackageString() { return this.packageString; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected String getProtectedString() { return this.protectedString; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getPublicString() { return this.publicString; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getValue() { return this.value; } diff --git a/testData/after/getter/GetterAlreadyExists.java b/testData/after/getter/GetterAlreadyExists.java index 1e129d258..08ff4a872 100644 --- a/testData/after/getter/GetterAlreadyExists.java +++ b/testData/after/getter/GetterAlreadyExists.java @@ -8,7 +8,6 @@ boolean hasFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isFoo() { return this.foo; } @@ -38,7 +37,6 @@ String hasFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getFoo() { return this.foo; } @@ -52,7 +50,6 @@ String isFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getFoo() { return this.foo; } @@ -74,7 +71,6 @@ boolean hasFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getFoo() { return this.foo; } @@ -88,7 +84,6 @@ boolean isFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getFoo() { return this.foo; } @@ -110,7 +105,6 @@ static boolean hasFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isFoo() { return this.foo; } @@ -140,7 +134,6 @@ static boolean hasFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getFoo() { return this.foo; } @@ -154,7 +147,6 @@ static boolean isFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getFoo() { return this.foo; } @@ -176,7 +168,6 @@ static String hasFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getFoo() { return this.foo; } @@ -190,7 +181,6 @@ static String isFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getFoo() { return this.foo; } diff --git a/testData/after/getter/GetterBoolean.java b/testData/after/getter/GetterBoolean.java index 6c4341cbb..4cf5b1759 100644 --- a/testData/after/getter/GetterBoolean.java +++ b/testData/after/getter/GetterBoolean.java @@ -6,19 +6,16 @@ class Getter { boolean hasBaz; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isFoo() { return this.foo; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isBar() { return this.isBar; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isHasBaz() { return this.hasBaz; } @@ -32,7 +29,6 @@ boolean hasFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isFoo() { return this.foo; } diff --git a/testData/after/getter/GetterDeprecated.java b/testData/after/getter/GetterDeprecated.java index 7ad15b6e8..b5ff646a3 100644 --- a/testData/after/getter/GetterDeprecated.java +++ b/testData/after/getter/GetterDeprecated.java @@ -10,7 +10,6 @@ class GetterDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getAnnotation() { return this.annotation; } @@ -20,7 +19,6 @@ public int getAnnotation() { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getJavadoc() { return this.javadoc; } diff --git a/testData/after/getter/GetterEnum.java b/testData/after/getter/GetterEnum.java index 614816d4f..28c2ef64c 100644 --- a/testData/after/getter/GetterEnum.java +++ b/testData/after/getter/GetterEnum.java @@ -6,20 +6,17 @@ enum GetterEnum { private final String name; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private GetterEnum(final int id, final String name) { this.id = id; this.name = name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getId() { return this.id; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getName() { return this.name; } diff --git a/testData/after/getter/GetterLazy.java b/testData/after/getter/GetterLazy.java index d1e18cdbe..9ed80694b 100644 --- a/testData/after/getter/GetterLazy.java +++ b/testData/after/getter/GetterLazy.java @@ -8,7 +8,6 @@ static class ValueType { private final java.util.concurrent.atomic.AtomicReference fieldName = new java.util.concurrent.atomic.AtomicReference(); @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ValueType getFieldName() { java.lang.Object value = this.fieldName.get(); if (value == null) { diff --git a/testData/after/getter/GetterLazyBoolean.java b/testData/after/getter/GetterLazyBoolean.java index 506e71910..449b2c482 100644 --- a/testData/after/getter/GetterLazyBoolean.java +++ b/testData/after/getter/GetterLazyBoolean.java @@ -10,7 +10,6 @@ private static boolean calculateBoolean() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterLazyBoolean)) return false; @@ -21,14 +20,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterLazyBoolean; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -38,13 +35,11 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "GetterLazyBoolean(booleanValue=" + this.isBooleanValue() + ")"; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isBooleanValue() { java.lang.Object value = this.booleanValue.get(); if (value == null) { @@ -61,7 +56,6 @@ public boolean isBooleanValue() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isOtherBooleanValue() { java.lang.Object value = this.otherBooleanValue.get(); if (value == null) { diff --git a/testData/after/getter/GetterLazyEahcToString.java b/testData/after/getter/GetterLazyEahcToString.java index 176689926..347c56f52 100644 --- a/testData/after/getter/GetterLazyEahcToString.java +++ b/testData/after/getter/GetterLazyEahcToString.java @@ -6,7 +6,6 @@ class GetterLazyEahcToString { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterLazyEahcToString)) return false; @@ -22,14 +21,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterLazyEahcToString; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -42,13 +39,11 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "GetterLazyEahcToString(value=" + this.getValue() + ", value2=" + this.value2 + ")"; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getValue() { java.lang.Object value = this.value.get(); if (value == null) { @@ -65,7 +60,6 @@ public String getValue() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getValue2() { return this.value2; } diff --git a/testData/after/getter/GetterLazyInvalid.java b/testData/after/getter/GetterLazyInvalid.java index c04aa59c0..5140518e0 100644 --- a/testData/after/getter/GetterLazyInvalid.java +++ b/testData/after/getter/GetterLazyInvalid.java @@ -20,7 +20,6 @@ class GetterLazyInvalidClass { private final String fieldName = ""; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getFieldName() { return this.fieldName; } diff --git a/testData/after/getter/GetterLazyNative.java b/testData/after/getter/GetterLazyNative.java index b32e095e7..135030e7c 100644 --- a/testData/after/getter/GetterLazyNative.java +++ b/testData/after/getter/GetterLazyNative.java @@ -12,7 +12,6 @@ class GetterLazyNative { private final java.util.concurrent.atomic.AtomicReference intArrayField = new java.util.concurrent.atomic.AtomicReference(); @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isBooleanField() { java.lang.Object value = this.booleanField.get(); if (value == null) { @@ -29,7 +28,6 @@ public boolean isBooleanField() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public byte getByteField() { java.lang.Object value = this.byteField.get(); if (value == null) { @@ -46,7 +44,6 @@ public byte getByteField() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public short getShortField() { java.lang.Object value = this.shortField.get(); if (value == null) { @@ -63,7 +60,6 @@ public short getShortField() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getIntField() { java.lang.Object value = this.intField.get(); if (value == null) { @@ -80,7 +76,6 @@ public int getIntField() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public long getLongField() { java.lang.Object value = this.longField.get(); if (value == null) { @@ -97,7 +92,6 @@ public long getLongField() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public float getFloatField() { java.lang.Object value = this.floatField.get(); if (value == null) { @@ -114,7 +108,6 @@ public float getFloatField() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public double getDoubleField() { java.lang.Object value = this.doubleField.get(); if (value == null) { @@ -131,7 +124,6 @@ public double getDoubleField() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public char getCharField() { java.lang.Object value = this.charField.get(); if (value == null) { @@ -148,7 +140,6 @@ public char getCharField() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int[] getIntArrayField() { java.lang.Object value = this.intArrayField.get(); if (value == null) { diff --git a/testData/after/getter/GetterNone.java b/testData/after/getter/GetterNone.java index fc48fbfad..31fcacdb5 100644 --- a/testData/after/getter/GetterNone.java +++ b/testData/after/getter/GetterNone.java @@ -5,7 +5,6 @@ class GetterNone { int foo; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getI() { return this.i; } diff --git a/testData/after/getter/GetterOnClass.java b/testData/after/getter/GetterOnClass.java index 9230bb7b0..73e6a4562 100644 --- a/testData/after/getter/GetterOnClass.java +++ b/testData/after/getter/GetterOnClass.java @@ -5,7 +5,6 @@ class GetterOnClass1 { boolean isPublic; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isPublic() { return this.isPublic; } @@ -17,13 +16,11 @@ class GetterOnClass2 { boolean isPackage; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean isProtected() { return this.isProtected; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") boolean isPackage() { return this.isPackage; } @@ -34,7 +31,6 @@ class GetterOnClass3 { boolean isPackage; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") boolean isPackage() { return this.isPackage; } @@ -45,7 +41,6 @@ class GetterOnClass4 { boolean isPrivate; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private boolean isPrivate() { return this.isPrivate; } @@ -56,7 +51,6 @@ class GetterOnClass5 { boolean isPublic; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean isPublic() { return this.isPublic; } @@ -68,14 +62,12 @@ class GetterOnClass6 { String nonNull; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getCouldBeNull() { return this.couldBeNull; } @lombok.NonNull @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getNonNull() { return this.nonNull; } diff --git a/testData/after/getter/GetterOnMethod.java b/testData/after/getter/GetterOnMethod.java index afe3fcf58..93a85bf57 100644 --- a/testData/after/getter/GetterOnMethod.java +++ b/testData/after/getter/GetterOnMethod.java @@ -11,7 +11,6 @@ class GetterOnMethod { @Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getI() { return this.i; } @@ -19,7 +18,6 @@ public int getI() { @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getJ() { return this.j; } @@ -27,7 +25,6 @@ public int getJ() { @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getK() { return this.k; } diff --git a/testData/after/getter/GetterOnMethodErrors.java b/testData/after/getter/GetterOnMethodErrors.java index 1bf1b8026..f6c0660bc 100644 --- a/testData/after/getter/GetterOnMethodErrors.java +++ b/testData/after/getter/GetterOnMethodErrors.java @@ -7,7 +7,6 @@ class GetterOnMethodErrors { private int test; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getTest() { return this.test; } diff --git a/testData/after/getter/GetterOnMethodErrors2.java b/testData/after/getter/GetterOnMethodErrors2.java index dd49969e3..3ded8aad9 100644 --- a/testData/after/getter/GetterOnMethodErrors2.java +++ b/testData/after/getter/GetterOnMethodErrors2.java @@ -15,45 +15,38 @@ class GetterOnMethodErrors2 { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getBad1() { return this.bad1; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getBad2() { return this.bad2; } @Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getBad3() { return this.bad3; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getBad4() { return this.bad4; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getGood1() { return this.good1; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getGood2() { return this.good2; } @Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getGood3() { return this.good3; } @@ -61,7 +54,6 @@ public int getGood3() { @Deprecated @Test @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getGood4() { return this.good4; } diff --git a/testData/after/getter/GetterPlain.java b/testData/after/getter/GetterPlain.java index 2c5ad1ca4..6ed71821d 100644 --- a/testData/after/getter/GetterPlain.java +++ b/testData/after/getter/GetterPlain.java @@ -5,13 +5,11 @@ class GetterPlain { int foo; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getI() { return this.i; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getFoo() { return this.foo; } diff --git a/testData/after/getter/GetterWithDollar.java b/testData/after/getter/GetterWithDollar.java index 06a88a855..34592b005 100644 --- a/testData/after/getter/GetterWithDollar.java +++ b/testData/after/getter/GetterWithDollar.java @@ -4,7 +4,6 @@ class GetterWithDollar1 { int $i; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int get$i() { return this.$i; } @@ -15,13 +14,11 @@ class GetterWithDollar2 { int i; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int get$i() { return this.$i; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getI() { return this.i; } diff --git a/testData/after/getter/MultiFieldGetter.java b/testData/after/getter/MultiFieldGetter.java index 236d30924..ff4d2f295 100644 --- a/testData/after/getter/MultiFieldGetter.java +++ b/testData/after/getter/MultiFieldGetter.java @@ -5,13 +5,11 @@ class MultiFieldGetter { int y; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected int getY() { return this.y; } @@ -22,13 +20,11 @@ class MultiFieldGetter2 { int y; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") int getY() { return this.y; } diff --git a/testData/after/getter/TrickyTypeResolution.java b/testData/after/getter/TrickyTypeResolution.java index 390e2b9e8..9d2999b33 100644 --- a/testData/after/getter/TrickyTypeResolution.java +++ b/testData/after/getter/TrickyTypeResolution.java @@ -24,7 +24,6 @@ class TrickySuccess { int x; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } diff --git a/testData/after/logger/LoggerCommons.java b/testData/after/logger/LoggerCommons.java index 1cd90320f..318058642 100644 --- a/testData/after/logger/LoggerCommons.java +++ b/testData/after/logger/LoggerCommons.java @@ -2,18 +2,15 @@ class LoggerCommons { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class); } class LoggerCommonsWithImport { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class); } class LoggerCommonsWithDifferentName { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("DifferentName"); } diff --git a/testData/after/logger/LoggerFlogger.java b/testData/after/logger/LoggerFlogger.java index b79769f50..3034e8f2b 100644 --- a/testData/after/logger/LoggerFlogger.java +++ b/testData/after/logger/LoggerFlogger.java @@ -2,6 +2,5 @@ class LoggerFlogger { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); } diff --git a/testData/after/logger/LoggerJBossLog.java b/testData/after/logger/LoggerJBossLog.java index 0a6c34a55..7cfaaba85 100644 --- a/testData/after/logger/LoggerJBossLog.java +++ b/testData/after/logger/LoggerJBossLog.java @@ -1,25 +1,21 @@ class LoggerJBossLog { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLog.class); } class LoggerJBossLogWithImport { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithImport.class); } class LoggerJBossLogOuter { static class Inner { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); } } class LoggerJBossLogWithDifferentLoggerName { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger("DifferentLogger"); -} \ No newline at end of file +} diff --git a/testData/after/logger/LoggerJul.java b/testData/after/logger/LoggerJul.java index 403297371..d3a50b10f 100644 --- a/testData/after/logger/LoggerJul.java +++ b/testData/after/logger/LoggerJul.java @@ -2,18 +2,15 @@ class LoggerJul { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName()); } class LoggerJulWithImport { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName()); } class LoggerJulWithDifferentName { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("DifferentName"); } diff --git a/testData/after/logger/LoggerLog4j.java b/testData/after/logger/LoggerLog4j.java index ae632802f..43a7cf140 100644 --- a/testData/after/logger/LoggerLog4j.java +++ b/testData/after/logger/LoggerLog4j.java @@ -2,18 +2,15 @@ class LoggerLog4j { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class); } class LoggerLog4jWithImport { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class); } class LoggerLog4jWithDifferentName { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("DifferentName"); } diff --git a/testData/after/logger/LoggerLog4j2.java b/testData/after/logger/LoggerLog4j2.java index cdc90a354..799d34223 100644 --- a/testData/after/logger/LoggerLog4j2.java +++ b/testData/after/logger/LoggerLog4j2.java @@ -2,18 +2,15 @@ class LoggerLog4j2 { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class); } class LoggerLog4j2WithImport { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class); } class LoggerLog4j2WithDifferentName { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger("DifferentName"); } diff --git a/testData/after/logger/LoggerSlf4j.java b/testData/after/logger/LoggerSlf4j.java index fa71cf209..b83bbbc8e 100644 --- a/testData/after/logger/LoggerSlf4j.java +++ b/testData/after/logger/LoggerSlf4j.java @@ -2,13 +2,11 @@ class LoggerSlf4j { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); } class LoggerSlf4jWithImport { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class); } @@ -16,13 +14,11 @@ class LoggerSlf4jOuter { static class Inner { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } class LoggerSlf4jWithDifferentLoggerName { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("DifferentLogger"); } diff --git a/testData/after/logger/LoggerSlf4jTypes.java b/testData/after/logger/LoggerSlf4jTypes.java index e33be99fc..af26bdacb 100644 --- a/testData/after/logger/LoggerSlf4jTypes.java +++ b/testData/after/logger/LoggerSlf4jTypes.java @@ -9,14 +9,12 @@ interface LoggerSlf4jTypesInterface { enum LoggerSlf4jTypesEnum { ; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class); } enum LoggerSlf4jTypesEnumWithElement { FOO; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class); } @@ -24,7 +22,6 @@ interface LoggerSlf4jTypesInterfaceOuter { class Inner { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } diff --git a/testData/after/logger/LoggerSlf4jWithPackage.java b/testData/after/logger/LoggerSlf4jWithPackage.java index 5886477d3..9a82f9e97 100644 --- a/testData/after/logger/LoggerSlf4jWithPackage.java +++ b/testData/after/logger/LoggerSlf4jWithPackage.java @@ -3,7 +3,6 @@ class LoggerSlf4jWithPackage { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class); } @@ -11,7 +10,6 @@ class LoggerSlf4jWithPackageOuter { static class Inner { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } diff --git a/testData/after/logger/LoggerXSlf4j.java b/testData/after/logger/LoggerXSlf4j.java index d9f6d13a4..c167fabf7 100644 --- a/testData/after/logger/LoggerXSlf4j.java +++ b/testData/after/logger/LoggerXSlf4j.java @@ -2,18 +2,15 @@ class LoggerXSlf4j { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4j.class); } class LoggerXSlf4jWithImport { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithImport.class); } class LoggerXSlf4jWithDifferentName { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger("DifferentName"); } diff --git a/testData/after/setter/SetterAccessLevel.java b/testData/after/setter/SetterAccessLevel.java index 411d7b282..b2ffc93fd 100644 --- a/testData/after/setter/SetterAccessLevel.java +++ b/testData/after/setter/SetterAccessLevel.java @@ -9,31 +9,26 @@ class SetterAccessLevel { boolean value; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected void setProtected(final boolean isProtected) { this.isProtected = isProtected; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setValue(final boolean value) { this.value = value; } diff --git a/testData/after/setter/SetterAlreadyExists.java b/testData/after/setter/SetterAlreadyExists.java index a162bb3f0..67f330ddc 100644 --- a/testData/after/setter/SetterAlreadyExists.java +++ b/testData/after/setter/SetterAlreadyExists.java @@ -35,7 +35,6 @@ void setFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setFoo(final String foo) { this.foo = foo; } @@ -48,7 +47,6 @@ void setFoo(String foo, int x) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setFoo(final String foo) { this.foo = foo; } diff --git a/testData/after/setter/SetterDeprecated.java b/testData/after/setter/SetterDeprecated.java index f8544ea88..5f98326bf 100644 --- a/testData/after/setter/SetterDeprecated.java +++ b/testData/after/setter/SetterDeprecated.java @@ -10,7 +10,6 @@ class SetterDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setAnnotation(final int annotation) { this.annotation = annotation; } @@ -20,7 +19,6 @@ public void setAnnotation(final int annotation) { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setJavadoc(final int javadoc) { this.javadoc = javadoc; } diff --git a/testData/after/setter/SetterOnClass.java b/testData/after/setter/SetterOnClass.java index 4adc0530f..66f3796f0 100644 --- a/testData/after/setter/SetterOnClass.java +++ b/testData/after/setter/SetterOnClass.java @@ -5,7 +5,6 @@ class SetterOnClass1 { boolean isPublic; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @@ -17,13 +16,11 @@ class SetterOnClass2 { boolean isPackage; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected void setProtected(final boolean isProtected) { this.isProtected = isProtected; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @@ -34,7 +31,6 @@ class SetterOnClass3 { boolean isPackage; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @@ -45,7 +41,6 @@ class SetterOnClass4 { boolean isPrivate; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @@ -56,7 +51,6 @@ class SetterOnClass5 { boolean isPublic; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @@ -68,13 +62,11 @@ class SetterOnClass6 { String nonNull; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setCouldBeNull(final String couldBeNull) { this.couldBeNull = couldBeNull; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setNonNull(@lombok.NonNull final String nonNull) { this.nonNull = nonNull; } diff --git a/testData/after/setter/SetterOnMethodOnParam.java b/testData/after/setter/SetterOnMethodOnParam.java index 93646b5a6..32b5aa802 100644 --- a/testData/after/setter/SetterOnMethodOnParam.java +++ b/testData/after/setter/SetterOnMethodOnParam.java @@ -11,7 +11,6 @@ class SetterOnMethodOnParam { @Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setI(final int i) { this.i = i; } @@ -19,7 +18,6 @@ public void setI(final int i) { @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setJ(@Test final int j) { this.j = j; } @@ -27,7 +25,6 @@ public void setJ(@Test final int j) { @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setK(@Test final int k) { this.k = k; } diff --git a/testData/after/setter/SetterOnStatic.java b/testData/after/setter/SetterOnStatic.java index 681571222..7f9077fe3 100644 --- a/testData/after/setter/SetterOnStatic.java +++ b/testData/after/setter/SetterOnStatic.java @@ -5,13 +5,11 @@ class Setter { static int bar; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static void setFoo(final boolean foo) { Setter.foo = foo; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static void setBar(final int bar) { Setter.bar = bar; } diff --git a/testData/after/setter/SetterPlain.java b/testData/after/setter/SetterPlain.java index b7fd30f8c..a956adb81 100644 --- a/testData/after/setter/SetterPlain.java +++ b/testData/after/setter/SetterPlain.java @@ -5,13 +5,11 @@ class SetterPlain { int foo; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setI(final int i) { this.i = i; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setFoo(final int foo) { this.foo = foo; } diff --git a/testData/after/setter/SetterWithDollar.java b/testData/after/setter/SetterWithDollar.java index aa3d1057b..f8ac36baa 100644 --- a/testData/after/setter/SetterWithDollar.java +++ b/testData/after/setter/SetterWithDollar.java @@ -4,7 +4,6 @@ class SetterWithDollar1 { int $i; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void set$i(final int $i) { this.$i = $i; } @@ -15,13 +14,11 @@ class SetterWithDollar2 { int i; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void set$i(final int $i) { this.$i = $i; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public void setI(final int i) { this.i = i; } diff --git a/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaBiMap.java b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaBiMap.java new file mode 100644 index 000000000..3d9f9e50f --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaBiMap.java @@ -0,0 +1,155 @@ +// Generated by delombok at Tue Oct 01 19:52:42 GMT 2019 + +import com.google.common.collect.ImmutableBiMap; + +public class SingularGuavaBiMap { + private ImmutableBiMap rawTypes; + private ImmutableBiMap integers; + private ImmutableBiMap generics; + private ImmutableBiMap extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularGuavaBiMapBuilder, B2 extends SingularGuavaBiMapBuilder> { + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableBiMap.Builder rawTypes; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableBiMap.Builder integers; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableBiMap.Builder generics; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableBiMap.Builder extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B2 self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B2 rawType(final java.lang.Object key, final java.lang.Object value) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableBiMap.builder(); + this.rawTypes.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 rawTypes(final java.util.Map rawTypes) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableBiMap.builder(); + this.rawTypes.putAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearRawTypes() { + this.rawTypes = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integer(final Integer key, final Float value) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableBiMap.builder(); + this.integers.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integers(final java.util.Map integers) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableBiMap.builder(); + this.integers.putAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearIntegers() { + this.integers = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generic(final A key, final B value) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableBiMap.builder(); + this.generics.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generics(final java.util.Map generics) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableBiMap.builder(); + this.generics.putAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearGenerics() { + this.generics = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGeneric(final Number key, final String value) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableBiMap.builder(); + this.extendsGenerics.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGenerics(final java.util.Map extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableBiMap.builder(); + this.extendsGenerics.putAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearExtendsGenerics() { + this.extendsGenerics = null; + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularGuavaBiMap.SingularGuavaBiMapBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularGuavaBiMapBuilderImpl extends SingularGuavaBiMapBuilder, SingularGuavaBiMapBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularGuavaBiMapBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularGuavaBiMapBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularGuavaBiMap build() { + return new SingularGuavaBiMap(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularGuavaBiMap(final SingularGuavaBiMapBuilder b) { + com.google.common.collect.ImmutableBiMap rawTypes = b.rawTypes == null ? com.google.common.collect.ImmutableBiMap.of() : b.rawTypes.build(); + this.rawTypes = rawTypes; + com.google.common.collect.ImmutableBiMap integers = b.integers == null ? com.google.common.collect.ImmutableBiMap.of() : b.integers.build(); + this.integers = integers; + com.google.common.collect.ImmutableBiMap generics = b.generics == null ? com.google.common.collect.ImmutableBiMap.of() : b.generics.build(); + this.generics = generics; + com.google.common.collect.ImmutableBiMap extendsGenerics = b.extendsGenerics == null ? com.google.common.collect.ImmutableBiMap.of() : b.extendsGenerics.build(); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularGuavaBiMapBuilder builder() { + return new SingularGuavaBiMapBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaCollection.java b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaCollection.java new file mode 100644 index 000000000..f642f883b --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaCollection.java @@ -0,0 +1,155 @@ +// Generated by delombok at Tue Oct 01 19:52:43 GMT 2019 + +import com.google.common.collect.ImmutableCollection; + +public class SingularGuavaCollection { + private ImmutableCollection rawTypes; + private ImmutableCollection integers; + private ImmutableCollection generics; + private ImmutableCollection extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularGuavaCollectionBuilder, B extends SingularGuavaCollectionBuilder> { + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableList.Builder rawTypes; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableList.Builder integers; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableList.Builder generics; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableList.Builder extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B rawType(final java.lang.Object rawType) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableList.builder(); + this.rawTypes.add(rawType); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B rawTypes(final java.lang.Iterable rawTypes) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableList.builder(); + this.rawTypes.addAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearRawTypes() { + this.rawTypes = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integer(final Integer integer) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableList.builder(); + this.integers.add(integer); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integers(final java.lang.Iterable integers) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableList.builder(); + this.integers.addAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearIntegers() { + this.integers = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generic(final T generic) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableList.builder(); + this.generics.add(generic); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generics(final java.lang.Iterable generics) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableList.builder(); + this.generics.addAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearGenerics() { + this.generics = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGeneric(final Number extendsGeneric) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableList.builder(); + this.extendsGenerics.add(extendsGeneric); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGenerics(final java.lang.Iterable extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableList.builder(); + this.extendsGenerics.addAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearExtendsGenerics() { + this.extendsGenerics = null; + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularGuavaCollection.SingularGuavaCollectionBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularGuavaCollectionBuilderImpl extends SingularGuavaCollectionBuilder, SingularGuavaCollectionBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularGuavaCollectionBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularGuavaCollectionBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularGuavaCollection build() { + return new SingularGuavaCollection(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularGuavaCollection(final SingularGuavaCollectionBuilder b) { + com.google.common.collect.ImmutableCollection rawTypes = b.rawTypes == null ? com.google.common.collect.ImmutableList.of() : b.rawTypes.build(); + this.rawTypes = rawTypes; + com.google.common.collect.ImmutableCollection integers = b.integers == null ? com.google.common.collect.ImmutableList.of() : b.integers.build(); + this.integers = integers; + com.google.common.collect.ImmutableCollection generics = b.generics == null ? com.google.common.collect.ImmutableList.of() : b.generics.build(); + this.generics = generics; + com.google.common.collect.ImmutableCollection extendsGenerics = b.extendsGenerics == null ? com.google.common.collect.ImmutableList.of() : b.extendsGenerics.build(); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularGuavaCollectionBuilder builder() { + return new SingularGuavaCollectionBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaList.java b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaList.java new file mode 100644 index 000000000..fe7e64639 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaList.java @@ -0,0 +1,155 @@ +// Generated by delombok at Tue Oct 01 19:52:43 GMT 2019 + +import com.google.common.collect.ImmutableList; + +public class SingularGuavaList { + private ImmutableList rawTypes; + private ImmutableList integers; + private ImmutableList generics; + private ImmutableList extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularGuavaListBuilder, B extends SingularGuavaListBuilder> { + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableList.Builder rawTypes; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableList.Builder integers; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableList.Builder generics; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableList.Builder extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B rawType(final java.lang.Object rawType) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableList.builder(); + this.rawTypes.add(rawType); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B rawTypes(final java.lang.Iterable rawTypes) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableList.builder(); + this.rawTypes.addAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearRawTypes() { + this.rawTypes = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integer(final Integer integer) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableList.builder(); + this.integers.add(integer); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integers(final java.lang.Iterable integers) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableList.builder(); + this.integers.addAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearIntegers() { + this.integers = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generic(final T generic) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableList.builder(); + this.generics.add(generic); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generics(final java.lang.Iterable generics) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableList.builder(); + this.generics.addAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearGenerics() { + this.generics = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGeneric(final Number extendsGeneric) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableList.builder(); + this.extendsGenerics.add(extendsGeneric); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGenerics(final java.lang.Iterable extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableList.builder(); + this.extendsGenerics.addAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearExtendsGenerics() { + this.extendsGenerics = null; + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularGuavaList.SingularGuavaListBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularGuavaListBuilderImpl extends SingularGuavaListBuilder, SingularGuavaListBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularGuavaListBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularGuavaListBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularGuavaList build() { + return new SingularGuavaList(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularGuavaList(final SingularGuavaListBuilder b) { + com.google.common.collect.ImmutableList rawTypes = b.rawTypes == null ? com.google.common.collect.ImmutableList.of() : b.rawTypes.build(); + this.rawTypes = rawTypes; + com.google.common.collect.ImmutableList integers = b.integers == null ? com.google.common.collect.ImmutableList.of() : b.integers.build(); + this.integers = integers; + com.google.common.collect.ImmutableList generics = b.generics == null ? com.google.common.collect.ImmutableList.of() : b.generics.build(); + this.generics = generics; + com.google.common.collect.ImmutableList extendsGenerics = b.extendsGenerics == null ? com.google.common.collect.ImmutableList.of() : b.extendsGenerics.build(); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularGuavaListBuilder builder() { + return new SingularGuavaListBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaMap.java b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaMap.java new file mode 100644 index 000000000..c924d231a --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaMap.java @@ -0,0 +1,156 @@ +// Generated by delombok at Tue Oct 01 19:52:43 GMT 2019 + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + +public class SingularGuavaMap { + private ImmutableMap rawTypes; + private ImmutableMap integers; + private ImmutableMap generics; + private ImmutableMap extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularGuavaMapBuilder, B2 extends SingularGuavaMapBuilder> { + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableMap.Builder rawTypes; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableMap.Builder integers; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableMap.Builder generics; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableMap.Builder extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B2 self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B2 rawType(final java.lang.Object key, final java.lang.Object value) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableMap.builder(); + this.rawTypes.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 rawTypes(final java.util.Map rawTypes) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableMap.builder(); + this.rawTypes.putAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearRawTypes() { + this.rawTypes = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integer(final Integer key, final Float value) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableMap.builder(); + this.integers.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integers(final java.util.Map integers) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableMap.builder(); + this.integers.putAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearIntegers() { + this.integers = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generic(final A key, final B value) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableMap.builder(); + this.generics.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generics(final java.util.Map generics) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableMap.builder(); + this.generics.putAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearGenerics() { + this.generics = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGeneric(final Number key, final String value) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableMap.builder(); + this.extendsGenerics.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGenerics(final java.util.Map extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableMap.builder(); + this.extendsGenerics.putAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearExtendsGenerics() { + this.extendsGenerics = null; + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularGuavaMap.SingularGuavaMapBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularGuavaMapBuilderImpl extends SingularGuavaMapBuilder, SingularGuavaMapBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularGuavaMapBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularGuavaMapBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularGuavaMap build() { + return new SingularGuavaMap(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularGuavaMap(final SingularGuavaMapBuilder b) { + com.google.common.collect.ImmutableMap rawTypes = b.rawTypes == null ? com.google.common.collect.ImmutableMap.of() : b.rawTypes.build(); + this.rawTypes = rawTypes; + com.google.common.collect.ImmutableMap integers = b.integers == null ? com.google.common.collect.ImmutableMap.of() : b.integers.build(); + this.integers = integers; + com.google.common.collect.ImmutableMap generics = b.generics == null ? com.google.common.collect.ImmutableMap.of() : b.generics.build(); + this.generics = generics; + com.google.common.collect.ImmutableMap extendsGenerics = b.extendsGenerics == null ? com.google.common.collect.ImmutableMap.of() : b.extendsGenerics.build(); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularGuavaMapBuilder builder() { + return new SingularGuavaMapBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaSet.java b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaSet.java new file mode 100644 index 000000000..bcda3c596 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaSet.java @@ -0,0 +1,155 @@ +// Generated by delombok at Tue Oct 01 19:52:43 GMT 2019 + +import com.google.common.collect.ImmutableSet; + +public class SingularGuavaSet { + private ImmutableSet rawTypes; + private ImmutableSet integers; + private ImmutableSet generics; + private ImmutableSet extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularGuavaSetBuilder, B extends SingularGuavaSetBuilder> { + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSet.Builder rawTypes; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSet.Builder integers; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSet.Builder generics; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSet.Builder extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B rawType(final java.lang.Object rawType) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSet.builder(); + this.rawTypes.add(rawType); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B rawTypes(final java.lang.Iterable rawTypes) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSet.builder(); + this.rawTypes.addAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearRawTypes() { + this.rawTypes = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integer(final Integer integer) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableSet.builder(); + this.integers.add(integer); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integers(final java.lang.Iterable integers) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableSet.builder(); + this.integers.addAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearIntegers() { + this.integers = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generic(final T generic) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableSet.builder(); + this.generics.add(generic); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generics(final java.lang.Iterable generics) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableSet.builder(); + this.generics.addAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearGenerics() { + this.generics = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGeneric(final Number extendsGeneric) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSet.builder(); + this.extendsGenerics.add(extendsGeneric); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGenerics(final java.lang.Iterable extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSet.builder(); + this.extendsGenerics.addAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearExtendsGenerics() { + this.extendsGenerics = null; + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularGuavaSet.SingularGuavaSetBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularGuavaSetBuilderImpl extends SingularGuavaSetBuilder, SingularGuavaSetBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularGuavaSetBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularGuavaSetBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularGuavaSet build() { + return new SingularGuavaSet(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularGuavaSet(final SingularGuavaSetBuilder b) { + com.google.common.collect.ImmutableSet rawTypes = b.rawTypes == null ? com.google.common.collect.ImmutableSet.of() : b.rawTypes.build(); + this.rawTypes = rawTypes; + com.google.common.collect.ImmutableSet integers = b.integers == null ? com.google.common.collect.ImmutableSet.of() : b.integers.build(); + this.integers = integers; + com.google.common.collect.ImmutableSet generics = b.generics == null ? com.google.common.collect.ImmutableSet.of() : b.generics.build(); + this.generics = generics; + com.google.common.collect.ImmutableSet extendsGenerics = b.extendsGenerics == null ? com.google.common.collect.ImmutableSet.of() : b.extendsGenerics.build(); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularGuavaSetBuilder builder() { + return new SingularGuavaSetBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaSortedMap.java b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaSortedMap.java new file mode 100644 index 000000000..4b85bd470 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaSortedMap.java @@ -0,0 +1,155 @@ +// Generated by delombok at Tue Oct 01 19:52:43 GMT 2019 + +import com.google.common.collect.ImmutableSortedMap; + +public class SingularGuavaSortedMap { + private ImmutableSortedMap rawTypes; + private ImmutableSortedMap integers; + private ImmutableSortedMap generics; + private ImmutableSortedMap extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularGuavaSortedMapBuilder, B2 extends SingularGuavaSortedMapBuilder> { + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSortedMap.Builder rawTypes; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSortedMap.Builder integers; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSortedMap.Builder generics; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSortedMap.Builder extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B2 self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B2 rawType(final java.lang.Object key, final java.lang.Object value) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSortedMap.naturalOrder(); + this.rawTypes.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 rawTypes(final java.util.Map rawTypes) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSortedMap.naturalOrder(); + this.rawTypes.putAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearRawTypes() { + this.rawTypes = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integer(final Integer key, final Float value) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableSortedMap.naturalOrder(); + this.integers.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integers(final java.util.Map integers) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableSortedMap.naturalOrder(); + this.integers.putAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearIntegers() { + this.integers = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generic(final A key, final B value) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableSortedMap.naturalOrder(); + this.generics.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generics(final java.util.Map generics) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableSortedMap.naturalOrder(); + this.generics.putAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearGenerics() { + this.generics = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGeneric(final Number key, final String value) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSortedMap.naturalOrder(); + this.extendsGenerics.put(key, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGenerics(final java.util.Map extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSortedMap.naturalOrder(); + this.extendsGenerics.putAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearExtendsGenerics() { + this.extendsGenerics = null; + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularGuavaSortedMap.SingularGuavaSortedMapBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularGuavaSortedMapBuilderImpl extends SingularGuavaSortedMapBuilder, SingularGuavaSortedMapBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularGuavaSortedMapBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularGuavaSortedMapBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularGuavaSortedMap build() { + return new SingularGuavaSortedMap(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularGuavaSortedMap(final SingularGuavaSortedMapBuilder b) { + com.google.common.collect.ImmutableSortedMap rawTypes = b.rawTypes == null ? com.google.common.collect.ImmutableSortedMap.of() : b.rawTypes.build(); + this.rawTypes = rawTypes; + com.google.common.collect.ImmutableSortedMap integers = b.integers == null ? com.google.common.collect.ImmutableSortedMap.of() : b.integers.build(); + this.integers = integers; + com.google.common.collect.ImmutableSortedMap generics = b.generics == null ? com.google.common.collect.ImmutableSortedMap.of() : b.generics.build(); + this.generics = generics; + com.google.common.collect.ImmutableSortedMap extendsGenerics = b.extendsGenerics == null ? com.google.common.collect.ImmutableSortedMap.of() : b.extendsGenerics.build(); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularGuavaSortedMapBuilder builder() { + return new SingularGuavaSortedMapBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaSortedSet.java b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaSortedSet.java new file mode 100644 index 000000000..37bfb61c2 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaSortedSet.java @@ -0,0 +1,155 @@ +// Generated by delombok at Tue Oct 01 19:52:43 GMT 2019 + +import com.google.common.collect.ImmutableSortedSet; + +public class SingularGuavaSortedSet { + private ImmutableSortedSet rawTypes; + private ImmutableSortedSet integers; + private ImmutableSortedSet generics; + private ImmutableSortedSet extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularGuavaSortedSetBuilder, B extends SingularGuavaSortedSetBuilder> { + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSortedSet.Builder rawTypes; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSortedSet.Builder integers; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSortedSet.Builder generics; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableSortedSet.Builder extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B rawType(final java.lang.Object rawType) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); + this.rawTypes.add(rawType); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B rawTypes(final java.lang.Iterable rawTypes) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); + this.rawTypes.addAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearRawTypes() { + this.rawTypes = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integer(final Integer integer) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableSortedSet.naturalOrder(); + this.integers.add(integer); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integers(final java.lang.Iterable integers) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableSortedSet.naturalOrder(); + this.integers.addAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearIntegers() { + this.integers = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generic(final T generic) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableSortedSet.naturalOrder(); + this.generics.add(generic); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generics(final java.lang.Iterable generics) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableSortedSet.naturalOrder(); + this.generics.addAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearGenerics() { + this.generics = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGeneric(final Number extendsGeneric) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSortedSet.naturalOrder(); + this.extendsGenerics.add(extendsGeneric); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGenerics(final java.lang.Iterable extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableSortedSet.naturalOrder(); + this.extendsGenerics.addAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearExtendsGenerics() { + this.extendsGenerics = null; + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularGuavaSortedSet.SingularGuavaSortedSetBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularGuavaSortedSetBuilderImpl extends SingularGuavaSortedSetBuilder, SingularGuavaSortedSetBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularGuavaSortedSetBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularGuavaSortedSetBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularGuavaSortedSet build() { + return new SingularGuavaSortedSet(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularGuavaSortedSet(final SingularGuavaSortedSetBuilder b) { + com.google.common.collect.ImmutableSortedSet rawTypes = b.rawTypes == null ? com.google.common.collect.ImmutableSortedSet.of() : b.rawTypes.build(); + this.rawTypes = rawTypes; + com.google.common.collect.ImmutableSortedSet integers = b.integers == null ? com.google.common.collect.ImmutableSortedSet.of() : b.integers.build(); + this.integers = integers; + com.google.common.collect.ImmutableSortedSet generics = b.generics == null ? com.google.common.collect.ImmutableSortedSet.of() : b.generics.build(); + this.generics = generics; + com.google.common.collect.ImmutableSortedSet extendsGenerics = b.extendsGenerics == null ? com.google.common.collect.ImmutableSortedSet.of() : b.extendsGenerics.build(); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularGuavaSortedSetBuilder builder() { + return new SingularGuavaSortedSetBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaTable.java b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaTable.java new file mode 100644 index 000000000..1fb456ce9 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Guava/SingularGuavaTable.java @@ -0,0 +1,156 @@ +// Generated by delombok at Tue Oct 01 19:52:43 GMT 2019 + +import com.google.common.collect.ImmutableTable; +import java.util.Map; + +public class SingularGuavaTable { + private ImmutableTable rawTypes; + private ImmutableTable integers; + private ImmutableTable generics; + private ImmutableTable extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularGuavaTableBuilder, B2 extends SingularGuavaTableBuilder> { + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableTable.Builder rawTypes; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableTable.Builder integers; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableTable.Builder generics; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableTable.Builder extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B2 self(); + + @java.lang.SuppressWarnings("all") + public abstract C2 build(); + + @java.lang.SuppressWarnings("all") + public B2 rawType(final java.lang.Object rowKey, final java.lang.Object columnKey, final java.lang.Object value) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableTable.builder(); + this.rawTypes.put(rowKey, columnKey, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 rawTypes(final com.google.common.collect.Table rawTypes) { + if (this.rawTypes == null) this.rawTypes = com.google.common.collect.ImmutableTable.builder(); + this.rawTypes.putAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearRawTypes() { + this.rawTypes = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integer(final Integer rowKey, final Float columnKey, final String value) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableTable.builder(); + this.integers.put(rowKey, columnKey, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integers(final com.google.common.collect.Table integers) { + if (this.integers == null) this.integers = com.google.common.collect.ImmutableTable.builder(); + this.integers.putAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearIntegers() { + this.integers = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generic(final A rowKey, final B columnKey, final C value) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableTable.builder(); + this.generics.put(rowKey, columnKey, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generics(final com.google.common.collect.Table generics) { + if (this.generics == null) this.generics = com.google.common.collect.ImmutableTable.builder(); + this.generics.putAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearGenerics() { + this.generics = null; + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGeneric(final Number rowKey, final Float columnKey, final String value) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableTable.builder(); + this.extendsGenerics.put(rowKey, columnKey, value); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGenerics(final com.google.common.collect.Table extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = com.google.common.collect.ImmutableTable.builder(); + this.extendsGenerics.putAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearExtendsGenerics() { + this.extendsGenerics = null; + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularGuavaTable.SingularGuavaTableBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularGuavaTableBuilderImpl extends SingularGuavaTableBuilder, SingularGuavaTableBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularGuavaTableBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularGuavaTableBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularGuavaTable build() { + return new SingularGuavaTable(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularGuavaTable(final SingularGuavaTableBuilder b) { + com.google.common.collect.ImmutableTable rawTypes = b.rawTypes == null ? com.google.common.collect.ImmutableTable.of() : b.rawTypes.build(); + this.rawTypes = rawTypes; + com.google.common.collect.ImmutableTable integers = b.integers == null ? com.google.common.collect.ImmutableTable.of() : b.integers.build(); + this.integers = integers; + com.google.common.collect.ImmutableTable generics = b.generics == null ? com.google.common.collect.ImmutableTable.of() : b.generics.build(); + this.generics = generics; + com.google.common.collect.ImmutableTable extendsGenerics = b.extendsGenerics == null ? com.google.common.collect.ImmutableTable.of() : b.extendsGenerics.build(); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularGuavaTableBuilder builder() { + return new SingularGuavaTableBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularCollection.java b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularCollection.java new file mode 100644 index 000000000..872e2c7ab --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularCollection.java @@ -0,0 +1,196 @@ +// Generated by delombok at Tue Oct 01 19:53:35 GMT 2019 + +import java.util.ArrayList; +import java.util.Collection; + +public class SingularCollection { + private Collection rawTypes; + private Collection integers; + private Collection generics; + private Collection extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularCollectionBuilder, B extends SingularCollectionBuilder> { + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B rawType(final java.lang.Object rawType) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.add(rawType); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B rawTypes(final java.util.Collection rawTypes) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.addAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearRawTypes() { + if (this.rawTypes != null) this.rawTypes.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integer(final Integer integer) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.add(integer); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integers(final java.util.Collection integers) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.addAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearIntegers() { + if (this.integers != null) this.integers.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generic(final T generic) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.add(generic); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generics(final java.util.Collection generics) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.addAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearGenerics() { + if (this.generics != null) this.generics.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGeneric(final Number extendsGeneric) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.add(extendsGeneric); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGenerics(final java.util.Collection extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.addAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearExtendsGenerics() { + if (this.extendsGenerics != null) this.extendsGenerics.clear(); + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularCollection.SingularCollectionBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularCollectionBuilderImpl extends SingularCollectionBuilder, SingularCollectionBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularCollectionBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularCollectionBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularCollection build() { + return new SingularCollection(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularCollection(final SingularCollectionBuilder b) { + java.util.Collection rawTypes; + switch (b.rawTypes == null ? 0 : b.rawTypes.size()) { + case 0: + rawTypes = java.util.Collections.emptyList(); + break; + case 1: + rawTypes = java.util.Collections.singletonList(b.rawTypes.get(0)); + break; + default: + rawTypes = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.rawTypes)); + } + this.rawTypes = rawTypes; + java.util.Collection integers; + switch (b.integers == null ? 0 : b.integers.size()) { + case 0: + integers = java.util.Collections.emptyList(); + break; + case 1: + integers = java.util.Collections.singletonList(b.integers.get(0)); + break; + default: + integers = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.integers)); + } + this.integers = integers; + java.util.Collection generics; + switch (b.generics == null ? 0 : b.generics.size()) { + case 0: + generics = java.util.Collections.emptyList(); + break; + case 1: + generics = java.util.Collections.singletonList(b.generics.get(0)); + break; + default: + generics = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.generics)); + } + this.generics = generics; + java.util.Collection extendsGenerics; + switch (b.extendsGenerics == null ? 0 : b.extendsGenerics.size()) { + case 0: + extendsGenerics = java.util.Collections.emptyList(); + break; + case 1: + extendsGenerics = java.util.Collections.singletonList(b.extendsGenerics.get(0)); + break; + default: + extendsGenerics = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.extendsGenerics)); + } + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularCollectionBuilder builder() { + return new SingularCollectionBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularIterable.java b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularIterable.java new file mode 100644 index 000000000..913ac7e80 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularIterable.java @@ -0,0 +1,190 @@ +// Generated by delombok at Tue Oct 01 19:53:35 GMT 2019 + +public class SingularIterable { + private Iterable rawTypes; + private Iterable integers; + private Iterable generics; + private Iterable extendsGenerics; + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularIterableBuilder, B extends SingularIterableBuilder> { + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B rawType(final java.lang.Object rawType) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.add(rawType); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B rawTypes(final java.util.Collection rawTypes) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.addAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearRawTypes() { + if (this.rawTypes != null) this.rawTypes.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integer(final Integer integer) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.add(integer); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integers(final java.util.Collection integers) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.addAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearIntegers() { + if (this.integers != null) this.integers.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generic(final T generic) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.add(generic); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generics(final java.util.Collection generics) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.addAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearGenerics() { + if (this.generics != null) this.generics.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGeneric(final Number extendsGeneric) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.add(extendsGeneric); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGenerics(final java.util.Collection extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.addAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearExtendsGenerics() { + if (this.extendsGenerics != null) this.extendsGenerics.clear(); + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularIterable.SingularIterableBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularIterableBuilderImpl extends SingularIterableBuilder, SingularIterableBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularIterableBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularIterableBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularIterable build() { + return new SingularIterable(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularIterable(final SingularIterableBuilder b) { + java.lang.Iterable rawTypes; + switch (b.rawTypes == null ? 0 : b.rawTypes.size()) { + case 0: + rawTypes = java.util.Collections.emptyList(); + break; + case 1: + rawTypes = java.util.Collections.singletonList(b.rawTypes.get(0)); + break; + default: + rawTypes = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.rawTypes)); + } + this.rawTypes = rawTypes; + java.lang.Iterable integers; + switch (b.integers == null ? 0 : b.integers.size()) { + case 0: + integers = java.util.Collections.emptyList(); + break; + case 1: + integers = java.util.Collections.singletonList(b.integers.get(0)); + break; + default: + integers = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.integers)); + } + this.integers = integers; + java.lang.Iterable generics; + switch (b.generics == null ? 0 : b.generics.size()) { + case 0: + generics = java.util.Collections.emptyList(); + break; + case 1: + generics = java.util.Collections.singletonList(b.generics.get(0)); + break; + default: + generics = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.generics)); + } + this.generics = generics; + java.lang.Iterable extendsGenerics; + switch (b.extendsGenerics == null ? 0 : b.extendsGenerics.size()) { + case 0: + extendsGenerics = java.util.Collections.emptyList(); + break; + case 1: + extendsGenerics = java.util.Collections.singletonList(b.extendsGenerics.get(0)); + break; + default: + extendsGenerics = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.extendsGenerics)); + } + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularIterableBuilder builder() { + return new SingularIterableBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularList.java b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularList.java new file mode 100644 index 000000000..cf62d73e1 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularList.java @@ -0,0 +1,192 @@ +// Generated by delombok at Tue Oct 01 19:53:35 GMT 2019 + +import java.util.List; + +public class SingularList { + private List rawTypes; + private List integers; + private List generics; + private List extendsGenerics; + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularListBuilder, B extends SingularListBuilder> { + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B rawType(final java.lang.Object rawType) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.add(rawType); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B rawTypes(final java.util.Collection rawTypes) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.addAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearRawTypes() { + if (this.rawTypes != null) this.rawTypes.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integer(final Integer integer) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.add(integer); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integers(final java.util.Collection integers) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.addAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearIntegers() { + if (this.integers != null) this.integers.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generic(final T generic) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.add(generic); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generics(final java.util.Collection generics) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.addAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearGenerics() { + if (this.generics != null) this.generics.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGeneric(final Number extendsGeneric) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.add(extendsGeneric); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGenerics(final java.util.Collection extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.addAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearExtendsGenerics() { + if (this.extendsGenerics != null) this.extendsGenerics.clear(); + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularList.SingularListBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularListBuilderImpl extends SingularListBuilder, SingularListBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularListBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularListBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularList build() { + return new SingularList(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularList(final SingularListBuilder b) { + java.util.List rawTypes; + switch (b.rawTypes == null ? 0 : b.rawTypes.size()) { + case 0: + rawTypes = java.util.Collections.emptyList(); + break; + case 1: + rawTypes = java.util.Collections.singletonList(b.rawTypes.get(0)); + break; + default: + rawTypes = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.rawTypes)); + } + this.rawTypes = rawTypes; + java.util.List integers; + switch (b.integers == null ? 0 : b.integers.size()) { + case 0: + integers = java.util.Collections.emptyList(); + break; + case 1: + integers = java.util.Collections.singletonList(b.integers.get(0)); + break; + default: + integers = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.integers)); + } + this.integers = integers; + java.util.List generics; + switch (b.generics == null ? 0 : b.generics.size()) { + case 0: + generics = java.util.Collections.emptyList(); + break; + case 1: + generics = java.util.Collections.singletonList(b.generics.get(0)); + break; + default: + generics = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.generics)); + } + this.generics = generics; + java.util.List extendsGenerics; + switch (b.extendsGenerics == null ? 0 : b.extendsGenerics.size()) { + case 0: + extendsGenerics = java.util.Collections.emptyList(); + break; + case 1: + extendsGenerics = java.util.Collections.singletonList(b.extendsGenerics.get(0)); + break; + default: + extendsGenerics = java.util.Collections.unmodifiableList(new java.util.ArrayList(b.extendsGenerics)); + } + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularListBuilder builder() { + return new SingularListBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularNavigableSet.java b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularNavigableSet.java new file mode 100644 index 000000000..0a681b36a --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularNavigableSet.java @@ -0,0 +1,160 @@ +// Generated by delombok at Tue Oct 01 19:53:35 GMT 2019 + +import java.util.NavigableSet; + +public class SingularNavigableSet { + private NavigableSet rawTypes; + private NavigableSet integers; + private NavigableSet generics; + private NavigableSet extendsGenerics; + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularNavigableSetBuilder, B extends SingularNavigableSetBuilder> { + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B rawType(final java.lang.Object rawType) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.add(rawType); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B rawTypes(final java.util.Collection rawTypes) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.addAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearRawTypes() { + if (this.rawTypes != null) this.rawTypes.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integer(final Integer integer) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.add(integer); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integers(final java.util.Collection integers) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.addAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearIntegers() { + if (this.integers != null) this.integers.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generic(final T generic) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.add(generic); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generics(final java.util.Collection generics) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.addAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearGenerics() { + if (this.generics != null) this.generics.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGeneric(final Number extendsGeneric) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.add(extendsGeneric); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGenerics(final java.util.Collection extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.addAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearExtendsGenerics() { + if (this.extendsGenerics != null) this.extendsGenerics.clear(); + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularNavigableSet.SingularNavigableSetBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularNavigableSetBuilderImpl extends SingularNavigableSetBuilder, SingularNavigableSetBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularNavigableSetBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularNavigableSetBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularNavigableSet build() { + return new SingularNavigableSet(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularNavigableSet(final SingularNavigableSetBuilder b) { + java.util.NavigableSet rawTypes = new java.util.TreeSet(); + if (b.rawTypes != null) rawTypes.addAll(b.rawTypes); + rawTypes = java.util.Collections.unmodifiableNavigableSet(rawTypes); + this.rawTypes = rawTypes; + java.util.NavigableSet integers = new java.util.TreeSet(); + if (b.integers != null) integers.addAll(b.integers); + integers = java.util.Collections.unmodifiableNavigableSet(integers); + this.integers = integers; + java.util.NavigableSet generics = new java.util.TreeSet(); + if (b.generics != null) generics.addAll(b.generics); + generics = java.util.Collections.unmodifiableNavigableSet(generics); + this.generics = generics; + java.util.NavigableSet extendsGenerics = new java.util.TreeSet(); + if (b.extendsGenerics != null) extendsGenerics.addAll(b.extendsGenerics); + extendsGenerics = java.util.Collections.unmodifiableNavigableSet(extendsGenerics); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularNavigableSetBuilder builder() { + return new SingularNavigableSetBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularSet.java b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularSet.java new file mode 100644 index 000000000..958a9f3e6 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularSet.java @@ -0,0 +1,200 @@ +// Generated by delombok at Tue Oct 01 19:53:35 GMT 2019 + +import java.util.Set; + +public class SingularSet { + private Set rawTypes; + private Set integers; + private Set generics; + private Set extendsGenerics; + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularSetBuilder, B extends SingularSetBuilder> { + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B rawType(final java.lang.Object rawType) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.add(rawType); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B rawTypes(final java.util.Collection rawTypes) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.addAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearRawTypes() { + if (this.rawTypes != null) this.rawTypes.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integer(final Integer integer) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.add(integer); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integers(final java.util.Collection integers) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.addAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearIntegers() { + if (this.integers != null) this.integers.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generic(final T generic) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.add(generic); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generics(final java.util.Collection generics) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.addAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearGenerics() { + if (this.generics != null) this.generics.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGeneric(final Number extendsGeneric) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.add(extendsGeneric); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGenerics(final java.util.Collection extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.addAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearExtendsGenerics() { + if (this.extendsGenerics != null) this.extendsGenerics.clear(); + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularSet.SingularSetBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularSetBuilderImpl extends SingularSetBuilder, SingularSetBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularSetBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularSetBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularSet build() { + return new SingularSet(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularSet(final SingularSetBuilder b) { + java.util.Set rawTypes; + switch (b.rawTypes == null ? 0 : b.rawTypes.size()) { + case 0: + rawTypes = java.util.Collections.emptySet(); + break; + case 1: + rawTypes = java.util.Collections.singleton(b.rawTypes.get(0)); + break; + default: + rawTypes = new java.util.LinkedHashSet(b.rawTypes.size() < 1073741824 ? 1 + b.rawTypes.size() + (b.rawTypes.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); + rawTypes.addAll(b.rawTypes); + rawTypes = java.util.Collections.unmodifiableSet(rawTypes); + } + this.rawTypes = rawTypes; + java.util.Set integers; + switch (b.integers == null ? 0 : b.integers.size()) { + case 0: + integers = java.util.Collections.emptySet(); + break; + case 1: + integers = java.util.Collections.singleton(b.integers.get(0)); + break; + default: + integers = new java.util.LinkedHashSet(b.integers.size() < 1073741824 ? 1 + b.integers.size() + (b.integers.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); + integers.addAll(b.integers); + integers = java.util.Collections.unmodifiableSet(integers); + } + this.integers = integers; + java.util.Set generics; + switch (b.generics == null ? 0 : b.generics.size()) { + case 0: + generics = java.util.Collections.emptySet(); + break; + case 1: + generics = java.util.Collections.singleton(b.generics.get(0)); + break; + default: + generics = new java.util.LinkedHashSet(b.generics.size() < 1073741824 ? 1 + b.generics.size() + (b.generics.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); + generics.addAll(b.generics); + generics = java.util.Collections.unmodifiableSet(generics); + } + this.generics = generics; + java.util.Set extendsGenerics; + switch (b.extendsGenerics == null ? 0 : b.extendsGenerics.size()) { + case 0: + extendsGenerics = java.util.Collections.emptySet(); + break; + case 1: + extendsGenerics = java.util.Collections.singleton(b.extendsGenerics.get(0)); + break; + default: + extendsGenerics = new java.util.LinkedHashSet(b.extendsGenerics.size() < 1073741824 ? 1 + b.extendsGenerics.size() + (b.extendsGenerics.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); + extendsGenerics.addAll(b.extendsGenerics); + extendsGenerics = java.util.Collections.unmodifiableSet(extendsGenerics); + } + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularSetBuilder builder() { + return new SingularSetBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularSortedSet.java b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularSortedSet.java new file mode 100644 index 000000000..1acc51393 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Util/Collection/SingularSortedSet.java @@ -0,0 +1,160 @@ +// Generated by delombok at Tue Oct 01 19:53:35 GMT 2019 + +import java.util.SortedSet; + +public class SingularSortedSet { + private SortedSet rawTypes; + private SortedSet integers; + private SortedSet generics; + private SortedSet extendsGenerics; + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularSortedSetBuilder, B extends SingularSortedSetBuilder> { + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics; + + @java.lang.SuppressWarnings("all") + protected abstract B self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B rawType(final java.lang.Object rawType) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.add(rawType); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B rawTypes(final java.util.Collection rawTypes) { + if (this.rawTypes == null) this.rawTypes = new java.util.ArrayList(); + this.rawTypes.addAll(rawTypes); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearRawTypes() { + if (this.rawTypes != null) this.rawTypes.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integer(final Integer integer) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.add(integer); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B integers(final java.util.Collection integers) { + if (this.integers == null) this.integers = new java.util.ArrayList(); + this.integers.addAll(integers); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearIntegers() { + if (this.integers != null) this.integers.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generic(final T generic) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.add(generic); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B generics(final java.util.Collection generics) { + if (this.generics == null) this.generics = new java.util.ArrayList(); + this.generics.addAll(generics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearGenerics() { + if (this.generics != null) this.generics.clear(); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGeneric(final Number extendsGeneric) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.add(extendsGeneric); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B extendsGenerics(final java.util.Collection extendsGenerics) { + if (this.extendsGenerics == null) this.extendsGenerics = new java.util.ArrayList(); + this.extendsGenerics.addAll(extendsGenerics); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B clearExtendsGenerics() { + if (this.extendsGenerics != null) this.extendsGenerics.clear(); + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularSortedSet.SingularSortedSetBuilder(rawTypes=" + this.rawTypes + ", integers=" + this.integers + ", generics=" + this.generics + ", extendsGenerics=" + this.extendsGenerics + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularSortedSetBuilderImpl extends SingularSortedSetBuilder, SingularSortedSetBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularSortedSetBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularSortedSetBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularSortedSet build() { + return new SingularSortedSet(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularSortedSet(final SingularSortedSetBuilder b) { + java.util.SortedSet rawTypes = new java.util.TreeSet(); + if (b.rawTypes != null) rawTypes.addAll(b.rawTypes); + rawTypes = java.util.Collections.unmodifiableSortedSet(rawTypes); + this.rawTypes = rawTypes; + java.util.SortedSet integers = new java.util.TreeSet(); + if (b.integers != null) integers.addAll(b.integers); + integers = java.util.Collections.unmodifiableSortedSet(integers); + this.integers = integers; + java.util.SortedSet generics = new java.util.TreeSet(); + if (b.generics != null) generics.addAll(b.generics); + generics = java.util.Collections.unmodifiableSortedSet(generics); + this.generics = generics; + java.util.SortedSet extendsGenerics = new java.util.TreeSet(); + if (b.extendsGenerics != null) extendsGenerics.addAll(b.extendsGenerics); + extendsGenerics = java.util.Collections.unmodifiableSortedSet(extendsGenerics); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularSortedSetBuilder builder() { + return new SingularSortedSetBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Util/Map/SingularMap.java b/testData/after/superbuilder/Singular/Generic/Util/Map/SingularMap.java new file mode 100644 index 000000000..7a01ba1b0 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Util/Map/SingularMap.java @@ -0,0 +1,263 @@ +// Generated by delombok at Tue Oct 01 19:53:35 GMT 2019 + +import java.util.Map; + +public class SingularMap { + private Map rawTypes; + private Map integers; + private Map generics; + private Map extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularMapBuilder, B2 extends SingularMapBuilder> { + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes$value; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers$value; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics$value; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics$value; + + @java.lang.SuppressWarnings("all") + protected abstract B2 self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B2 rawType(final java.lang.Object rawTypeKey, final java.lang.Object rawTypeValue) { + if (this.rawTypes$key == null) { + this.rawTypes$key = new java.util.ArrayList(); + this.rawTypes$value = new java.util.ArrayList(); + } + this.rawTypes$key.add(rawTypeKey); + this.rawTypes$value.add(rawTypeValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 rawTypes(final java.util.Map rawTypes) { + if (this.rawTypes$key == null) { + this.rawTypes$key = new java.util.ArrayList(); + this.rawTypes$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : rawTypes.entrySet()) { + this.rawTypes$key.add($lombokEntry.getKey()); + this.rawTypes$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearRawTypes() { + if (this.rawTypes$key != null) { + this.rawTypes$key.clear(); + this.rawTypes$value.clear(); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integer(final Integer integerKey, final Float integerValue) { + if (this.integers$key == null) { + this.integers$key = new java.util.ArrayList(); + this.integers$value = new java.util.ArrayList(); + } + this.integers$key.add(integerKey); + this.integers$value.add(integerValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integers(final java.util.Map integers) { + if (this.integers$key == null) { + this.integers$key = new java.util.ArrayList(); + this.integers$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : integers.entrySet()) { + this.integers$key.add($lombokEntry.getKey()); + this.integers$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearIntegers() { + if (this.integers$key != null) { + this.integers$key.clear(); + this.integers$value.clear(); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generic(final A genericKey, final B genericValue) { + if (this.generics$key == null) { + this.generics$key = new java.util.ArrayList(); + this.generics$value = new java.util.ArrayList(); + } + this.generics$key.add(genericKey); + this.generics$value.add(genericValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generics(final java.util.Map generics) { + if (this.generics$key == null) { + this.generics$key = new java.util.ArrayList(); + this.generics$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : generics.entrySet()) { + this.generics$key.add($lombokEntry.getKey()); + this.generics$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearGenerics() { + if (this.generics$key != null) { + this.generics$key.clear(); + this.generics$value.clear(); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGeneric(final Number extendsGenericKey, final String extendsGenericValue) { + if (this.extendsGenerics$key == null) { + this.extendsGenerics$key = new java.util.ArrayList(); + this.extendsGenerics$value = new java.util.ArrayList(); + } + this.extendsGenerics$key.add(extendsGenericKey); + this.extendsGenerics$value.add(extendsGenericValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGenerics(final java.util.Map extendsGenerics) { + if (this.extendsGenerics$key == null) { + this.extendsGenerics$key = new java.util.ArrayList(); + this.extendsGenerics$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : extendsGenerics.entrySet()) { + this.extendsGenerics$key.add($lombokEntry.getKey()); + this.extendsGenerics$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearExtendsGenerics() { + if (this.extendsGenerics$key != null) { + this.extendsGenerics$key.clear(); + this.extendsGenerics$value.clear(); + } + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularMap.SingularMapBuilder(rawTypes$key=" + this.rawTypes$key + ", rawTypes$value=" + this.rawTypes$value + ", integers$key=" + this.integers$key + ", integers$value=" + this.integers$value + ", generics$key=" + this.generics$key + ", generics$value=" + this.generics$value + ", extendsGenerics$key=" + this.extendsGenerics$key + ", extendsGenerics$value=" + this.extendsGenerics$value + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularMapBuilderImpl extends SingularMapBuilder, SingularMapBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularMapBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularMapBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularMap build() { + return new SingularMap(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularMap(final SingularMapBuilder b) { + java.util.Map rawTypes; + switch (b.rawTypes$key == null ? 0 : b.rawTypes$key.size()) { + case 0: + rawTypes = java.util.Collections.emptyMap(); + break; + case 1: + rawTypes = java.util.Collections.singletonMap(b.rawTypes$key.get(0), b.rawTypes$value.get(0)); + break; + default: + rawTypes = new java.util.LinkedHashMap(b.rawTypes$key.size() < 1073741824 ? 1 + b.rawTypes$key.size() + (b.rawTypes$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); + for (int $i = 0; $i < b.rawTypes$key.size(); $i++) rawTypes.put(b.rawTypes$key.get($i), (java.lang.Object) b.rawTypes$value.get($i)); + rawTypes = java.util.Collections.unmodifiableMap(rawTypes); + } + this.rawTypes = rawTypes; + java.util.Map integers; + switch (b.integers$key == null ? 0 : b.integers$key.size()) { + case 0: + integers = java.util.Collections.emptyMap(); + break; + case 1: + integers = java.util.Collections.singletonMap(b.integers$key.get(0), b.integers$value.get(0)); + break; + default: + integers = new java.util.LinkedHashMap(b.integers$key.size() < 1073741824 ? 1 + b.integers$key.size() + (b.integers$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); + for (int $i = 0; $i < b.integers$key.size(); $i++) integers.put(b.integers$key.get($i), (Float) b.integers$value.get($i)); + integers = java.util.Collections.unmodifiableMap(integers); + } + this.integers = integers; + java.util.Map generics; + switch (b.generics$key == null ? 0 : b.generics$key.size()) { + case 0: + generics = java.util.Collections.emptyMap(); + break; + case 1: + generics = java.util.Collections.singletonMap(b.generics$key.get(0), b.generics$value.get(0)); + break; + default: + generics = new java.util.LinkedHashMap(b.generics$key.size() < 1073741824 ? 1 + b.generics$key.size() + (b.generics$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); + for (int $i = 0; $i < b.generics$key.size(); $i++) generics.put(b.generics$key.get($i), (B) b.generics$value.get($i)); + generics = java.util.Collections.unmodifiableMap(generics); + } + this.generics = generics; + java.util.Map extendsGenerics; + switch (b.extendsGenerics$key == null ? 0 : b.extendsGenerics$key.size()) { + case 0: + extendsGenerics = java.util.Collections.emptyMap(); + break; + case 1: + extendsGenerics = java.util.Collections.singletonMap(b.extendsGenerics$key.get(0), b.extendsGenerics$value.get(0)); + break; + default: + extendsGenerics = new java.util.LinkedHashMap(b.extendsGenerics$key.size() < 1073741824 ? 1 + b.extendsGenerics$key.size() + (b.extendsGenerics$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); + for (int $i = 0; $i < b.extendsGenerics$key.size(); $i++) extendsGenerics.put(b.extendsGenerics$key.get($i), (String) b.extendsGenerics$value.get($i)); + extendsGenerics = java.util.Collections.unmodifiableMap(extendsGenerics); + } + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularMapBuilder builder() { + return new SingularMapBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Util/Map/SingularNavigableMap.java b/testData/after/superbuilder/Singular/Generic/Util/Map/SingularNavigableMap.java new file mode 100644 index 000000000..842e619e9 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Util/Map/SingularNavigableMap.java @@ -0,0 +1,224 @@ +// Generated by delombok at Tue Oct 01 19:53:35 GMT 2019 + +import java.util.Map; +import java.util.NavigableMap; + +public class SingularNavigableMap { + private NavigableMap rawTypes; + private NavigableMap integers; + private NavigableMap generics; + private NavigableMap extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularNavigableMapBuilder, B2 extends SingularNavigableMapBuilder> { + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes$value; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers$value; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics$value; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics$value; + + @java.lang.SuppressWarnings("all") + protected abstract B2 self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B2 rawType(final java.lang.Object rawTypeKey, final java.lang.Object rawTypeValue) { + if (this.rawTypes$key == null) { + this.rawTypes$key = new java.util.ArrayList(); + this.rawTypes$value = new java.util.ArrayList(); + } + this.rawTypes$key.add(rawTypeKey); + this.rawTypes$value.add(rawTypeValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 rawTypes(final java.util.Map rawTypes) { + if (this.rawTypes$key == null) { + this.rawTypes$key = new java.util.ArrayList(); + this.rawTypes$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : rawTypes.entrySet()) { + this.rawTypes$key.add($lombokEntry.getKey()); + this.rawTypes$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearRawTypes() { + if (this.rawTypes$key != null) { + this.rawTypes$key.clear(); + this.rawTypes$value.clear(); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integer(final Integer integerKey, final Float integerValue) { + if (this.integers$key == null) { + this.integers$key = new java.util.ArrayList(); + this.integers$value = new java.util.ArrayList(); + } + this.integers$key.add(integerKey); + this.integers$value.add(integerValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integers(final java.util.Map integers) { + if (this.integers$key == null) { + this.integers$key = new java.util.ArrayList(); + this.integers$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : integers.entrySet()) { + this.integers$key.add($lombokEntry.getKey()); + this.integers$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearIntegers() { + if (this.integers$key != null) { + this.integers$key.clear(); + this.integers$value.clear(); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generic(final A genericKey, final B genericValue) { + if (this.generics$key == null) { + this.generics$key = new java.util.ArrayList(); + this.generics$value = new java.util.ArrayList(); + } + this.generics$key.add(genericKey); + this.generics$value.add(genericValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generics(final java.util.Map generics) { + if (this.generics$key == null) { + this.generics$key = new java.util.ArrayList(); + this.generics$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : generics.entrySet()) { + this.generics$key.add($lombokEntry.getKey()); + this.generics$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearGenerics() { + if (this.generics$key != null) { + this.generics$key.clear(); + this.generics$value.clear(); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGeneric(final Number extendsGenericKey, final String extendsGenericValue) { + if (this.extendsGenerics$key == null) { + this.extendsGenerics$key = new java.util.ArrayList(); + this.extendsGenerics$value = new java.util.ArrayList(); + } + this.extendsGenerics$key.add(extendsGenericKey); + this.extendsGenerics$value.add(extendsGenericValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGenerics(final java.util.Map extendsGenerics) { + if (this.extendsGenerics$key == null) { + this.extendsGenerics$key = new java.util.ArrayList(); + this.extendsGenerics$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : extendsGenerics.entrySet()) { + this.extendsGenerics$key.add($lombokEntry.getKey()); + this.extendsGenerics$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearExtendsGenerics() { + if (this.extendsGenerics$key != null) { + this.extendsGenerics$key.clear(); + this.extendsGenerics$value.clear(); + } + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularNavigableMap.SingularNavigableMapBuilder(rawTypes$key=" + this.rawTypes$key + ", rawTypes$value=" + this.rawTypes$value + ", integers$key=" + this.integers$key + ", integers$value=" + this.integers$value + ", generics$key=" + this.generics$key + ", generics$value=" + this.generics$value + ", extendsGenerics$key=" + this.extendsGenerics$key + ", extendsGenerics$value=" + this.extendsGenerics$value + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularNavigableMapBuilderImpl extends SingularNavigableMapBuilder, SingularNavigableMapBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularNavigableMapBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularNavigableMapBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularNavigableMap build() { + return new SingularNavigableMap(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularNavigableMap(final SingularNavigableMapBuilder b) { + java.util.NavigableMap rawTypes = new java.util.TreeMap(); + if (b.rawTypes$key != null) for (int $i = 0; $i < (b.rawTypes$key == null ? 0 : b.rawTypes$key.size()); $i++) rawTypes.put(b.rawTypes$key.get($i), (java.lang.Object) b.rawTypes$value.get($i)); + rawTypes = java.util.Collections.unmodifiableNavigableMap(rawTypes); + this.rawTypes = rawTypes; + java.util.NavigableMap integers = new java.util.TreeMap(); + if (b.integers$key != null) for (int $i = 0; $i < (b.integers$key == null ? 0 : b.integers$key.size()); $i++) integers.put(b.integers$key.get($i), (Float) b.integers$value.get($i)); + integers = java.util.Collections.unmodifiableNavigableMap(integers); + this.integers = integers; + java.util.NavigableMap generics = new java.util.TreeMap(); + if (b.generics$key != null) for (int $i = 0; $i < (b.generics$key == null ? 0 : b.generics$key.size()); $i++) generics.put(b.generics$key.get($i), (B) b.generics$value.get($i)); + generics = java.util.Collections.unmodifiableNavigableMap(generics); + this.generics = generics; + java.util.NavigableMap extendsGenerics = new java.util.TreeMap(); + if (b.extendsGenerics$key != null) for (int $i = 0; $i < (b.extendsGenerics$key == null ? 0 : b.extendsGenerics$key.size()); $i++) extendsGenerics.put(b.extendsGenerics$key.get($i), (String) b.extendsGenerics$value.get($i)); + extendsGenerics = java.util.Collections.unmodifiableNavigableMap(extendsGenerics); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularNavigableMapBuilder builder() { + return new SingularNavigableMapBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/Singular/Generic/Util/Map/SingularSortedMap.java b/testData/after/superbuilder/Singular/Generic/Util/Map/SingularSortedMap.java new file mode 100644 index 000000000..01c051010 --- /dev/null +++ b/testData/after/superbuilder/Singular/Generic/Util/Map/SingularSortedMap.java @@ -0,0 +1,224 @@ +// Generated by delombok at Tue Oct 01 19:53:35 GMT 2019 + +import java.util.Map; +import java.util.SortedMap; + +public class SingularSortedMap { + private SortedMap rawTypes; + private SortedMap integers; + private SortedMap generics; + private SortedMap extendsGenerics; + + public static void main(String[] args) { + } + + + @java.lang.SuppressWarnings("all") + public static abstract class SingularSortedMapBuilder, B2 extends SingularSortedMapBuilder> { + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList rawTypes$value; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList integers$value; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList generics$value; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics$key; + @java.lang.SuppressWarnings("all") + private java.util.ArrayList extendsGenerics$value; + + @java.lang.SuppressWarnings("all") + protected abstract B2 self(); + + @java.lang.SuppressWarnings("all") + public abstract C build(); + + @java.lang.SuppressWarnings("all") + public B2 rawType(final java.lang.Object rawTypeKey, final java.lang.Object rawTypeValue) { + if (this.rawTypes$key == null) { + this.rawTypes$key = new java.util.ArrayList(); + this.rawTypes$value = new java.util.ArrayList(); + } + this.rawTypes$key.add(rawTypeKey); + this.rawTypes$value.add(rawTypeValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 rawTypes(final java.util.Map rawTypes) { + if (this.rawTypes$key == null) { + this.rawTypes$key = new java.util.ArrayList(); + this.rawTypes$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : rawTypes.entrySet()) { + this.rawTypes$key.add($lombokEntry.getKey()); + this.rawTypes$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearRawTypes() { + if (this.rawTypes$key != null) { + this.rawTypes$key.clear(); + this.rawTypes$value.clear(); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integer(final Integer integerKey, final Float integerValue) { + if (this.integers$key == null) { + this.integers$key = new java.util.ArrayList(); + this.integers$value = new java.util.ArrayList(); + } + this.integers$key.add(integerKey); + this.integers$value.add(integerValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 integers(final java.util.Map integers) { + if (this.integers$key == null) { + this.integers$key = new java.util.ArrayList(); + this.integers$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : integers.entrySet()) { + this.integers$key.add($lombokEntry.getKey()); + this.integers$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearIntegers() { + if (this.integers$key != null) { + this.integers$key.clear(); + this.integers$value.clear(); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generic(final A genericKey, final B genericValue) { + if (this.generics$key == null) { + this.generics$key = new java.util.ArrayList(); + this.generics$value = new java.util.ArrayList(); + } + this.generics$key.add(genericKey); + this.generics$value.add(genericValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 generics(final java.util.Map generics) { + if (this.generics$key == null) { + this.generics$key = new java.util.ArrayList(); + this.generics$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : generics.entrySet()) { + this.generics$key.add($lombokEntry.getKey()); + this.generics$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearGenerics() { + if (this.generics$key != null) { + this.generics$key.clear(); + this.generics$value.clear(); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGeneric(final Number extendsGenericKey, final String extendsGenericValue) { + if (this.extendsGenerics$key == null) { + this.extendsGenerics$key = new java.util.ArrayList(); + this.extendsGenerics$value = new java.util.ArrayList(); + } + this.extendsGenerics$key.add(extendsGenericKey); + this.extendsGenerics$value.add(extendsGenericValue); + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 extendsGenerics(final java.util.Map extendsGenerics) { + if (this.extendsGenerics$key == null) { + this.extendsGenerics$key = new java.util.ArrayList(); + this.extendsGenerics$value = new java.util.ArrayList(); + } + for (final java.util.Map.Entry $lombokEntry : extendsGenerics.entrySet()) { + this.extendsGenerics$key.add($lombokEntry.getKey()); + this.extendsGenerics$value.add($lombokEntry.getValue()); + } + return self(); + } + + @java.lang.SuppressWarnings("all") + public B2 clearExtendsGenerics() { + if (this.extendsGenerics$key != null) { + this.extendsGenerics$key.clear(); + this.extendsGenerics$value.clear(); + } + return self(); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SingularSortedMap.SingularSortedMapBuilder(rawTypes$key=" + this.rawTypes$key + ", rawTypes$value=" + this.rawTypes$value + ", integers$key=" + this.integers$key + ", integers$value=" + this.integers$value + ", generics$key=" + this.generics$key + ", generics$value=" + this.generics$value + ", extendsGenerics$key=" + this.extendsGenerics$key + ", extendsGenerics$value=" + this.extendsGenerics$value + ")"; + } + } + + + @java.lang.SuppressWarnings("all") + private static final class SingularSortedMapBuilderImpl extends SingularSortedMapBuilder, SingularSortedMapBuilderImpl> { + @java.lang.SuppressWarnings("all") + private SingularSortedMapBuilderImpl() { + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + protected SingularSortedMapBuilderImpl self() { + return this; + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public SingularSortedMap build() { + return new SingularSortedMap(this); + } + } + + @java.lang.SuppressWarnings("all") + protected SingularSortedMap(final SingularSortedMapBuilder b) { + java.util.SortedMap rawTypes = new java.util.TreeMap(); + if (b.rawTypes$key != null) for (int $i = 0; $i < (b.rawTypes$key == null ? 0 : b.rawTypes$key.size()); $i++) rawTypes.put(b.rawTypes$key.get($i), (java.lang.Object) b.rawTypes$value.get($i)); + rawTypes = java.util.Collections.unmodifiableSortedMap(rawTypes); + this.rawTypes = rawTypes; + java.util.SortedMap integers = new java.util.TreeMap(); + if (b.integers$key != null) for (int $i = 0; $i < (b.integers$key == null ? 0 : b.integers$key.size()); $i++) integers.put(b.integers$key.get($i), (Float) b.integers$value.get($i)); + integers = java.util.Collections.unmodifiableSortedMap(integers); + this.integers = integers; + java.util.SortedMap generics = new java.util.TreeMap(); + if (b.generics$key != null) for (int $i = 0; $i < (b.generics$key == null ? 0 : b.generics$key.size()); $i++) generics.put(b.generics$key.get($i), (B) b.generics$value.get($i)); + generics = java.util.Collections.unmodifiableSortedMap(generics); + this.generics = generics; + java.util.SortedMap extendsGenerics = new java.util.TreeMap(); + if (b.extendsGenerics$key != null) for (int $i = 0; $i < (b.extendsGenerics$key == null ? 0 : b.extendsGenerics$key.size()); $i++) extendsGenerics.put(b.extendsGenerics$key.get($i), (String) b.extendsGenerics$value.get($i)); + extendsGenerics = java.util.Collections.unmodifiableSortedMap(extendsGenerics); + this.extendsGenerics = extendsGenerics; + } + + @java.lang.SuppressWarnings("all") + public static SingularSortedMapBuilder builder() { + return new SingularSortedMapBuilderImpl(); + } +} diff --git a/testData/after/superbuilder/SuperBuilderAbstract.java b/testData/after/superbuilder/SuperBuilderAbstract.java index dd4abacbc..0a130efe1 100644 --- a/testData/after/superbuilder/SuperBuilderAbstract.java +++ b/testData/after/superbuilder/SuperBuilderAbstract.java @@ -1,128 +1,167 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + public class SuperBuilderAbstract { + public static class Parent { int parentField; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private int parentField; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B parentField(final int parentField) { this.parentField = parentField; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderAbstract.Parent.ParentBuilder(parentField=" + this.parentField + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { this.parentField = b.parentField; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } } + + public static abstract class Child extends Parent { double childField; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private double childField; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B childField(final double childField) { this.childField = childField; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderAbstract.Child.ChildBuilder(super=" + super.toString() + ", childField=" + this.childField + ")"; } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); this.childField = b.childField; } } + + public static class GrandChild extends Child { String grandChildField; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class GrandChildBuilder> extends Child.ChildBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private String grandChildField; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B grandChildField(final String grandChildField) { this.grandChildField = grandChildField; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderAbstract.GrandChild.GrandChildBuilder(super=" + super.toString() + ", grandChildField=" + this.grandChildField + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class GrandChildBuilderImpl extends GrandChildBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private GrandChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected GrandChildBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public GrandChild build() { return new GrandChild(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected GrandChild(final GrandChildBuilder b) { super(b); this.grandChildField = b.grandChildField; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static GrandChildBuilder builder() { return new GrandChildBuilderImpl(); } } + public static void test() { GrandChild x = GrandChild.builder().grandChildField("").parentField(5).childField(2.5).build(); } diff --git a/testData/after/superbuilder/SuperBuilderAbstractToBuilder.java b/testData/after/superbuilder/SuperBuilderAbstractToBuilder.java index 8e7bf2a9a..35ff81f49 100644 --- a/testData/after/superbuilder/SuperBuilderAbstractToBuilder.java +++ b/testData/after/superbuilder/SuperBuilderAbstractToBuilder.java @@ -1,167 +1,214 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + public class SuperBuilderAbstractToBuilder { + public static class Parent { int parentField; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private int parentField; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected B $fillValuesFrom(final C instance) { ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder b) { b.parentField(instance.parentField); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B parentField(final int parentField) { this.parentField = parentField; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderAbstractToBuilder.Parent.ParentBuilder(parentField=" + this.parentField + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { this.parentField = b.parentField; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public ParentBuilder toBuilder() { return new ParentBuilderImpl().$fillValuesFrom(this); } } + + public static abstract class Child extends Parent { double childField; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private double childField; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder b) { b.childField(instance.childField); } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B childField(final double childField) { this.childField = childField; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderAbstractToBuilder.Child.ChildBuilder(super=" + super.toString() + ", childField=" + this.childField + ")"; } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); this.childField = b.childField; } } + + public static class GrandChild extends Child { String grandChildField; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class GrandChildBuilder> extends Child.ChildBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private String grandChildField; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static void $fillValuesFromInstanceIntoBuilder(final GrandChild instance, final GrandChildBuilder b) { b.grandChildField(instance.grandChildField); } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B grandChildField(final String grandChildField) { this.grandChildField = grandChildField; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder(super=" + super.toString() + ", grandChildField=" + this.grandChildField + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class GrandChildBuilderImpl extends GrandChildBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private GrandChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected GrandChildBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public GrandChild build() { return new GrandChild(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected GrandChild(final GrandChildBuilder b) { super(b); this.grandChildField = b.grandChildField; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static GrandChildBuilder builder() { return new GrandChildBuilderImpl(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public GrandChildBuilder toBuilder() { return new GrandChildBuilderImpl().$fillValuesFrom(this); } } + public static void test() { GrandChild x = GrandChild.builder().grandChildField("").parentField(5).childField(2.5).build().toBuilder().build(); } diff --git a/testData/after/superbuilder/SuperBuilderBasic.java b/testData/after/superbuilder/SuperBuilderBasic.java index 1a159167e..9c8b31191 100644 --- a/testData/after/superbuilder/SuperBuilderBasic.java +++ b/testData/after/superbuilder/SuperBuilderBasic.java @@ -1,133 +1,166 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + import java.util.List; public class SuperBuilderBasic { + public static class Parent { int field1; List items; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private int field1; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private java.util.ArrayList items; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field1(final int field1) { this.field1 = field1; return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B clearItems() { if (this.items != null) this.items.clear(); return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderBasic.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { 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; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } } + + public static class Child extends Parent { double field3; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private double field3; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field3(final double field3) { this.field3 = field3; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderBasic.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ChildBuilderImpl extends ChildBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ChildBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Child build() { return new Child(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); this.field3 = b.field3; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ChildBuilder builder() { return new ChildBuilderImpl(); } } + public static void test() { Child x = Child.builder().field3(0.0).field1(5).item("").build(); } diff --git a/testData/after/superbuilder/SuperBuilderBasicToBuilder.java b/testData/after/superbuilder/SuperBuilderBasicToBuilder.java index 17b19889f..6cf1239dc 100644 --- a/testData/after/superbuilder/SuperBuilderBasicToBuilder.java +++ b/testData/after/superbuilder/SuperBuilderBasicToBuilder.java @@ -1,36 +1,45 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + import java.util.List; public class SuperBuilderBasicToBuilder { + public static class Parent { private int field1; int obtainViaField; int obtainViaMethod; String obtainViaStaticMethod; List items; + private int method() { return 2; } + private static String staticMethod(Parent instance) { return "staticMethod"; } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private int field1; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private int obtainViaField; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private int obtainViaMethod; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private String obtainViaStaticMethod; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private java.util.ArrayList items; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected B $fillValuesFrom(final C instance) { ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder b) { b.field1(instance.field1); b.obtainViaField(instance.field1); @@ -38,70 +47,85 @@ public static abstract class ParentBuilder(); this.items.add(item); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B clearItems() { if (this.items != null) this.items.clear(); return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderBasicToBuilder.Parent.ParentBuilder(field1=" + this.field1 + ", obtainViaField=" + this.obtainViaField + ", obtainViaMethod=" + this.obtainViaMethod + ", obtainViaStaticMethod=" + this.obtainViaStaticMethod + ", items=" + this.items + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { this.field1 = b.field1; this.obtainViaField = b.obtainViaField; @@ -109,90 +133,110 @@ protected Parent(final ParentBuilder b) { this.obtainViaStaticMethod = b.obtainViaStaticMethod; 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; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public ParentBuilder toBuilder() { return new ParentBuilderImpl().$fillValuesFrom(this); } } + + public static class Child extends Parent { private double field3; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private double field3; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder b) { b.field3(instance.field3); } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field3(final double field3) { this.field3 = field3; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderBasicToBuilder.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ChildBuilderImpl extends ChildBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ChildBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Child build() { return new Child(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); this.field3 = b.field3; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ChildBuilder builder() { return new ChildBuilderImpl(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public ChildBuilder toBuilder() { return new ChildBuilderImpl().$fillValuesFrom(this); } } + public static void test() { Child x = Child.builder().field3(0.0).field1(5).item("").build().toBuilder().build(); } diff --git a/testData/after/superbuilder/SuperBuilderCustomized.java b/testData/after/superbuilder/SuperBuilderCustomized.java index c843b73e1..5133f836c 100644 --- a/testData/after/superbuilder/SuperBuilderCustomized.java +++ b/testData/after/superbuilder/SuperBuilderCustomized.java @@ -1,100 +1,131 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + public class SuperBuilderCustomized { + public static class Parent { + public static abstract class ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private int field1; + public B resetToDefault() { field1 = 0; return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field1(final int field1) { this.field1 = field1; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderCustomized.Parent.ParentBuilder(field1=" + this.field1 + ")"; } } + int field1; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { this.field1 = b.field1; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } } + + public static class Child extends Parent { + private static final class ChildBuilderImpl extends ChildBuilder { @Override public Child build() { this.resetToDefault(); return new Child(this); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ChildBuilderImpl self() { return this; } } + double field2; + public static ChildBuilder builder() { return new ChildBuilderImpl().field2(10.0); } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private double field2; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field2(final double field2) { this.field2 = field2; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderCustomized.Child.ChildBuilder(super=" + super.toString() + ", field2=" + this.field2 + ")"; } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); this.field2 = b.field2; } } + public static void test() { Child x = Child.builder().field2(1.0).field1(5).resetToDefault().build(); } diff --git a/testData/after/superbuilder/SuperBuilderSingularAnnotatedTypes.java b/testData/after/superbuilder/SuperBuilderSingularAnnotatedTypes.java index a537d82f2..876bad96c 100644 --- a/testData/after/superbuilder/SuperBuilderSingularAnnotatedTypes.java +++ b/testData/after/superbuilder/SuperBuilderSingularAnnotatedTypes.java @@ -1,5 +1,7 @@ -import lombok.NonNull; +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 +//VERSION 8: +import lombok.NonNull; import java.lang.annotation.ElementType; import java.lang.annotation.Target; import java.util.Map; @@ -12,45 +14,53 @@ class SuperBuilderSingularAnnotatedTypes { private Set<@MyAnnotation @NonNull String> foos; private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class SuperBuilderSingularAnnotatedTypesBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private java.util.ArrayList<@MyAnnotation @NonNull String> foos; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private java.util.ArrayList<@MyAnnotation @NonNull String> bars$key; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B foo(@MyAnnotation @NonNull final String foo) { if (foo == null) { - throw new NullPointerException("foo is marked @NonNull but is null"); + throw new java.lang.NullPointerException("foo is marked non-null but is null"); } if (this.foos == null) this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>(); this.foos.add(foo); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B foos(final java.util.Collection foos) { if (this.foos == null) this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>(); this.foos.addAll(foos); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B clearFoos() { if (this.foos != null) this.foos.clear(); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B bar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) { if (barKey == null) { - throw new NullPointerException("barKey is marked @NonNull but is null"); + throw new java.lang.NullPointerException("barKey is marked non-null but is null"); } if (barValue == null) { - throw new NullPointerException("barValue is marked @NonNull but is null"); + throw new java.lang.NullPointerException("barValue is marked non-null but is null"); } if (this.bars$key == null) { this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>(); @@ -60,19 +70,21 @@ public B bar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull this.bars$value.add(barValue); return self(); } - @SuppressWarnings("all") - public B bars(final Map bars) { + + @java.lang.SuppressWarnings("all") + public B bars(final java.util.Map bars) { if (this.bars$key == null) { this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>(); this.bars$value = new java.util.ArrayList<@MyAnnotation @NonNull Integer>(); } - for (final Map.Entry $lombokEntry : bars.entrySet()) { + for (final java.util.Map.Entry $lombokEntry : bars.entrySet()) { this.bars$key.add($lombokEntry.getKey()); this.bars$value.add($lombokEntry.getValue()); } return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B clearBars() { if (this.bars$key != null) { this.bars$key.clear(); @@ -80,31 +92,37 @@ public B clearBars() { } return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder(foos=" + this.foos + ", bars$key=" + this.bars$key + ", bars$value=" + this.bars$value + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class SuperBuilderSingularAnnotatedTypesBuilderImpl extends SuperBuilderSingularAnnotatedTypesBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private SuperBuilderSingularAnnotatedTypesBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected SuperBuilderSingularAnnotatedTypesBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public SuperBuilderSingularAnnotatedTypes build() { return new SuperBuilderSingularAnnotatedTypes(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypesBuilder b) { - Set<@MyAnnotation @NonNull String> foos; + java.util.Set<@MyAnnotation @NonNull String> foos; switch (b.foos == null ? 0 : b.foos.size()) { case 0: foos = java.util.Collections.emptySet(); @@ -113,12 +131,12 @@ protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotated foos = java.util.Collections.singleton(b.foos.get(0)); break; default: - foos = new java.util.LinkedHashSet<@MyAnnotation @NonNull String>(b.foos.size() < 1073741824 ? 1 + b.foos.size() + (b.foos.size() - 3) / 3 : Integer.MAX_VALUE); + foos = new java.util.LinkedHashSet<@MyAnnotation @NonNull String>(b.foos.size() < 1073741824 ? 1 + b.foos.size() + (b.foos.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); foos.addAll(b.foos); foos = java.util.Collections.unmodifiableSet(foos); } this.foos = foos; - Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; + java.util.Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; switch (b.bars$key == null ? 0 : b.bars$key.size()) { case 0: bars = java.util.Collections.emptyMap(); @@ -127,13 +145,14 @@ protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotated bars = java.util.Collections.singletonMap(b.bars$key.get(0), b.bars$value.get(0)); break; default: - bars = new java.util.LinkedHashMap<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer>(b.bars$key.size() < 1073741824 ? 1 + b.bars$key.size() + (b.bars$key.size() - 3) / 3 : Integer.MAX_VALUE); + bars = new java.util.LinkedHashMap<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer>(b.bars$key.size() < 1073741824 ? 1 + b.bars$key.size() + (b.bars$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE); for (int $i = 0; $i < b.bars$key.size(); $i++) bars.put(b.bars$key.get($i), (@MyAnnotation @NonNull Integer) b.bars$value.get($i)); bars = java.util.Collections.unmodifiableMap(bars); } this.bars = bars; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static SuperBuilderSingularAnnotatedTypesBuilder builder() { return new SuperBuilderSingularAnnotatedTypesBuilderImpl(); } diff --git a/testData/after/superbuilder/SuperBuilderWithCustomBuilderMethod.java b/testData/after/superbuilder/SuperBuilderWithCustomBuilderMethod.java index d960b8ad4..2d117a906 100644 --- a/testData/after/superbuilder/SuperBuilderWithCustomBuilderMethod.java +++ b/testData/after/superbuilder/SuperBuilderWithCustomBuilderMethod.java @@ -1,132 +1,165 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + import java.util.List; public class SuperBuilderWithCustomBuilderMethod { + public static class Parent { A field1; List items; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder, B extends ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private A field1; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private java.util.ArrayList items; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field1(final A field1) { this.field1 = field1; return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B clearItems() { if (this.items != null) this.items.clear(); return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder, ParentBuilderImpl> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { 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; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } } + + public static class Child extends Parent { double field3; + public static ChildBuilder builder() { return new ChildBuilderImpl().item("default item"); } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder, B extends ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private double field3; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field3(final double field3) { this.field3 = field3; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ChildBuilderImpl extends ChildBuilder, ChildBuilderImpl> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ChildBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Child build() { return new Child(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); this.field3 = b.field3; } } + public static void test() { Child x = Child.builder().field3(0.0).field1(5).item("").build(); } diff --git a/testData/after/superbuilder/SuperBuilderWithDefaults.java b/testData/after/superbuilder/SuperBuilderWithDefaults.java index 91fb40f2d..cc4a9ecfb 100644 --- a/testData/after/superbuilder/SuperBuilderWithDefaults.java +++ b/testData/after/superbuilder/SuperBuilderWithDefaults.java @@ -1,132 +1,166 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + public class SuperBuilderWithDefaults { + public static class Parent { private long millis; private N numberField; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static long $default$millis() { return System.currentTimeMillis(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static N $default$numberField() { return null; } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder, B extends ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private boolean millis$set; - @SuppressWarnings("all") - private long millis; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") + private long millis$value; + @java.lang.SuppressWarnings("all") private boolean numberField$set; - @SuppressWarnings("all") - private N numberField; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") + private N numberField$value; + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B millis(final long millis) { - this.millis = millis; + this.millis$value = millis; millis$set = true; return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B numberField(final N numberField) { - this.numberField = numberField; + this.numberField$value = numberField; numberField$set = true; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { - return "SuperBuilderWithDefaults.Parent.ParentBuilder(millis=" + this.millis + ", numberField=" + this.numberField + ")"; + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderWithDefaults.Parent.ParentBuilder(millis$value=" + this.millis$value + ", numberField$value=" + this.numberField$value + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder, ParentBuilderImpl> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { - if (b.millis$set) this.millis = b.millis; + if (b.millis$set) this.millis = b.millis$value; else this.millis = Parent.$default$millis(); - if (b.numberField$set) this.numberField = b.numberField; + if (b.numberField$set) this.numberField = b.numberField$value; else this.numberField = Parent.$default$numberField(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } } + + public static class Child extends Parent { private double doubleField; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static double $default$doubleField() { return Math.PI; } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private boolean doubleField$set; - @SuppressWarnings("all") - private double doubleField; - @Override - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") + private double doubleField$value; + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B doubleField(final double doubleField) { - this.doubleField = doubleField; + this.doubleField$value = doubleField; doubleField$set = true; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { - return "SuperBuilderWithDefaults.Child.ChildBuilder(super=" + super.toString() + ", doubleField=" + this.doubleField + ")"; + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderWithDefaults.Child.ChildBuilder(super=" + super.toString() + ", doubleField$value=" + this.doubleField$value + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ChildBuilderImpl extends ChildBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ChildBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Child build() { return new Child(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); - if (b.doubleField$set) this.doubleField = b.doubleField; + if (b.doubleField$set) this.doubleField = b.doubleField$value; else this.doubleField = Child.$default$doubleField(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ChildBuilder builder() { return new ChildBuilderImpl(); } } + public static void test() { Child x = Child.builder().doubleField(0.1).numberField(5).millis(1234567890L).build(); } diff --git a/testData/after/superbuilder/SuperBuilderWithGenerics.java b/testData/after/superbuilder/SuperBuilderWithGenerics.java index 92615c473..383dc720c 100644 --- a/testData/after/superbuilder/SuperBuilderWithGenerics.java +++ b/testData/after/superbuilder/SuperBuilderWithGenerics.java @@ -1,133 +1,166 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + import java.util.List; public class SuperBuilderWithGenerics { + public static class Parent { A field1; List items; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder, B extends ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private A field1; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private java.util.ArrayList items; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field1(final A field1) { this.field1 = field1; return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B clearItems() { if (this.items != null) this.items.clear(); return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderWithGenerics.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder, ParentBuilderImpl> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { 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; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } } + + public static class Child extends Parent { double field3; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder, B extends ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private double field3; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field3(final double field3) { this.field3 = field3; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderWithGenerics.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ChildBuilderImpl extends ChildBuilder, ChildBuilderImpl> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ChildBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Child build() { return new Child(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); this.field3 = b.field3; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ChildBuilder builder() { return new ChildBuilderImpl(); } } + public static void test() { Child x = Child.builder().field3(0.0).field1(5).item("").build(); } diff --git a/testData/after/superbuilder/SuperBuilderWithGenerics2.java b/testData/after/superbuilder/SuperBuilderWithGenerics2.java index d4d34f437..85898dae1 100644 --- a/testData/after/superbuilder/SuperBuilderWithGenerics2.java +++ b/testData/after/superbuilder/SuperBuilderWithGenerics2.java @@ -1,133 +1,166 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + import java.util.List; public class SuperBuilderWithGenerics2 { + public static class Parent { A field1; List items; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder, B extends ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private A field1; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private java.util.ArrayList items; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field1(final A field1) { this.field1 = field1; return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B clearItems() { if (this.items != null) this.items.clear(); return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderWithGenerics2.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder, ParentBuilderImpl> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { this.field1 = b.field1; - java.util.List items; + 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; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } } + + public static class Child extends Parent { A field3; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder, B extends ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private A field3; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field3(final A field3) { this.field3 = field3; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderWithGenerics2.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ChildBuilderImpl extends ChildBuilder, ChildBuilderImpl> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ChildBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Child build() { return new Child(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); this.field3 = b.field3; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ChildBuilder builder2() { return new ChildBuilderImpl(); } } + public static void test() { Child x = Child.builder2().field3(1).field1("value").item("").build(); } diff --git a/testData/after/superbuilder/SuperBuilderWithGenericsAndToBuilder.java b/testData/after/superbuilder/SuperBuilderWithGenericsAndToBuilder.java index af29cdfe0..1e8b06be9 100644 --- a/testData/after/superbuilder/SuperBuilderWithGenericsAndToBuilder.java +++ b/testData/after/superbuilder/SuperBuilderWithGenericsAndToBuilder.java @@ -1,162 +1,201 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + import java.util.List; public class SuperBuilderWithGenericsAndToBuilder { + public static class Parent { A field1; List items; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder, B extends ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private A field1; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private java.util.ArrayList items; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected B $fillValuesFrom(final C instance) { ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder b) { b.field1(instance.field1); b.items(instance.items == null ? java.util.Collections.emptyList() : instance.items); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field1(final A field1) { this.field1 = field1; return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B clearItems() { if (this.items != null) this.items.clear(); return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder, ParentBuilderImpl> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { this.field1 = b.field1; - java.util.List items; + 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; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public ParentBuilder toBuilder() { return new ParentBuilderImpl().$fillValuesFrom(this); } } + + public static class Child extends Parent { double field3; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder, B extends ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private double field3; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this); return self(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder b) { b.field3(instance.field3); } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B field3(final double field3) { this.field3 = field3; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ChildBuilderImpl extends ChildBuilder, ChildBuilderImpl> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ChildBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Child build() { return new Child(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); this.field3 = b.field3; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ChildBuilder builder() { return new ChildBuilderImpl(); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public ChildBuilder toBuilder() { return new ChildBuilderImpl().$fillValuesFrom(this); } } + public static void test() { Child x = Child.builder().field3(0.0).field1(5).item("").build().toBuilder().build(); } diff --git a/testData/after/superbuilder/SuperBuilderWithNonNull.java b/testData/after/superbuilder/SuperBuilderWithNonNull.java index 92d99e68b..28e53db52 100644 --- a/testData/after/superbuilder/SuperBuilderWithNonNull.java +++ b/testData/after/superbuilder/SuperBuilderWithNonNull.java @@ -1,121 +1,152 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + public class SuperBuilderWithNonNull { + public static class Parent { @lombok.NonNull final String nonNullParentField; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private static String $default$nonNullParentField() { return "default"; } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder> { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private boolean nonNullParentField$set; - @SuppressWarnings("all") - private String nonNullParentField; - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") + private String nonNullParentField$value; + + @java.lang.SuppressWarnings("all") protected abstract B self(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B nonNullParentField(@lombok.NonNull final String nonNullParentField) { if (nonNullParentField == null) { - throw new NullPointerException("nonNullParentField is marked @NonNull but is null"); + throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); } - this.nonNullParentField = nonNullParentField; + this.nonNullParentField$value = nonNullParentField; nonNullParentField$set = true; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { - return "SuperBuilderWithNonNull.Parent.ParentBuilder(nonNullParentField=" + this.nonNullParentField + ")"; + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "SuperBuilderWithNonNull.Parent.ParentBuilder(nonNullParentField$value=" + this.nonNullParentField$value + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ParentBuilderImpl extends ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ParentBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Parent build() { return new Parent(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { - if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField; + if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField$value; else this.nonNullParentField = Parent.$default$nonNullParentField(); if (nonNullParentField == null) { - throw new NullPointerException("nonNullParentField is marked @NonNull but is null"); + throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { return new ParentBuilderImpl(); } } + + public static class Child extends Parent { @lombok.NonNull String nonNullChildField; - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder> extends Parent.ParentBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private String nonNullChildField; - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected abstract B self(); - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public abstract C build(); - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public B nonNullChildField(@lombok.NonNull final String nonNullChildField) { if (nonNullChildField == null) { - throw new NullPointerException("nonNullChildField is marked @NonNull but is null"); + throw new java.lang.NullPointerException("nonNullChildField is marked non-null but is null"); } this.nonNullChildField = nonNullChildField; return self(); } - @Override - @SuppressWarnings("all") - public String toString() { + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { return "SuperBuilderWithNonNull.Child.ChildBuilder(super=" + super.toString() + ", nonNullChildField=" + this.nonNullChildField + ")"; } } - @SuppressWarnings("all") + + + @java.lang.SuppressWarnings("all") private static final class ChildBuilderImpl extends ChildBuilder { - @SuppressWarnings("all") + @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") protected ChildBuilderImpl self() { return this; } - @Override - @SuppressWarnings("all") + + @java.lang.Override + @java.lang.SuppressWarnings("all") public Child build() { return new Child(this); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); this.nonNullChildField = b.nonNullChildField; if (nonNullChildField == null) { - throw new NullPointerException("nonNullChildField is marked @NonNull but is null"); + throw new java.lang.NullPointerException("nonNullChildField is marked non-null but is null"); } } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public static ChildBuilder builder() { return new ChildBuilderImpl(); } } + public static void test() { Child x = Child.builder().nonNullChildField("child").nonNullParentField("parent").build(); } diff --git a/testData/after/tostring/ToStringExplicitEmptyOf.java b/testData/after/tostring/ToStringExplicitEmptyOf.java index c7516b7d4..a48d05302 100644 --- a/testData/after/tostring/ToStringExplicitEmptyOf.java +++ b/testData/after/tostring/ToStringExplicitEmptyOf.java @@ -4,7 +4,6 @@ class ToStringExplicitEmptyOf1 { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ToStringExplicitEmptyOf1()"; } @@ -16,7 +15,6 @@ class ToStringExplicitEmptyOf2 { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ToStringExplicitEmptyOf2()"; } diff --git a/testData/after/tostring/ToStringExplicitOfAndExclude.java b/testData/after/tostring/ToStringExplicitOfAndExclude.java index abc85588a..bc21cbdc7 100644 --- a/testData/after/tostring/ToStringExplicitOfAndExclude.java +++ b/testData/after/tostring/ToStringExplicitOfAndExclude.java @@ -6,7 +6,6 @@ class ToStringExplicitOfAndExclude { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ToStringExplicitOfAndExclude(x=" + this.x + ", z=" + this.z + ")"; } diff --git a/testData/after/tostring/ToStringSimpleClassName.java b/testData/after/tostring/ToStringSimpleClassName.java index 85a3f1c17..5b5ad248d 100644 --- a/testData/after/tostring/ToStringSimpleClassName.java +++ b/testData/after/tostring/ToStringSimpleClassName.java @@ -9,7 +9,6 @@ static class InnerStaticClass { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ToStringSimpleClassName.InnerStaticClass(someProperty=" + this.someProperty + ")"; } @@ -20,7 +19,6 @@ class InnerClass { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ToStringSimpleClassName.InnerClass(someProperty=" + this.someProperty + ")"; } @@ -28,7 +26,6 @@ public java.lang.String toString() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ToStringSimpleClassName(x=" + this.x + ", name=" + this.name + ")"; } diff --git a/testData/after/utilityclass/UtilityClassPlain.java b/testData/after/utilityclass/UtilityClassPlain.java index c887373da..6f7c87193 100644 --- a/testData/after/utilityclass/UtilityClassPlain.java +++ b/testData/after/utilityclass/UtilityClassPlain.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 public final class UtilityClassPlain { private static final int CONSTANT = 5; @@ -8,7 +8,6 @@ public static int addSomething(int in) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private UtilityClassPlain() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } diff --git a/testData/after/value/ValueAndBuilder93.java b/testData/after/value/ValueAndBuilder93.java index f57906129..a0d1c2d60 100644 --- a/testData/after/value/ValueAndBuilder93.java +++ b/testData/after/value/ValueAndBuilder93.java @@ -9,7 +9,6 @@ public Zoo create() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") Zoo(final String meerkat, final String warthog) { this.meerkat = meerkat; this.warthog = warthog; @@ -17,69 +16,57 @@ public Zoo create() { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class ZooBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String meerkat; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String warthog; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") ZooBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ZooBuilder meerkat(final String meerkat) { this.meerkat = meerkat; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ZooBuilder warthog(final String warthog) { this.warthog = warthog; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Zoo build() { return new Zoo(meerkat, warthog); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Zoo.ZooBuilder(meerkat=" + this.meerkat + ", warthog=" + this.warthog + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static ZooBuilder builder() { return new ZooBuilder(); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getMeerkat() { return this.meerkat; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getWarthog() { return this.warthog; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Zoo)) return false; @@ -95,7 +82,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -108,7 +94,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Zoo(meerkat=" + this.getMeerkat() + ", warthog=" + this.getWarthog() + ")"; } diff --git a/testData/after/value/ValueAndWither.java b/testData/after/value/ValueAndWither.java index 39c249635..e1ca12564 100644 --- a/testData/after/value/ValueAndWither.java +++ b/testData/after/value/ValueAndWither.java @@ -9,20 +9,17 @@ public void methodCallingWith() { @java.beans.ConstructorProperties({"myField"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ValueAndWither(final String myField) { this.myField = myField; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getMyField() { return this.myField; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueAndWither)) return false; @@ -35,7 +32,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -46,13 +42,11 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ValueAndWither(myField=" + this.getMyField() + ")"; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ValueAndWither withMyField(final String myField) { return this.myField == myField ? this : new ValueAndWither(myField); } diff --git a/testData/after/value/ValueBuilder.java b/testData/after/value/ValueBuilder.java index ad0d65085..abd5f41cb 100644 --- a/testData/after/value/ValueBuilder.java +++ b/testData/after/value/ValueBuilder.java @@ -11,7 +11,6 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") ValueBuilder(final String o1, final int o2, final double o3) { this.o1 = o1; this.o2 = o2; @@ -20,85 +19,70 @@ public static void main(String[] args) { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static class ValueBuilderBuilder { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private String o1; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private int o2; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private double o3; @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") ValueBuilderBuilder() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ValueBuilderBuilder o1(final String o1) { this.o1 = o1; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ValueBuilderBuilder o2(final int o2) { this.o2 = o2; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ValueBuilderBuilder o3(final double o3) { this.o3 = o3; return this; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ValueBuilder build() { return new ValueBuilder(o1, o2, o3); } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ValueBuilder.ValueBuilderBuilder(o1=" + this.o1 + ", o2=" + this.o2 + ", o3=" + this.o3 + ")"; } } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static ValueBuilderBuilder builder() { return new ValueBuilderBuilder(); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getO1() { return this.o1; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getO2() { return this.o2; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public double getO3() { return this.o3; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueBuilder)) return false; @@ -113,7 +97,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -127,7 +110,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ValueBuilder(o1=" + this.getO1() + ", o2=" + this.getO2() + ", o3=" + this.getO3() + ")"; } diff --git a/testData/after/value/ValueIssue78.java b/testData/after/value/ValueIssue78.java index b7f4ceb7a..c3128ad64 100644 --- a/testData/after/value/ValueIssue78.java +++ b/testData/after/value/ValueIssue78.java @@ -10,26 +10,22 @@ public static void main(String[] args) { @java.beans.ConstructorProperties({"one"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Foo(final String one) { this.one = one; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getOne() { return this.one; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getTwo() { return this.two; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Foo)) return false; @@ -45,7 +41,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -58,7 +53,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Foo(one=" + this.getOne() + ", two=" + this.getTwo() + ")"; } diff --git a/testData/after/value/ValueIssue94.java b/testData/after/value/ValueIssue94.java index afff6658f..580f6bab4 100644 --- a/testData/after/value/ValueIssue94.java +++ b/testData/after/value/ValueIssue94.java @@ -9,20 +9,17 @@ public void test() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getNonFinal() { return this.nonFinal; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getOtherFinal() { return this.otherFinal; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Val)) return false; @@ -38,7 +35,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -51,14 +47,12 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Val(nonFinal=" + this.getNonFinal() + ", otherFinal=" + this.getOtherFinal() + ")"; } @java.beans.ConstructorProperties({"otherFinal"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Val(final String otherFinal) { this.otherFinal = otherFinal; } diff --git a/testData/after/value/ValuePlain.java b/testData/after/value/ValuePlain.java index c9652ac95..c2cf1d3d9 100644 --- a/testData/after/value/ValuePlain.java +++ b/testData/after/value/ValuePlain.java @@ -6,27 +6,23 @@ final class Value1 { @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Value1(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getName() { return this.name; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value1)) return false; @@ -40,7 +36,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -52,7 +47,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Value1(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -64,27 +58,23 @@ class Value2 { @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Value2(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public String getName() { return this.name; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value2)) return false; @@ -98,14 +88,12 @@ public boolean equals(final java.lang.Object o) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected boolean canEqual(final java.lang.Object other) { return other instanceof Value2; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -117,7 +105,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Value2(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -129,27 +116,23 @@ final class Value3 { @java.beans.ConstructorProperties({"x", "y"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Value3(final int x, final int y) { this.x = x; this.y = y; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getX() { return this.x; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getY() { return this.y; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value3)) return false; @@ -161,7 +144,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -172,7 +154,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "Value3(x=" + this.getX() + ", y=" + this.getY() + ")"; } diff --git a/testData/after/value/ValueStarImport.java b/testData/after/value/ValueStarImport.java index 8686b670f..59064ba0d 100644 --- a/testData/after/value/ValueStarImport.java +++ b/testData/after/value/ValueStarImport.java @@ -4,13 +4,11 @@ final class ValueStarImport { @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ValueStarImport() { } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueExperimentalStarImport)) return false; @@ -19,7 +17,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { int result = 1; return result; @@ -27,7 +24,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ValueExperimentalStarImport()"; } diff --git a/testData/after/value/ValueWithGeneric176.java b/testData/after/value/ValueWithGeneric176.java index 35c191d43..0aab45777 100644 --- a/testData/after/value/ValueWithGeneric176.java +++ b/testData/after/value/ValueWithGeneric176.java @@ -10,33 +10,28 @@ public static void main(String[] args) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") private ValueWithGeneric176(final T name, final int count) { this.name = name; this.count = count; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public static ValueWithGeneric176 of(final T name, final int count) { return new ValueWithGeneric176(name, count); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public T getName() { return this.name; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getCount() { return this.count; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueWithGeneric176)) return false; @@ -50,7 +45,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -62,7 +56,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ValueWithGeneric176(name=" + this.getName() + ", count=" + this.getCount() + ")"; } diff --git a/testData/after/value/ValueWithPackagePrivate.java b/testData/after/value/ValueWithPackagePrivate.java index 293e59174..2b04fe9eb 100644 --- a/testData/after/value/ValueWithPackagePrivate.java +++ b/testData/after/value/ValueWithPackagePrivate.java @@ -17,7 +17,6 @@ public static void main(String[] args) { @java.beans.ConstructorProperties({"privateInt", "protectedInt", "publicInt", "anInt", "annotatedInt", "nonFinalInt", "shouldBePublicInt"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public ValueWithPackagePrivate(final int privateInt, final int protectedInt, final int publicInt, final int anInt, final int annotatedInt, final int nonFinalInt, final int shouldBePublicInt) { this.privateInt = privateInt; this.protectedInt = protectedInt; @@ -29,50 +28,42 @@ public ValueWithPackagePrivate(final int privateInt, final int protectedInt, fin } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getPrivateInt() { return this.privateInt; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getProtectedInt() { return this.protectedInt; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getPublicInt() { return this.publicInt; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getAnInt() { return this.anInt; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getAnnotatedInt() { return this.annotatedInt; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getNonFinalInt() { return this.nonFinalInt; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int getShouldBePublicInt() { return this.shouldBePublicInt; } @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueWithPackagePrivate)) return false; @@ -89,7 +80,6 @@ public boolean equals(final java.lang.Object o) { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public int hashCode() { final int PRIME = 59; int result = 1; @@ -105,7 +95,6 @@ public int hashCode() { @java.lang.Override @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public java.lang.String toString() { return "ValueWithPackagePrivate(privateInt=" + this.getPrivateInt() + ", protectedInt=" + this.getProtectedInt() + ", publicInt=" + this.getPublicInt() + ", anInt=" + this.getAnInt() + ", annotatedInt=" + this.getAnnotatedInt() + ", nonFinalInt=" + this.getNonFinalInt() + ", shouldBePublicInt=" + this.getShouldBePublicInt() + ")"; } diff --git a/testData/after/with/WithAlreadyExists.java b/testData/after/with/WithAlreadyExists.java index 19bee97ca..238f1e5a8 100644 --- a/testData/after/with/WithAlreadyExists.java +++ b/testData/after/with/WithAlreadyExists.java @@ -1,42 +1,55 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class With1 { boolean foo; + void withFoo(boolean foo) { } + With1(boolean foo) { } } class With2 { boolean foo; + void withFoo(String foo) { } + With2(boolean foo) { } } class With3 { String foo; + void withFoo(boolean foo) { } + With3(String foo) { } } class With4 { String foo; + void withFoo(String foo) { } + With4(String foo) { } } class With5 { String foo; + void withFoo() { } + With5(String foo) { } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public With5 withFoo(final String foo) { return this.foo == foo ? this : new With5(foo); } @@ -44,11 +57,14 @@ public With5 withFoo(final String foo) { class With6 { String foo; + void withFoo(String foo, int x) { } + With6(String foo) { } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public With6 withFoo(final String foo) { return this.foo == foo ? this : new With6(foo); } @@ -56,24 +72,30 @@ public With6 withFoo(final String foo) { class With7 { String foo; + void withFoo(String foo, Object... x) { } + With7(String foo) { } } class With8 { boolean isFoo; + void withIsFoo(boolean foo) { } + With8(boolean foo) { } } class With9 { boolean isFoo; + void withFoo(boolean foo) { } + With9(boolean foo) { } } diff --git a/testData/after/with/WithAndAllArgsConstructor.java b/testData/after/with/WithAndAllArgsConstructor.java index 7746e55f7..1ea7fb9a5 100644 --- a/testData/after/with/WithAndAllArgsConstructor.java +++ b/testData/after/with/WithAndAllArgsConstructor.java @@ -1,21 +1,26 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class WithAndAllArgsConstructor { J test; java.util.List test2; final int x = 10; int y = 20; final int z; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithAndAllArgsConstructor(final J test, final java.util.List test2, final int y, final int z) { this.test = test; this.test2 = test2; this.y = y; this.z = z; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithAndAllArgsConstructor withTest(final J test) { return this.test == test ? this : new WithAndAllArgsConstructor(test, this.test2, this.y, this.z); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") 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/testData/after/with/WithInnerAnnotation.java b/testData/after/with/WithInnerAnnotation.java index 1e88b226e..dca1f2695 100644 --- a/testData/after/with/WithInnerAnnotation.java +++ b/testData/after/with/WithInnerAnnotation.java @@ -1,5 +1,6 @@ +// unchanged class WithInnerAnnotation { @interface Inner { int bar() default 42; } -} +} \ No newline at end of file diff --git a/testData/after/with/WithMethodAbstract.java b/testData/after/with/WithMethodAbstract.java index e00ced2a3..4d3a5a5dd 100644 --- a/testData/after/with/WithMethodAbstract.java +++ b/testData/after/with/WithMethodAbstract.java @@ -1,5 +1,8 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + abstract class WithMethodAbstract { String foo; - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public abstract WithMethodAbstract withFoo(final String foo); } diff --git a/testData/after/with/WithMethodMarkedDeprecated.java b/testData/after/with/WithMethodMarkedDeprecated.java index 3493bd5ba..b27831eee 100644 --- a/testData/after/with/WithMethodMarkedDeprecated.java +++ b/testData/after/with/WithMethodMarkedDeprecated.java @@ -1,3 +1,5 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class WithMethodMarkedDeprecated { @Deprecated int annotation; @@ -5,18 +7,21 @@ class WithMethodMarkedDeprecated { * @deprecated */ int javadoc; + WithMethodMarkedDeprecated(int annotation, int javadoc) { } - @Deprecated - @SuppressWarnings("all") + + @java.lang.Deprecated + @java.lang.SuppressWarnings("all") public WithMethodMarkedDeprecated withAnnotation(final int annotation) { return this.annotation == annotation ? this : new WithMethodMarkedDeprecated(annotation, this.javadoc); } + /** * @deprecated */ - @Deprecated - @SuppressWarnings("all") + @java.lang.Deprecated + @java.lang.SuppressWarnings("all") public WithMethodMarkedDeprecated withJavadoc(final int javadoc) { return this.javadoc == javadoc ? this : new WithMethodMarkedDeprecated(this.annotation, javadoc); } diff --git a/testData/after/with/WithOnClass.java b/testData/after/with/WithOnClass.java index a479030ef..390343fdb 100644 --- a/testData/after/with/WithOnClass.java +++ b/testData/after/with/WithOnClass.java @@ -1,9 +1,13 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class WithOnClass1 { boolean isNone; boolean isPublic; + WithOnClass1(boolean isNone, boolean isPublic) { } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithOnClass1 withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WithOnClass1(this.isNone, isPublic); } @@ -13,13 +17,16 @@ class WithOnClass2 { boolean isNone; boolean isProtected; boolean isPackage; + WithOnClass2(boolean isNone, boolean isProtected, boolean isPackage) { } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected WithOnClass2 withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WithOnClass2(this.isNone, isProtected, this.isPackage); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") WithOnClass2 withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WithOnClass2(this.isNone, this.isProtected, isPackage); } @@ -29,16 +36,19 @@ class WithOnClass3 { String couldBeNull; @lombok.NonNull String nonNull; + WithOnClass3(String couldBeNull, String nonNull) { } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithOnClass3 withCouldBeNull(final String couldBeNull) { return this.couldBeNull == couldBeNull ? this : new WithOnClass3(couldBeNull, this.nonNull); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithOnClass3 withNonNull(@lombok.NonNull final String nonNull) { if (nonNull == null) { - throw new NullPointerException("nonNull is marked non-null but is null"); + throw new java.lang.NullPointerException("nonNull is marked non-null but is null"); } return this.nonNull == nonNull ? this : new WithOnClass3(this.couldBeNull, nonNull); } @@ -47,10 +57,12 @@ public WithOnClass3 withNonNull(@lombok.NonNull final String nonNull) { class WithOnClass4 { final int fX = 10; final int fY; + WithOnClass4(int y) { this.fY = y; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithOnClass4 withY(final int fY) { return this.fY == fY ? this : new WithOnClass4(fY); } diff --git a/testData/after/with/WithOnStatic.java b/testData/after/with/WithOnStatic.java index b234f0d68..9bf7bed7b 100644 --- a/testData/after/with/WithOnStatic.java +++ b/testData/after/with/WithOnStatic.java @@ -1,3 +1,5 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class WithOnStatic { static boolean foo; static int bar; diff --git a/testData/after/with/WithPlain.java b/testData/after/with/WithPlain.java index ca1a59bc2..ae3cfe374 100644 --- a/testData/after/with/WithPlain.java +++ b/testData/after/with/WithPlain.java @@ -1,15 +1,20 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class WithPlain { int i; final int foo; + WithPlain(int i, int foo) { this.i = i; this.foo = foo; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithPlain withI(final int i) { return this.i == i ? this : new WithPlain(i, this.foo); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithPlain withFoo(final int foo) { return this.foo == foo ? this : new WithPlain(this.i, foo); } diff --git a/testData/after/with/WithWithDollar.java b/testData/after/with/WithWithDollar.java index 79abcc12d..d0682c9df 100644 --- a/testData/after/with/WithWithDollar.java +++ b/testData/after/with/WithWithDollar.java @@ -1,3 +1,5 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class WithWithDollar { int $i; } diff --git a/testData/after/with/WithWithGenerics.java b/testData/after/with/WithWithGenerics.java index a9bfd36ab..230cbb0aa 100644 --- a/testData/after/with/WithWithGenerics.java +++ b/testData/after/with/WithWithGenerics.java @@ -1,19 +1,25 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class WithWithGenerics { J test; java.util.List test2; java.util.List test3; int $i; + public WithWithGenerics(J test, java.util.List test2, java.util.List test3) { } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithWithGenerics withTest(final J test) { return this.test == test ? this : new WithWithGenerics(test, this.test2, this.test3); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithWithGenerics withTest2(final java.util.List test2) { return this.test2 == test2 ? this : new WithWithGenerics(this.test, test2, this.test3); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithWithGenerics withTest3(final java.util.List test3) { return this.test3 == test3 ? this : new WithWithGenerics(this.test, this.test2, test3); } diff --git a/testData/after/with/WithWithTypeAnnos.java b/testData/after/with/WithWithTypeAnnos.java index d9a162296..850440b23 100644 --- a/testData/after/with/WithWithTypeAnnos.java +++ b/testData/after/with/WithWithTypeAnnos.java @@ -1,3 +1,6 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + +//CONF: lombok.copyableAnnotations += TA import java.lang.annotation.ElementType; import java.lang.annotation.Target; import java.util.List; @@ -14,10 +17,12 @@ class WithWithTypeAnnos { @TA @TB final List foo; + WithWithTypeAnnos(@TA @TB List foo) { this.foo = foo; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WithWithTypeAnnos withFoo(@TA final List foo) { return this.foo == foo ? this : new WithWithTypeAnnos(foo); } diff --git a/testData/after/with/WitherAccessLevel.java b/testData/after/with/WitherAccessLevel.java index f64605183..3415d28e8 100644 --- a/testData/after/with/WitherAccessLevel.java +++ b/testData/after/with/WitherAccessLevel.java @@ -1,3 +1,5 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class WitherAccessLevel { boolean isNone; boolean isPrivate; @@ -5,25 +7,31 @@ class WitherAccessLevel { boolean isProtected; boolean isPublic; boolean value; + WitherAccessLevel(boolean isNone, boolean isPrivate, boolean isPackage, boolean isProtected, boolean isPublic, boolean value) { } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") private WitherAccessLevel withPrivate(final boolean isPrivate) { return this.isPrivate == isPrivate ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") WitherAccessLevel withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") protected WitherAccessLevel withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WitherAccessLevel withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value); } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") 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/testData/after/with/WitherLegacyStar.java b/testData/after/with/WitherLegacyStar.java index adb7312b7..2bd3bb6d8 100644 --- a/testData/after/with/WitherLegacyStar.java +++ b/testData/after/with/WitherLegacyStar.java @@ -1,9 +1,13 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + class WitherLegacyStar { int i; + WitherLegacyStar(int i) { this.i = i; } - @SuppressWarnings("all") + + @java.lang.SuppressWarnings("all") public WitherLegacyStar withI(final int i) { return this.i == i ? this : new WitherLegacyStar(i); } diff --git a/testData/after/wither/WitherAccessLevel.java b/testData/after/wither/WitherAccessLevel.java index 45dd91820..c561eb2b9 100644 --- a/testData/after/wither/WitherAccessLevel.java +++ b/testData/after/wither/WitherAccessLevel.java @@ -12,31 +12,31 @@ class WitherAccessLevel { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") + private WitherAccessLevel withPrivate(final boolean isPrivate) { return this.isPrivate == isPrivate ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") + WitherAccessLevel withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") + protected WitherAccessLevel withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") + public WitherAccessLevel withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") + 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/testData/after/wither/WitherAlreadyExists.java b/testData/after/wither/WitherAlreadyExists.java index 6d219d697..fd696e388 100644 --- a/testData/after/wither/WitherAlreadyExists.java +++ b/testData/after/wither/WitherAlreadyExists.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class Wither1 { boolean foo; @@ -50,7 +50,6 @@ void withFoo() { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Wither5 withFoo(final String foo) { return this.foo == foo ? this : new Wither5(foo); } @@ -66,7 +65,6 @@ void withFoo(String foo, int x) { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public Wither6 withFoo(final String foo) { return this.foo == foo ? this : new Wither6(foo); } diff --git a/testData/after/wither/WitherAndAccessors.java b/testData/after/wither/WitherAndAccessors.java index 243b6d307..ba0bd5ea9 100644 --- a/testData/after/wither/WitherAndAccessors.java +++ b/testData/after/wither/WitherAndAccessors.java @@ -1,21 +1,18 @@ -class WitherAndAccessors { +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 +class WitherAndAccessors { final int x = 10; - int y = 20; - + @lombok.experimental.Accessors(fluent = true) final int z; - @java.beans.ConstructorProperties({"y", "z"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherAndAccessors(final int y, final int z) { this.y = y; this.z = z; } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherAndAccessors withZ(final int z) { return this.z == z ? this : new WitherAndAccessors(this.y, z); } diff --git a/testData/after/wither/WitherAndAllArgsConstructor.java b/testData/after/wither/WitherAndAllArgsConstructor.java index 85da0556e..05ed5edf4 100644 --- a/testData/after/wither/WitherAndAllArgsConstructor.java +++ b/testData/after/wither/WitherAndAllArgsConstructor.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:45 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class WitherAndAllArgsConstructor { J test; @@ -7,9 +7,7 @@ class WitherAndAllArgsConstructor { int y = 20; final int z; - @java.beans.ConstructorProperties({"test", "test2", "y", "z"}) @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherAndAllArgsConstructor(final J test, final java.util.List test2, final int y, final int z) { this.test = test; this.test2 = test2; @@ -18,13 +16,11 @@ public WitherAndAllArgsConstructor(final J test, final java.util.List test2, } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherAndAllArgsConstructor withTest(final J test) { return this.test == test ? this : new WitherAndAllArgsConstructor(test, this.test2, this.y, this.z); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherAndAllArgsConstructor withTest2(final java.util.List test2) { return this.test2 == test2 ? this : new WitherAndAllArgsConstructor(this.test, test2, this.y, this.z); } diff --git a/testData/after/wither/WitherDeprecated.java b/testData/after/wither/WitherDeprecated.java index 11c270cd7..040a5db29 100644 --- a/testData/after/wither/WitherDeprecated.java +++ b/testData/after/wither/WitherDeprecated.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:45 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class WitherDeprecated { @Deprecated @@ -13,7 +13,6 @@ class WitherDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherDeprecated withAnnotation(final int annotation) { return this.annotation == annotation ? this : new WitherDeprecated(annotation, this.javadoc); } @@ -23,7 +22,6 @@ public WitherDeprecated withAnnotation(final int annotation) { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherDeprecated withJavadoc(final int javadoc) { return this.javadoc == javadoc ? this : new WitherDeprecated(this.annotation, javadoc); } diff --git a/testData/after/wither/WitherOnClass.java b/testData/after/wither/WitherOnClass.java index a68fce411..df16a899a 100644 --- a/testData/after/wither/WitherOnClass.java +++ b/testData/after/wither/WitherOnClass.java @@ -8,7 +8,6 @@ class WitherOnClass1 { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherOnClass1 withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WitherOnClass1(this.isNone, isPublic); } @@ -23,13 +22,11 @@ class WitherOnClass2 { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") protected WitherOnClass2 withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WitherOnClass2(this.isNone, isProtected, this.isPackage); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") WitherOnClass2 withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage); } @@ -44,13 +41,11 @@ class WitherOnClass3 { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherOnClass3 withCouldBeNull(final String couldBeNull) { return this.couldBeNull == couldBeNull ? this : new WitherOnClass3(couldBeNull, this.nonNull); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherOnClass3 withNonNull(@lombok.NonNull final String nonNull) { if (nonNull == null) { throw new java.lang.NullPointerException("nonNull"); @@ -68,7 +63,6 @@ class WitherOnClass4 { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherOnClass4 withY(final int fY) { return this.fY == fY ? this : new WitherOnClass4(fY); } diff --git a/testData/after/wither/WitherOnStatic.java b/testData/after/wither/WitherOnStatic.java index 18e3f2e1d..afa64b587 100644 --- a/testData/after/wither/WitherOnStatic.java +++ b/testData/after/wither/WitherOnStatic.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:45 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class WitherOnStatic { static boolean foo; diff --git a/testData/after/wither/WitherPlain.java b/testData/after/wither/WitherPlain.java index 4f436f9d4..e0879bcc1 100644 --- a/testData/after/wither/WitherPlain.java +++ b/testData/after/wither/WitherPlain.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:45 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class WitherPlain { int i; @@ -10,13 +10,11 @@ class WitherPlain { } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherPlain withI(final int i) { return this.i == i ? this : new WitherPlain(i, this.foo); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherPlain withFoo(final int foo) { return this.foo == foo ? this : new WitherPlain(this.i, foo); } diff --git a/testData/after/wither/WitherWithAbstract.java b/testData/after/wither/WitherWithAbstract.java index d5bfeef81..32592bcf2 100644 --- a/testData/after/wither/WitherWithAbstract.java +++ b/testData/after/wither/WitherWithAbstract.java @@ -1,6 +1,8 @@ +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 + abstract class WitherWithAbstract { String foo; + @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public abstract WitherWithAbstract withFoo(final String foo); -} \ No newline at end of file +} diff --git a/testData/after/wither/WitherWithDollar.java b/testData/after/wither/WitherWithDollar.java index f6052c6ef..1272356ad 100644 --- a/testData/after/wither/WitherWithDollar.java +++ b/testData/after/wither/WitherWithDollar.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:45 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class WitherWithDollar { int $i; diff --git a/testData/after/wither/WitherWithGenerics.java b/testData/after/wither/WitherWithGenerics.java index 7d9273705..679643c49 100644 --- a/testData/after/wither/WitherWithGenerics.java +++ b/testData/after/wither/WitherWithGenerics.java @@ -1,4 +1,4 @@ -// Generated by delombok at Sat Jun 11 11:12:45 CEST 2016 +// Generated by delombok at Wed Oct 02 19:12:43 GMT 2019 class WitherWithGenerics { J test; @@ -10,19 +10,16 @@ public WitherWithGenerics(J test, java.util.List test2, java.util.List withTest(final J test) { return this.test == test ? this : new WitherWithGenerics(test, this.test2, this.test3); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherWithGenerics withTest2(final java.util.List test2) { return this.test2 == test2 ? this : new WitherWithGenerics(this.test, test2, this.test3); } @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") public WitherWithGenerics withTest3(final java.util.List test3) { return this.test3 == test3 ? this : new WitherWithGenerics(this.test, this.test2, test3); } diff --git a/testData/before/builder/BuilderGenerics.java b/testData/before/builder/ObjectApiResponse.java similarity index 100% rename from testData/before/builder/BuilderGenerics.java rename to testData/before/builder/ObjectApiResponse.java diff --git a/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaBiMap.java b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaBiMap.java new file mode 100644 index 000000000..1c86e3bba --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaBiMap.java @@ -0,0 +1,18 @@ +import com.google.common.collect.ImmutableBiMap; +import lombok.Singular; + +@lombok.experimental.SuperBuilder +public class SingularGuavaBiMap { + @Singular + private ImmutableBiMap rawTypes; + @Singular + private ImmutableBiMap integers; + @Singular + private ImmutableBiMap generics; + @Singular + private ImmutableBiMap extendsGenerics; + + public static void main(String[] args) { + } + +} diff --git a/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaCollection.java b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaCollection.java new file mode 100644 index 000000000..70ae55b80 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaCollection.java @@ -0,0 +1,17 @@ +import com.google.common.collect.ImmutableCollection; +import lombok.Singular; + +@lombok.experimental.SuperBuilder +public class SingularGuavaCollection { + @Singular + private ImmutableCollection rawTypes; + @Singular + private ImmutableCollection integers; + @Singular + private ImmutableCollection generics; + @Singular + private ImmutableCollection extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaList.java b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaList.java new file mode 100644 index 000000000..1cea75c38 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaList.java @@ -0,0 +1,17 @@ +import com.google.common.collect.ImmutableList; +import lombok.Singular; + +@lombok.experimental.SuperBuilder +public class SingularGuavaList { + @Singular + private ImmutableList rawTypes; + @Singular + private ImmutableList integers; + @Singular + private ImmutableList generics; + @Singular + private ImmutableList extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaMap.java b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaMap.java new file mode 100644 index 000000000..3c25a3096 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaMap.java @@ -0,0 +1,18 @@ +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import lombok.Singular; + +@lombok.experimental.SuperBuilder +public class SingularGuavaMap { + @Singular + private ImmutableMap rawTypes; + @Singular + private ImmutableMap integers; + @Singular + private ImmutableMap generics; + @Singular + private ImmutableMap extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaSet.java b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaSet.java new file mode 100644 index 000000000..d341f9dc3 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaSet.java @@ -0,0 +1,17 @@ +import com.google.common.collect.ImmutableSet; +import lombok.Singular; + +@lombok.experimental.SuperBuilder +public class SingularGuavaSet { + @Singular + private ImmutableSet rawTypes; + @Singular + private ImmutableSet integers; + @Singular + private ImmutableSet generics; + @Singular + private ImmutableSet extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaSortedMap.java b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaSortedMap.java new file mode 100644 index 000000000..a94658f04 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaSortedMap.java @@ -0,0 +1,17 @@ +import com.google.common.collect.ImmutableSortedMap; +import lombok.Singular; + +@lombok.experimental.SuperBuilder +public class SingularGuavaSortedMap { + @Singular + private ImmutableSortedMap rawTypes; + @Singular + private ImmutableSortedMap integers; + @Singular + private ImmutableSortedMap generics; + @Singular + private ImmutableSortedMap extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaSortedSet.java b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaSortedSet.java new file mode 100644 index 000000000..d6876b5d1 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaSortedSet.java @@ -0,0 +1,17 @@ +import com.google.common.collect.ImmutableSortedSet; +import lombok.Singular; + +@lombok.experimental.SuperBuilder +public class SingularGuavaSortedSet { + @Singular + private ImmutableSortedSet rawTypes; + @Singular + private ImmutableSortedSet integers; + @Singular + private ImmutableSortedSet generics; + @Singular + private ImmutableSortedSet extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaTable.java b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaTable.java new file mode 100644 index 000000000..3e3fed649 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Guava/SingularGuavaTable.java @@ -0,0 +1,19 @@ +import com.google.common.collect.ImmutableTable; +import lombok.Singular; + +import java.util.Map; + +@lombok.experimental.SuperBuilder +public class SingularGuavaTable { + @Singular + private ImmutableTable rawTypes; + @Singular + private ImmutableTable integers; + @Singular + private ImmutableTable generics; + @Singular + private ImmutableTable extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularCollection.java b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularCollection.java new file mode 100644 index 000000000..746df93bd --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularCollection.java @@ -0,0 +1,15 @@ +import lombok.Singular; + +import java.util.ArrayList; +import java.util.Collection; + +@lombok.experimental.SuperBuilder +public class SingularCollection { + @Singular private Collection rawTypes; + @Singular private Collection integers; + @Singular private Collection generics; + @Singular private Collection extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularIterable.java b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularIterable.java new file mode 100644 index 000000000..08b54fdf1 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularIterable.java @@ -0,0 +1,9 @@ +import lombok.Singular; + +@lombok.experimental.SuperBuilder +public class SingularIterable { + @Singular private Iterable rawTypes; + @Singular private Iterable integers; + @Singular private Iterable generics; + @Singular private Iterable extendsGenerics; +} diff --git a/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularList.java b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularList.java new file mode 100644 index 000000000..0d5d5ee92 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularList.java @@ -0,0 +1,12 @@ +import lombok.Singular; + +import java.util.List; + +@lombok.experimental.SuperBuilder +public class SingularList { + @Singular private List rawTypes; + @Singular private List integers; + @Singular private List generics; + @Singular private List extendsGenerics; + +} diff --git a/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularNavigableSet.java b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularNavigableSet.java new file mode 100644 index 000000000..c50b32cdf --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularNavigableSet.java @@ -0,0 +1,12 @@ +import lombok.Singular; + +import java.util.NavigableSet; + +@lombok.experimental.SuperBuilder +public class SingularNavigableSet { + @Singular private NavigableSet rawTypes; + @Singular private NavigableSet integers; + @Singular private NavigableSet generics; + @Singular private NavigableSet extendsGenerics; + +} diff --git a/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularSet.java b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularSet.java new file mode 100644 index 000000000..00cf5ba6e --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularSet.java @@ -0,0 +1,12 @@ +import lombok.Singular; + +import java.util.Set; + +@lombok.experimental.SuperBuilder +public class SingularSet { + @Singular private Set rawTypes; + @Singular private Set integers; + @Singular private Set generics; + @Singular private Set extendsGenerics; + +} diff --git a/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularSortedSet.java b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularSortedSet.java new file mode 100644 index 000000000..23db1f0e6 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Util/Collection/SingularSortedSet.java @@ -0,0 +1,12 @@ +import lombok.Singular; + +import java.util.SortedSet; + +@lombok.experimental.SuperBuilder +public class SingularSortedSet { + @Singular private SortedSet rawTypes; + @Singular private SortedSet integers; + @Singular private SortedSet generics; + @Singular private SortedSet extendsGenerics; + +} diff --git a/testData/before/superbuilder/Singular/Generic/Util/Map/SingularMap.java b/testData/before/superbuilder/Singular/Generic/Util/Map/SingularMap.java new file mode 100644 index 000000000..ccd6bfbf5 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Util/Map/SingularMap.java @@ -0,0 +1,18 @@ +import lombok.Singular; + +import java.util.Map; + +@lombok.experimental.SuperBuilder +public class SingularMap { + @Singular + private Map rawTypes; + @Singular + private Map integers; + @Singular + private Map generics; + @Singular + private Map extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/before/superbuilder/Singular/Generic/Util/Map/SingularNavigableMap.java b/testData/before/superbuilder/Singular/Generic/Util/Map/SingularNavigableMap.java new file mode 100644 index 000000000..ff6d4db28 --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Util/Map/SingularNavigableMap.java @@ -0,0 +1,19 @@ +import lombok.Singular; + +import java.util.Map; +import java.util.NavigableMap; + +@lombok.experimental.SuperBuilder +public class SingularNavigableMap { + @Singular + private NavigableMap rawTypes; + @Singular + private NavigableMap integers; + @Singular + private NavigableMap generics; + @Singular + private NavigableMap extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/before/superbuilder/Singular/Generic/Util/Map/SingularSortedMap.java b/testData/before/superbuilder/Singular/Generic/Util/Map/SingularSortedMap.java new file mode 100644 index 000000000..325f1b9fd --- /dev/null +++ b/testData/before/superbuilder/Singular/Generic/Util/Map/SingularSortedMap.java @@ -0,0 +1,19 @@ +import lombok.Singular; + +import java.util.Map; +import java.util.SortedMap; + +@lombok.experimental.SuperBuilder +public class SingularSortedMap { + @Singular + private SortedMap rawTypes; + @Singular + private SortedMap integers; + @Singular + private SortedMap generics; + @Singular + private SortedMap extendsGenerics; + + public static void main(String[] args) { + } +} diff --git a/testData/postfix/issue670/Issue670.java b/testData/postfix/issue670/Issue670.java new file mode 100644 index 000000000..f293aba47 --- /dev/null +++ b/testData/postfix/issue670/Issue670.java @@ -0,0 +1,223 @@ +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.experimental.Delegate; +import lombok.extern.slf4j.Slf4j; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class Issue670 { + @Delegate(excludes = ExcludesDelegateMethods.class) + private PreferencesPayload prefPayload = new PreferencesPayload(); + + private int someValue = 1; + + private interface ExcludesDelegateMethods { + void setTacAccepted(boolean tacAccepted); + + void setUseAnimations(boolean useAnimations); + + void setCssTheme(int cssTheme); + + void setUserLanguage(String userLanguageCode); + + void setUserCountry(String userCountry); + + void setPreferredTradeCurrency(String preferredTradeCurrency); + + void setUseTorForBitcoinJ(boolean useTorForBitcoinJ); + + void setShowOwnOffersInOfferBook(boolean showOwnOffersInOfferBook); + + void setMaxPriceDistanceInPercent(double maxPriceDistanceInPercent); + + void setBackupDirectory(String backupDirectory); + + void setAutoSelectArbitrators(boolean autoSelectArbitrators); + + void setUsePercentageBasedPrice(boolean usePercentageBasedPrice); + + void setTagForPeer(String hostName, String tag); + + void setOfferBookChartScreenCurrencyCode(String offerBookChartScreenCurrencyCode); + + void setBuyScreenCurrencyCode(String buyScreenCurrencyCode); + + void setSellScreenCurrencyCode(String sellScreenCurrencyCode); + + void setIgnoreTradersList(List ignoreTradersList); + + void setDirectoryChooserPath(String directoryChooserPath); + + void setTradeChartsScreenCurrencyCode(String tradeChartsScreenCurrencyCode); + + void setTradeStatisticsTickUnitIndex(int tradeStatisticsTickUnitIndex); + + void setSortMarketCurrenciesNumerically(boolean sortMarketCurrenciesNumerically); + + void setBitcoinNodes(String bitcoinNodes); + + void setUseCustomWithdrawalTxFee(boolean useCustomWithdrawalTxFee); + + void setWithdrawalTxFeeInBytes(long withdrawalTxFeeInBytes); + + void setSelectedPaymentAccountForCreateOffer(String paymentAccount); + + void setBsqBlockChainExplorer(String bsqBlockChainExplorer); + + void setPayFeeInBtc(boolean payFeeInBtc); + + void setFiatCurrencies(List currencies); + + void setCryptoCurrencies(List currencies); + + void setBlockChainExplorerTestNet(String blockChainExplorerTestNet); + + void setBlockChainExplorerMainNet(String blockChainExplorerMainNet); + + void setResyncSpvRequested(boolean resyncSpvRequested); + + void setDontShowAgainMap(Map dontShowAgainMap); + + void setPeerTagMap(Map peerTagMap); + + void setBridgeAddresses(List bridgeAddresses); + + void setBridgeOptionOrdinal(int bridgeOptionOrdinal); + + void setTorTransportOrdinal(int torTransportOrdinal); + + void setCustomBridges(String customBridges); + + void setBitcoinNodesOptionOrdinal(int bitcoinNodesOption); + + void setReferralId(String referralId); + + void setPhoneKeyAndToken(String phoneKeyAndToken); + + void setUseSoundForMobileNotifications(boolean value); + + void setUseTradeNotifications(boolean value); + + void setUseMarketNotifications(boolean value); + + void setUsePriceNotifications(boolean value); + + List getBridgeAddresses(); + + long getWithdrawalTxFeeInBytes(); + + void setUseStandbyMode(boolean useStandbyMode); + + void setTakeOfferSelectedPaymentAccountId(String value); + + void setIgnoreDustThreshold(int value); + + void setBuyerSecurityDepositAsPercent(double buyerSecurityDepositAsPercent); + + double getBuyerSecurityDepositAsPercent(); + + void setDaoFullNode(boolean value); + + void setRpcUser(String value); + + void setRpcPw(String value); + + void setBlockNotifyPort(int value); + + boolean isDaoFullNode(); + + String getRpcUser(); + + String getRpcPw(); + + int getBlockNotifyPort(); + } + + @Slf4j + @Data + @AllArgsConstructor + public static final class PreferencesPayload { + private String userLanguage; + private String userCountry; + @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") + private List fiatCurrencies = new ArrayList<>(); + @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") + private List cryptoCurrencies = new ArrayList<>(); + private String blockChainExplorerMainNet; + private String blockChainExplorerTestNet; + private String bsqBlockChainExplorer; + private String backupDirectory; + private boolean autoSelectArbitrators = true; + private Map dontShowAgainMap = new HashMap<>(); + private boolean tacAccepted; + private boolean useTorForBitcoinJ = true; + private boolean showOwnOffersInOfferBook = true; + private String preferredTradeCurrency; + private long withdrawalTxFeeInBytes = 100; + private boolean useCustomWithdrawalTxFee = false; + private double maxPriceDistanceInPercent = 0.3; + private String offerBookChartScreenCurrencyCode; + private String tradeChartsScreenCurrencyCode; + private String buyScreenCurrencyCode; + private String sellScreenCurrencyCode; + private int tradeStatisticsTickUnitIndex = 3; + private boolean resyncSpvRequested; + private boolean sortMarketCurrenciesNumerically = true; + private boolean usePercentageBasedPrice = true; + private Map peerTagMap = new HashMap<>(); + // custom btc nodes + private String bitcoinNodes = ""; + private List ignoreTradersList = new ArrayList<>(); + private String directoryChooserPath; + + @Deprecated // Superseded by buyerSecurityDepositAsPercent + private long buyerSecurityDepositAsLong; + + private boolean useAnimations; + private int cssTheme; + private String selectedPaymentAccountForCreateOffer; + private boolean payFeeInBtc = true; + private List bridgeAddresses; + private int bridgeOptionOrdinal; + private int torTransportOrdinal; + private String customBridges; + private int bitcoinNodesOptionOrdinal; + private String referralId; + private String phoneKeyAndToken; + private boolean useSoundForMobileNotifications = true; + private boolean useTradeNotifications = true; + private boolean useMarketNotifications = true; + private boolean usePriceNotifications = true; + private boolean useStandbyMode = false; + private boolean isDaoFullNode = false; + private String rpcUser; + private String rpcPw; + private String takeOfferSelectedPaymentAccountId; + private double buyerSecurityDepositAsPercent = 0.0; + private int ignoreDustThreshold = 600; + private double buyerSecurityDepositAsPercentForCrypto = 0.0; + private int blockNotifyPort; + + /////////////////////////////////////////////////////////////////////////////////////////// + // Constructor + /////////////////////////////////////////////////////////////////////////////////////////// + + public PreferencesPayload() { + } + + /////////////////////////////////////////////////////////////////////////////////////////// + // PROTO BUFFER + /////////////////////////////////////////////////////////////////////////////////////////// + + public String toProtoMessage() { + return ""; + } + + public static String fromProto(String s) { + return s; + } + } +}