diff options
263 files changed, 2146 insertions, 1620 deletions
@@ -3,6 +3,7 @@ Lombok contributors in alphabetical order: Bulgakov Alexander <buls@yandex.ru> Christian Sterzl <christian.sterzl@gmail.com> DaveLaw <project.lombok@apconsult.de> +Dave Brosius <dbrosius@mebigfatguy.com> Dawid Rusin <dawidrusin90@gmail.com> Enrique da Costa Cambio <enrique.dacostacambio@gmail.com> Jappe van der Hel <jappe.vanderhel@gmail.com> @@ -12,6 +13,7 @@ Maarten Mulders <mthmulders@users.noreply.github.com> Mart Hagenaars <marthagenaars@gmail.com> Peter Grant <petercgrant@users.noreply.github.com> Philipp Eichhorn <peichhor@web.de> +Rabea Gransberger <rgra@users.noreply.github.com> Reinier Zwitserloot <reinier@zwitserloot.com> Robbert Jan Grootjans <grootjans@gmail.com> Roel Spilker <r.spilker@gmail.com> diff --git a/doc/changelog.markdown b/doc/changelog.markdown index d5aa7ba1..0c731776 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -3,6 +3,7 @@ Lombok Changelog ### v1.16.13 "Edgy Guinea Pig" * v1.16.12 is the latest stable release of Project Lombok. +* FEATURE: Generated classes, methods and fields are now also annotated with `@lombok.Generated` [Issue #1014](https://github.com/rzwitserloot/lombok/issues/1014) ### v1.16.12 (December 5th, 2016) * FEATURE: `var` is the mutable sister of `val`. For now experimental, and opt-in using `ALLOW` in the flagUsage configuration key. Thanks for the contribution, Bulgakov Alexander. diff --git a/src/core/lombok/ConfigurationKeys.java b/src/core/lombok/ConfigurationKeys.java index 132bde8d..ff17ca09 100644 --- a/src/core/lombok/ConfigurationKeys.java +++ b/src/core/lombok/ConfigurationKeys.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 The Project Lombok Authors. + * Copyright (C) 2013-2017 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -41,11 +41,32 @@ public class ConfigurationKeys { /** * lombok configuration: {@code lombok.addGeneratedAnnotation} = {@code true} | {@code false}. * - * If unset or {@code true}, lombok generates {@code @javax.annotation.Generated("lombok")} on all fields, methods, and types that are generated. + * If unset or {@code true}, lombok generates various annotations to mark generated code like {@code @javax.annotation.Generated("lombok")} and {@code @lombok.Generated}. + * + * @see ConfigurationKeys#ADD_JAVAX_GENERATED_ANNOTATIONS + * @see ConfigurationKeys#ADD_LOMBOK_GENERATED_ANNOTATIONS */ public static final ConfigurationKey<Boolean> ADD_GENERATED_ANNOTATIONS = new ConfigurationKey<Boolean>("lombok.addGeneratedAnnotation", "Generate @javax.annotation.Generated on all generated code (default: true).") {}; /** + * lombok configuration: {@code lombok.addJavaxGeneratedAnnotation} = {@code true} | {@code false}. + * + * If unset or {@code true}, lombok generates {@code @javax.annotation.Generated("lombok")} on all fields, methods, and types that are generated, unless {@code lombok.addGeneratedAnnotation} is set to {@code false}. + * + * @see ConfigurationKeys#ADD_GENERATED_ANNOTATIONS + */ + public static final ConfigurationKey<Boolean> ADD_JAVAX_GENERATED_ANNOTATIONS = new ConfigurationKey<Boolean>("lombok.addJavaxGeneratedAnnotation", "Generate @javax.annotation.Generated on all generated code (default: follow lombok.addGeneratedAnnotation).") {}; + + /** + * lombok configuration: {@code lombok.addLombokGeneratedAnnotation} = {@code true} | {@code false}. + * + * If unset or {@code true}, lombok generates {@code @lombok.Generated} on all fields, methods, and types that are generated, unless {@code lombok.addGeneratedAnnotation} is set to {@code false}. + * + * @see ConfigurationKeys#ADD_GENERATED_ANNOTATIONS + */ + public static final ConfigurationKey<Boolean> ADD_LOMBOK_GENERATED_ANNOTATIONS = new ConfigurationKey<Boolean>("lombok.addLombokGeneratedAnnotation", "Generate @lombok.Generated on all generated code (default: follow lombok.addGeneratedAnnotation).") {}; + + /** * lombok configuration: {@code lombok.extern.findbugs.addSuppressFBWarnings} = {@code true} | {@code false}. * * If {@code true}, lombok generates {@code edu.umd.cs.findbugs.annotations.SuppressFBWarnings} on all fields, methods, and types that are generated. diff --git a/src/core/lombok/core/configuration/ConfigurationApp.java b/src/core/lombok/core/configuration/ConfigurationApp.java index e441b4de..efe57e38 100644 --- a/src/core/lombok/core/configuration/ConfigurationApp.java +++ b/src/core/lombok/core/configuration/ConfigurationApp.java @@ -198,7 +198,7 @@ public class ConfigurationApp extends LombokApp { if (paths.size() == 1) { if (!(argsPaths.size() == 1)) out.printf("Configuration for '%s'.%n%n", paths.iterator().next()); } else { - out.printf("Configuration for:%n", paths.iterator().next()); + out.printf("Configuration for:%n"); for (String path : paths) out.printf("- %s%n", path); out.println(); } diff --git a/src/core/lombok/core/handlers/HandlerUtil.java b/src/core/lombok/core/handlers/HandlerUtil.java index ef4ac7d6..a05578d4 100644 --- a/src/core/lombok/core/handlers/HandlerUtil.java +++ b/src/core/lombok/core/handlers/HandlerUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2015 The Project Lombok Authors. + * Copyright (C) 2013-2017 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -109,6 +109,12 @@ public class HandlerUtil { } } + public static boolean shouldAddGenerated(LombokNode<?, ?, ?> node, ConfigurationKey<Boolean> key) { + Boolean add = node.getAst().readConfiguration(key); + if (add != null) return add; + return !Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_GENERATED_ANNOTATIONS)); + } + public static void handleExperimentalFlagUsage(LombokNode<?, ?, ?> node, ConfigurationKey<FlagUsageType> key, String featureName) { handleFlagUsage(node, key, featureName, ConfigurationKeys.EXPERIMENTAL_FLAG_USAGE, "any lombok.experimental feature"); } diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 76251225..f822e095 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 The Project Lombok Authors. + * Copyright (C) 2009-2017 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -1329,6 +1329,7 @@ public class EclipseHandlerUtil { private static final char[] GENERATED_CODE = "generated code".toCharArray(); private static final char[] LOMBOK = "lombok".toCharArray(); private static final char[][] JAVAX_ANNOTATION_GENERATED = Eclipse.fromQualifiedName("javax.annotation.Generated"); + private static final char[][] LOMBOK_GENERATED = Eclipse.fromQualifiedName("lombok.Generated"); private static final char[][] EDU_UMD_CS_FINDBUGS_ANNOTATIONS_SUPPRESSFBWARNINGS = Eclipse.fromQualifiedName("edu.umd.cs.findbugs.annotations.SuppressFBWarnings"); public static Annotation[] addSuppressWarningsAll(EclipseNode node, ASTNode source, Annotation[] originalAnnotationArray) { @@ -1343,24 +1344,29 @@ public class EclipseHandlerUtil { } public static Annotation[] addGenerated(EclipseNode node, ASTNode source, Annotation[] originalAnnotationArray) { - if (Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_GENERATED_ANNOTATIONS))) return originalAnnotationArray; - return addAnnotation(source, originalAnnotationArray, JAVAX_ANNOTATION_GENERATED, new StringLiteral(LOMBOK, 0, 0, 0)); + Annotation[] result = originalAnnotationArray; + if (HandlerUtil.shouldAddGenerated(node, ConfigurationKeys.ADD_JAVAX_GENERATED_ANNOTATIONS)) { + result = addAnnotation(source, result, JAVAX_ANNOTATION_GENERATED, new StringLiteral(LOMBOK, 0, 0, 0)); + } + if (HandlerUtil.shouldAddGenerated(node, ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS)) { + result = addAnnotation(source, result, LOMBOK_GENERATED, null); + } + return result; } private static Annotation[] addAnnotation(ASTNode source, Annotation[] originalAnnotationArray, char[][] annotationTypeFqn, ASTNode arg) { char[] simpleName = annotationTypeFqn[annotationTypeFqn.length - 1]; if (originalAnnotationArray != null) for (Annotation ann : originalAnnotationArray) { - char[] lastToken = null; - if (ann.type instanceof QualifiedTypeReference) { char[][] t = ((QualifiedTypeReference) ann.type).tokens; - lastToken = t[t.length - 1]; - } else if (ann.type instanceof SingleTypeReference) { - lastToken = ((SingleTypeReference) ann.type).token; + if (Arrays.deepEquals(t, annotationTypeFqn)) return originalAnnotationArray; } - if (lastToken != null && Arrays.equals(simpleName, lastToken)) return originalAnnotationArray; + if (ann.type instanceof SingleTypeReference) { + char[] lastToken = ((SingleTypeReference) ann.type).token; + if (Arrays.equals(lastToken, simpleName)) return originalAnnotationArray; + } } int pS = source.sourceStart, pE = source.sourceEnd; diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index af6bb48f..0b4e839d 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -1025,9 +1025,12 @@ public class JavacHandlerUtil { public static void addGenerated(JCModifiers mods, JavacNode node, int pos, JCTree source, Context context) { if (!LombokOptionsFactory.getDelombokOptions(context).getFormatPreferences().generateGenerated()) return; - if (!Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_GENERATED_ANNOTATIONS))) { + if (HandlerUtil.shouldAddGenerated(node, ConfigurationKeys.ADD_JAVAX_GENERATED_ANNOTATIONS)) { addAnnotation(mods, node, pos, source, context, "javax.annotation.Generated", node.getTreeMaker().Literal("lombok")); } + if (HandlerUtil.shouldAddGenerated(node, ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS)) { + addAnnotation(mods, node, pos, source, context, "lombok.Generated", null); + } } private static void addAnnotation(JCModifiers mods, JavacNode node, int pos, JCTree source, Context context, String annotationTypeFqn, JCExpression arg) { @@ -1041,12 +1044,16 @@ public class JavacHandlerUtil { for (JCAnnotation ann : mods.annotations) { JCTree annType = ann.getAnnotationType(); - Name lastPart = null; - if (annType instanceof JCIdent) lastPart = ((JCIdent) annType).name; - else if (annType instanceof JCFieldAccess) lastPart = ((JCFieldAccess) annType).name; + if (annType instanceof JCIdent) { + Name lastPart = ((JCIdent) annType).name; + if (lastPart.contentEquals(simpleName)) return; + } - if (lastPart != null && lastPart.contentEquals(simpleName)) return; + if (annType instanceof JCFieldAccess) { + if (annType.toString().equals(annotationTypeFqn)) return; + } } + JavacTreeMaker maker = node.getTreeMaker(); JCExpression annType = isJavaLangBased ? genJavaLangTypeRef(node, simpleName) : chainDotsString(node, annotationTypeFqn); annType.pos = pos; diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index 4b18dc0f..77f615b5 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -30,6 +30,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup; + import lombok.core.AgentLauncher; import lombok.patcher.Filter; import lombok.patcher.Hook; @@ -120,10 +122,28 @@ public class EclipsePatcher implements AgentLauncher.AgentLaunchable { patchLombokizeAST(sm); patchEcjTransformers(sm, ecjOnly); patchExtensionMethod(sm, ecjOnly); + patchRenameField(sm); if (reloadExistingClasses) sm.reloadClasses(instrumentation); } + private static void patchRenameField(ScriptManager sm) { + /* RefactoringSearchEngine.search will not return results when renaming field and Data Annotation is present. Return a fake Element to make checks pass */ + sm.addScript(ScriptBuilder.wrapMethodCall() + .target(new MethodTarget("org.eclipse.jdt.internal.corext.refactoring.rename.RenameFieldProcessor", "checkAccessorDeclarations", "org.eclipse.ltk.core.refactoring.RefactoringStatus", "org.eclipse.core.runtime.IProgressMonitor", "org.eclipse.jdt.core.IMethod")) + .methodToWrap(new Hook("org.eclipse.jdt.internal.corext.refactoring.RefactoringSearchEngine", "search", "org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup[]", "org.eclipse.jdt.core.search.SearchPattern","org.eclipse.jdt.core.search.IJavaSearchScope","org.eclipse.core.runtime.IProgressMonitor","org.eclipse.ltk.core.refactoring.RefactoringStatus")) + .wrapMethod(new Hook("lombok.launch.PatchFixesHider$PatchFixes", "createFakeSearchResult", "org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup[]", "org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup[]", "java.lang.Object")) + .requestExtra(StackRequest.THIS) + .transplant().build()); + + /* Filter search results which are Generated and based on Fields, e.g. Generated getters/setters */ + sm.addScript(ScriptBuilder.wrapMethodCall() + .target(new MethodTarget("org.eclipse.jdt.internal.corext.refactoring.rename.RenameFieldProcessor", "addAccessorOccurrences", "void", "org.eclipse.core.runtime.IProgressMonitor", "org.eclipse.jdt.core.IMethod", "java.lang.String","java.lang.String","org.eclipse.ltk.core.refactoring.RefactoringStatus")) + .methodToWrap(new Hook("org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup", "getSearchResults", "org.eclipse.jdt.core.search.SearchMatch[]")) + .wrapMethod(new Hook("lombok.launch.PatchFixesHider$PatchFixes", "removeGenerated", "org.eclipse.jdt.core.search.SearchMatch[]", "org.eclipse.jdt.core.search.SearchMatch[]")) + .transplant().build()); + } + private static void patchExtractInterface(ScriptManager sm) { /* Fix sourceEnding for generated nodes to avoid null pointer */ sm.addScript(ScriptBuilder.wrapMethodCall() diff --git a/src/eclipseAgent/lombok/launch/PatchFixesHider.java b/src/eclipseAgent/lombok/launch/PatchFixesHider.java index fae06900..b1d73352 100644 --- a/src/eclipseAgent/lombok/launch/PatchFixesHider.java +++ b/src/eclipseAgent/lombok/launch/PatchFixesHider.java @@ -36,11 +36,13 @@ import lombok.eclipse.EclipseAugments; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IAnnotatable; import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.SimpleName; +import org.eclipse.jdt.core.search.SearchMatch; import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; import org.eclipse.jdt.internal.compiler.ast.Annotation; import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; @@ -55,9 +57,11 @@ import org.eclipse.jdt.internal.compiler.lookup.Scope; import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.eclipse.jdt.internal.compiler.parser.Parser; import org.eclipse.jdt.internal.compiler.problem.ProblemReporter; +import org.eclipse.jdt.internal.core.SourceField; import org.eclipse.jdt.internal.core.dom.rewrite.NodeRewriteEvent; import org.eclipse.jdt.internal.core.dom.rewrite.RewriteEvent; import org.eclipse.jdt.internal.core.dom.rewrite.TokenScanner; +import org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup; import org.eclipse.jdt.internal.corext.refactoring.structure.ASTNodeSearchUtil; /** These contain a mix of the following: @@ -565,6 +569,48 @@ final class PatchFixesHider { return result.size() == methods.length ? methods : result.toArray(new IMethod[result.size()]); } + public static SearchMatch[] removeGenerated(SearchMatch[] returnValue) { + List<SearchMatch> result = new ArrayList<SearchMatch>(); + for (int j = 0; j < returnValue.length; j++) { + SearchMatch searchResult = returnValue[j]; + if (searchResult.getElement() instanceof IField) { + IField field = (IField) searchResult.getElement(); + + // can not check for value=lombok because annotation is + // not fully resolved + IAnnotation annotation = field.getAnnotation("Generated"); + if (annotation != null) { + // Method generated at field location, skip + continue; + } + + } + result.add(searchResult); + } + return result.toArray(new SearchMatch[result.size()]); + } + + public static SearchResultGroup[] createFakeSearchResult(SearchResultGroup[] returnValue, + Object/* + * org.eclipse.jdt.internal.corext.refactoring.rename. + * RenameFieldProcessor + */ processor) throws Exception { + if (returnValue == null || returnValue.length == 0) { + // if no matches were found, check if Data annotation is present on the class + Field declaredField = processor.getClass().getDeclaredField("fField"); + if (declaredField != null) { + declaredField.setAccessible(true); + SourceField fField = (SourceField) declaredField.get(processor); + IAnnotation dataAnnotation = fField.getDeclaringType().getAnnotation("Data"); + if (dataAnnotation != null) { + // add fake item, to make refactoring checks pass + return new SearchResultGroup[] {new SearchResultGroup(null, new SearchMatch[1])}; + } + } + } + return returnValue; + } + public static SimpleName[] removeGeneratedSimpleNames(SimpleName[] in) throws Exception { Field f = SimpleName.class.getField("$isGenerated"); diff --git a/src/installer/lombok/installer/IdeLocation.java b/src/installer/lombok/installer/IdeLocation.java index 4e3a7e41..c3853867 100644 --- a/src/installer/lombok/installer/IdeLocation.java +++ b/src/installer/lombok/installer/IdeLocation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,7 +25,6 @@ import java.io.File; import java.io.IOException; import java.net.URL; -import lombok.installer.eclipse.EclipseFinder; import lombok.patcher.ClassRootFinder; /** @@ -46,7 +45,7 @@ public abstract class IdeLocation { * a jar that wasn't accessed via the file-system, or if its started via e.g. unpacking the jar. */ public static File findOurJar() { - return new File(ClassRootFinder.findClassRootOfClass(IdeFinder.class)); + return new File(ClassRootFinder.findClassRootOfClass(OsUtils.class)); } @Override public String toString() { @@ -70,7 +69,7 @@ public abstract class IdeLocation { private static final String LEGAL_PATH_CHARS_WINDOWS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_/:\\ "; public static String escapePath(String path) { StringBuilder out = new StringBuilder(); - String legalChars = IdeFinder.getOS() == EclipseFinder.OS.UNIX ? LEGAL_PATH_CHARS : LEGAL_PATH_CHARS_WINDOWS; + String legalChars = OsUtils.getOS() == OsUtils.OS.UNIX ? LEGAL_PATH_CHARS : LEGAL_PATH_CHARS_WINDOWS; for (char c : path.toCharArray()) { if (legalChars.indexOf(c) == -1) out.append('\\'); out.append(c); diff --git a/src/installer/lombok/installer/IdeLocationProvider.java b/src/installer/lombok/installer/IdeLocationProvider.java index 933a5989..c4b64141 100644 --- a/src/installer/lombok/installer/IdeLocationProvider.java +++ b/src/installer/lombok/installer/IdeLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,20 +21,30 @@ */ package lombok.installer; +import java.util.List; import java.util.regex.Pattern; -import lombok.installer.IdeFinder.OS; - public interface IdeLocationProvider { /** * @throws CorruptedIdeLocationException * Only throw this exception if the location seems like a proper installation except there's something wrong with it. * Do not throw it (just return {@code null}) if there's nothing there or it looks absolutely nothing like your IDE. */ - public abstract IdeLocation create(String path) throws CorruptedIdeLocationException; + IdeLocation create(String path) throws CorruptedIdeLocationException; + + /** + * Return the usual name of the IDE executable or other obvious marker of an IDE installation on the current platform. + */ + Pattern getLocationSelectors(); /** - * Return the usual name of the IDE executable or other obvious marker of an IDE installation on the provided platform. + * Look for installations of your IDE in the usual places. + * + * @param locations Add to this list any valid locations that you found. + * @param problems + * Add to this list any locations that look like installations, + * but have problems that prevent you from installing/uninstalling from them. DONT add to this list + * any common locations that have no installation at all - only add near misses. */ - public abstract Pattern getLocationSelectors(OS os); + void findIdes(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems); } diff --git a/src/installer/lombok/installer/Installer.java b/src/installer/lombok/installer/Installer.java index 7ae01d7a..94cc1a45 100644 --- a/src/installer/lombok/installer/Installer.java +++ b/src/installer/lombok/installer/Installer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -38,7 +38,7 @@ import lombok.Lombok; import lombok.core.LombokApp; import lombok.core.SpiLoadUtil; import lombok.core.Version; -import lombok.installer.IdeFinder.OS; +import lombok.installer.OsUtils.OS; import lombok.patcher.ClassRootFinder; import org.mangosdk.spi.ProviderFor; @@ -72,10 +72,9 @@ public class Installer { } static List<Pattern> getIdeExecutableNames() { - OS os = IdeFinder.getOS(); List<Pattern> list = new ArrayList<Pattern>(); for (IdeLocationProvider provider : locationProviders) { - Pattern p = provider.getLocationSelectors(os); + Pattern p = provider.getLocationSelectors(); if (p != null) list.add(p); } return list; @@ -91,12 +90,8 @@ public class Installer { } static void autoDiscover(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems) { - try { - for (IdeFinder finder : SpiLoadUtil.findServices(IdeFinder.class)) { - finder.findIdes(locations, problems); - } - } catch (IOException e) { - throw Lombok.sneakyThrow(e); + for (IdeLocationProvider provider : locationProviders) { + provider.findIdes(locations, problems); } } @@ -160,7 +155,7 @@ public class Installer { } private static int guiInstaller() { - if (IdeFinder.getOS() == OS.MAC_OS_X) { + if (OsUtils.getOS() == OS.MAC_OS_X) { System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Lombok Installer"); System.setProperty("com.apple.macos.use-file-dialog-packages", "true"); } diff --git a/src/installer/lombok/installer/InstallerGUI.java b/src/installer/lombok/installer/InstallerGUI.java index 6b8a58ab..ebdf2035 100644 --- a/src/installer/lombok/installer/InstallerGUI.java +++ b/src/installer/lombok/installer/InstallerGUI.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -67,7 +67,7 @@ import javax.swing.SwingUtilities; import javax.swing.filechooser.FileFilter; import lombok.core.Version; -import lombok.installer.IdeFinder.OS; +import lombok.installer.OsUtils.OS; /** * The lombok GUI installer. @@ -313,7 +313,7 @@ public class InstallerGUI { final List<Pattern> exeNames = Installer.getIdeExecutableNames(); String file = null; - if (IdeFinder.getOS() == OS.MAC_OS_X) { + if (OsUtils.getOS() == OS.MAC_OS_X) { FileDialog chooser = new FileDialog(appWindow); chooser.setMode(FileDialog.LOAD); @@ -740,7 +740,7 @@ public class InstallerGUI { } catch (Exception e) { Runtime rt = Runtime.getRuntime(); try { - switch (IdeFinder.getOS()) { + switch (OsUtils.getOS()) { case WINDOWS: String[] cmd = new String[4]; cmd[0] = "cmd.exe"; @@ -781,7 +781,7 @@ public class InstallerGUI { */ public void show() { appWindow.setVisible(true); - if (IdeFinder.getOS() == OS.MAC_OS_X) { + if (OsUtils.getOS() == OS.MAC_OS_X) { try { AppleNativeLook.go(); } catch (Throwable ignore) { diff --git a/src/installer/lombok/installer/IdeFinder.java b/src/installer/lombok/installer/OsUtils.java index f68a0e4c..2da7de09 100644 --- a/src/installer/lombok/installer/IdeFinder.java +++ b/src/installer/lombok/installer/OsUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -34,9 +34,13 @@ import lombok.core.Version; /** * Implement and provide this class to add auto-finding a certain brand of IDEs to the lombok installer. */ -public abstract class IdeFinder { +public final class OsUtils { private static final AtomicBoolean windowsDriveInfoLibLoaded = new AtomicBoolean(false); + private OsUtils() { + // Prevent instantiation + } + private static void loadWindowsDriveInfoLib() throws IOException { if (!windowsDriveInfoLibLoaded.compareAndSet(false, true)) return; @@ -63,7 +67,7 @@ public abstract class IdeFinder { } private static boolean unpackDLL(String dllName, File target) throws IOException { - InputStream in = IdeFinder.class.getResourceAsStream(dllName); + InputStream in = OsUtils.class.getResourceAsStream(dllName); try { try { FileOutputStream out = new FileOutputStream(target); @@ -130,15 +134,4 @@ public abstract class IdeFinder { return OS.UNIX; } - - /** - * Look for installations of your IDE in the usual places. - * - * @param locations Add to this list any valid locations that you found. - * @param problems - * Add to this list any locations that look like installations, - * but have problems that prevent you from installing/uninstalling from them. DONT add to this list - * any common locations that have no installation at all - only add near misses. - */ - public abstract void findIdes(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems); } diff --git a/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java b/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java index 29716a1f..fa2ce958 100644 --- a/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java +++ b/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,145 +21,24 @@ */ package lombok.installer.eclipse; -import static lombok.installer.IdeLocation.canonical; +import java.util.Collections; -import java.io.File; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; - -import lombok.installer.IdeLocation; import lombok.installer.IdeLocationProvider; -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder.OS; import org.mangosdk.spi.ProviderFor; @ProviderFor(IdeLocationProvider.class) -public class EclipseLocationProvider implements IdeLocationProvider { - @Override public IdeLocation create(String path) throws CorruptedIdeLocationException { - return create0(path); - } - - protected List<String> getEclipseExecutableNames() { - return Arrays.asList("eclipse.app", "eclipse.exe", "eclipse"); - } - - protected String getIniName() { - return "eclipse.ini"; - } - - protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException { - return new EclipseLocation(name, ini); - } - - protected String getMacAppName() { - return "Eclipse.app"; - } - - protected String getUnixAppName() { - return "eclipse"; - } - - /** - * Create a new EclipseLocation by pointing at either the directory contains the Eclipse executable, or the executable itself, - * or an eclipse.ini file. - * - * @throws NotAnIdeLocationException - * If this isn't an Eclipse executable or a directory with an - * Eclipse executable. - */ - protected IdeLocation create0(String path) throws CorruptedIdeLocationException { - if (path == null) throw new NullPointerException("path"); - File p = new File(path); - - if (!p.exists()) return null; - if (p.isDirectory()) { - for (String possibleExeName : getEclipseExecutableNames()) { - File f = new File(p, possibleExeName); - if (f.exists()) return findEclipseIniFromExe(f, 0); - } - - File f = new File(p, getIniName()); - if (f.exists()) return new EclipseLocation(canonical(p), f); - } - - if (p.isFile()) { - if (p.getName().equalsIgnoreCase(getIniName())) { - return new EclipseLocation(canonical(p.getParentFile()), p); - } - } - - if (getEclipseExecutableNames().contains(p.getName().toLowerCase())) { - return findEclipseIniFromExe(p, 0); - } - - return null; - } - - private IdeLocation findEclipseIniFromExe(File exePath, int loopCounter) throws CorruptedIdeLocationException { - /* Try looking for eclipse.ini as sibling to the executable */ { - File ini = new File(exePath.getParentFile(), getIniName()); - if (ini.isFile()) return makeLocation(canonical(exePath), ini); - } - - /* Try looking for Eclipse.app/Contents/MacOS/eclipse.ini as sibling to executable; this works on Mac OS X. */ { - File ini = new File(exePath.getParentFile(), getMacAppName() + "/Contents/MacOS/" + getIniName()); - if (ini.isFile()) return makeLocation(canonical(exePath), ini); - } - - /* Starting with Eclipse Mars (with the oomph installer), the structure has changed, and it's now at Eclipse.app/Contents/Eclipse/eclipse.ini*/ { - File ini = new File(exePath.getParentFile(), getMacAppName() + "/Contents/Eclipse/" + getIniName()); - if (ini.isFile()) return makeLocation(canonical(exePath), ini); - } - - /* If executable is a soft link, follow it and retry. */ { - if (loopCounter < 50) { - try { - String oPath = exePath.getAbsolutePath(); - String nPath = exePath.getCanonicalPath(); - if (!oPath.equals(nPath)) try { - IdeLocation loc = findEclipseIniFromExe(new File(nPath), loopCounter + 1); - if (loc != null) return loc; - } catch (CorruptedIdeLocationException ignore) { - // Unlinking didn't help find an eclipse, so continue. - } - } catch (IOException ignore) { /* okay, that didn't work, assume it isn't a soft link then. */ } - } - } - - /* If executable is a linux LSB-style path, then look in the usual places that package managers like apt-get use.*/ { - String path = exePath.getAbsolutePath(); - try { - path = exePath.getCanonicalPath(); - } catch (IOException ignore) { /* We'll stick with getAbsolutePath()'s result then. */ } - - if (path.equals("/usr/bin/" + getUnixAppName()) || path.equals("/bin/" + getUnixAppName()) || path.equals("/usr/local/bin/" + getUnixAppName())) { - File ini = new File("/usr/lib/" + getUnixAppName() + "/" + getIniName()); - if (ini.isFile()) return makeLocation(path, ini); - ini = new File("/usr/local/lib/" + getUnixAppName() + "/" + getIniName()); - if (ini.isFile()) return makeLocation(path, ini); - ini = new File("/usr/local/etc/" + getUnixAppName() + "/" + getIniName()); - if (ini.isFile()) return makeLocation(path, ini); - ini = new File("/etc/" + getIniName()); - if (ini.isFile()) return makeLocation(path, ini); - } - } - - /* If we get this far, we lose. */ - return null; - } - - @Override public Pattern getLocationSelectors(OS os) { - switch (os) { - case MAC_OS_X: - return Pattern.compile("^(eclipse|eclipse\\.ini|eclipse\\.app)$", Pattern.CASE_INSENSITIVE); - case WINDOWS: - return Pattern.compile("^(eclipse\\.exe|eclipse\\.ini)$", Pattern.CASE_INSENSITIVE); - default: - case UNIX: - return Pattern.compile("^(eclipse|eclipse\\.ini)$", Pattern.CASE_INSENSITIVE); - } +public class EclipseLocationProvider extends EclipseProductLocationProvider { + + private static final EclipseProductDescriptor ECLIPSE = new StandardProductDescriptor( + "Eclipse", + "eclipse", + "eclipse", + EclipseLocationProvider.class.getResource("eclipse.png"), + Collections.<String>emptySet() + ); + + public EclipseLocationProvider() { + super(ECLIPSE); } } diff --git a/src/installer/lombok/installer/eclipse/STSLocation.java b/src/installer/lombok/installer/eclipse/EclipseProductDescriptor.java index 40ade40a..8f736a57 100644 --- a/src/installer/lombok/installer/eclipse/STSLocation.java +++ b/src/installer/lombok/installer/eclipse/EclipseProductDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 The Project Lombok Authors. + * Copyright (C) 2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,25 +21,21 @@ */ package lombok.installer.eclipse; -import java.io.File; import java.net.URL; +import java.util.List; +import java.util.regex.Pattern; -import lombok.installer.CorruptedIdeLocationException; - -public class STSLocation extends EclipseLocation { - public STSLocation(String nameOfLocation, File pathToEclipseIni) throws CorruptedIdeLocationException { - super(nameOfLocation, pathToEclipseIni); - } - - @Override public URL getIdeIcon() { - return STSLocation.class.getResource("STS.png"); - } - - @Override protected String getIniFileName() { - return "STS.ini"; - } - - @Override protected String getTypeName() { - return "STS"; - } -} +public interface EclipseProductDescriptor { + String getProductName(); + String getWindowsExecutableName(); + String getUnixAppName(); + String getMacAppName(); + String getDirectoryName(); + List<String> getExecutableNames(); + List<String> getSourceDirsOnWindows(); + List<String> getSourceDirsOnMac(); + List<String> getSourceDirsOnUnix(); + String getIniFileName(); + Pattern getLocationSelectors(); + URL getIdeIcon(); +}
\ No newline at end of file diff --git a/src/installer/lombok/installer/eclipse/EclipseLocation.java b/src/installer/lombok/installer/eclipse/EclipseProductLocation.java index 6c63c48d..886e3e85 100644 --- a/src/installer/lombok/installer/eclipse/EclipseLocation.java +++ b/src/installer/lombok/installer/eclipse/EclipseProductLocation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -35,7 +35,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder; +import lombok.installer.OsUtils; import lombok.installer.IdeLocation; import lombok.installer.InstallException; import lombok.installer.Installer; @@ -46,23 +46,18 @@ import lombok.installer.UninstallException; * An instance can figure out if an Eclipse installation has been lombok-ified, and can * install and uninstall lombok from the Eclipse installation. */ -public class EclipseLocation extends IdeLocation { +public final class EclipseProductLocation extends IdeLocation { + + private static final String OS_NEWLINE = OsUtils.getOS().getLineEnding(); + + private final EclipseProductDescriptor descriptor; private final String name; private final File eclipseIniPath; private final String pathToLombokJarPrefix; - private volatile boolean hasLombok; - - private static final String OS_NEWLINE = IdeFinder.getOS().getLineEnding(); - - protected String getTypeName() { - return "eclipse"; - } - - protected String getIniFileName() { - return "eclipse.ini"; - } + private final boolean hasLombok; - EclipseLocation(String nameOfLocation, File pathToEclipseIni) throws CorruptedIdeLocationException { + EclipseProductLocation(EclipseProductDescriptor descriptor, String nameOfLocation, File pathToEclipseIni) throws CorruptedIdeLocationException { + this.descriptor = descriptor; this.name = nameOfLocation; this.eclipseIniPath = pathToEclipseIni; File p1 = pathToEclipseIni.getParentFile(); @@ -78,8 +73,8 @@ public class EclipseLocation extends IdeLocation { this.hasLombok = checkForLombok(eclipseIniPath); } catch (IOException e) { throw new CorruptedIdeLocationException( - "I can't read the configuration file of the " + getTypeName() + " installed at " + name + "\n" + - "You may need to run this installer with root privileges if you want to modify that " + getTypeName() + ".", getTypeName(), e); + "I can't read the configuration file of the " + descriptor.getProductName() + " installed at " + name + "\n" + + "You may need to run this installer with root privileges if you want to modify that " + descriptor.getProductName() + ".", descriptor.getProductName(), e); } } @@ -88,8 +83,8 @@ public class EclipseLocation extends IdeLocation { } @Override public boolean equals(Object o) { - if (!(o instanceof EclipseLocation)) return false; - return ((EclipseLocation)o).eclipseIniPath.equals(eclipseIniPath); + if (!(o instanceof EclipseProductLocation)) return false; + return ((EclipseProductLocation)o).eclipseIniPath.equals(eclipseIniPath); } /** @@ -108,13 +103,13 @@ public class EclipseLocation extends IdeLocation { return hasLombok; } - private final Pattern JAVA_AGENT_LINE_MATCHER = Pattern.compile( + private static final Pattern JAVA_AGENT_LINE_MATCHER = Pattern.compile( "^\\-javaagent\\:.*lombok.*\\.jar$", Pattern.CASE_INSENSITIVE); - private final Pattern BOOTCLASSPATH_LINE_MATCHER = Pattern.compile( + private static final Pattern BOOTCLASSPATH_LINE_MATCHER = Pattern.compile( "^\\-Xbootclasspath\\/a\\:(.*lombok.*\\.jar.*)$", Pattern.CASE_INSENSITIVE); - private boolean checkForLombok(File iniFile) throws IOException { + private static boolean checkForLombok(File iniFile) throws IOException { if (!iniFile.exists()) return false; FileInputStream fis = new FileInputStream(iniFile); try { @@ -206,7 +201,7 @@ public class EclipseLocation extends IdeLocation { File lombokJar = new File(dir, "lombok.jar"); if (lombokJar.exists()) { if (!lombokJar.delete()) { - if (IdeFinder.getOS() == IdeFinder.OS.WINDOWS && Installer.isSelf(lombokJar.getAbsolutePath())) { + if (OsUtils.getOS() == OsUtils.OS.WINDOWS && Installer.isSelf(lombokJar.getAbsolutePath())) { lombokJarsForWhichCantDeleteSelf.add(lombokJar); } else { throw new UninstallException( @@ -228,14 +223,14 @@ public class EclipseLocation extends IdeLocation { throw new UninstallException(true, String.format( "lombok.jar cannot delete itself on windows.\nHowever, lombok has been uncoupled from your %s.\n" + "You can safely delete this jar file. You can find it at:\n%s", - getTypeName(), lombokJarsForWhichCantDeleteSelf.get(0).getAbsolutePath()), null); + descriptor.getProductName(), lombokJarsForWhichCantDeleteSelf.get(0).getAbsolutePath()), null); } } private static String generateWriteErrorMessage() { String osSpecificError; - switch (IdeFinder.getOS()) { + switch (OsUtils.getOS()) { default: case MAC_OS_X: case UNIX: @@ -265,7 +260,7 @@ public class EclipseLocation extends IdeLocation { // If someone knows how to fix this, please do so, as this current hack solution (putting the absolute path // to the jar files in your eclipse.ini) means you can't move your eclipse around on linux without lombok // breaking it. NB: rerunning lombok.jar installer and hitting 'update' will fix it if you do that. - boolean fullPathRequired = IdeFinder.getOS() == EclipseFinder.OS.UNIX || System.getProperty("lombok.installer.fullpath") != null; + boolean fullPathRequired = OsUtils.getOS() == OsUtils.OS.UNIX || System.getProperty("lombok.installer.fullpath") != null; boolean installSucceeded = false; StringBuilder newContents = new StringBuilder(); @@ -303,7 +298,7 @@ public class EclipseLocation extends IdeLocation { "I can't read my own jar file. I think you've found a bug in this installer!\nI suggest you restart it " + "and use the 'what do I do' link, to manually install lombok. Also, tell us about this at:\n" + "http://groups.google.com/group/project-lombok - Thanks!", e); - throw new InstallException("I can't write to your " + getTypeName() + " directory at " + name + generateWriteErrorMessage(), e); + throw new InstallException("I can't write to your " + descriptor.getProductName() + " directory at " + name + generateWriteErrorMessage(), e); } } @@ -369,14 +364,14 @@ public class EclipseLocation extends IdeLocation { } if (!installSucceeded) { - throw new InstallException("I can't find the " + getIniFileName() + " file. Is this a real " + getTypeName() + " installation?", null); + throw new InstallException("I can't find the " + descriptor.getIniFileName() + " file. Is this a real " + descriptor.getProductName() + " installation?", null); } - return "If you start " + getTypeName() + " with a custom -vm parameter, you'll need to add:<br>" + + return "If you start " + descriptor.getProductName() + " with a custom -vm parameter, you'll need to add:<br>" + "<code>-vmargs -javaagent:lombok.jar</code><br>as parameter as well."; } @Override public URL getIdeIcon() { - return EclipseLocation.class.getResource("eclipse.png"); + return descriptor.getIdeIcon(); } } diff --git a/src/installer/lombok/installer/eclipse/EclipseFinder.java b/src/installer/lombok/installer/eclipse/EclipseProductLocationProvider.java index 8a1a689a..3710d7d9 100644 --- a/src/installer/lombok/installer/eclipse/EclipseFinder.java +++ b/src/installer/lombok/installer/eclipse/EclipseProductLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,109 +22,130 @@ package lombok.installer.eclipse; import static java.util.Arrays.asList; +import static lombok.installer.IdeLocation.canonical; import java.io.File; +import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.regex.Pattern; -import lombok.installer.IdeFinder; -import lombok.installer.IdeLocation; import lombok.installer.CorruptedIdeLocationException; +import lombok.installer.OsUtils; +import lombok.installer.IdeLocation; +import lombok.installer.IdeLocationProvider; -import org.mangosdk.spi.ProviderFor; +public class EclipseProductLocationProvider implements IdeLocationProvider { + private final EclipseProductDescriptor descriptor; -@ProviderFor(IdeFinder.class) -public class EclipseFinder extends IdeFinder { - /** should be lowercase! */ - protected String getDirName() { - return "eclipse"; - } - - protected String getWindowsExecutableName() { - return "eclipse.exe"; - } - - protected String getUnixExecutableName() { - return "eclipse"; - } - - protected String getMacExecutableName() { - return "Eclipse.app"; + EclipseProductLocationProvider(EclipseProductDescriptor descriptor) { + this.descriptor = descriptor; } - protected IdeLocation createLocation(String guess) throws CorruptedIdeLocationException { - return new EclipseLocationProvider().create0(guess); - } - - protected List<String> getSourceDirsOnWindows() { - return Arrays.asList("\\", "\\Program Files", "\\Program Files (x86)", System.getProperty("user.home", ".")); + @Override public final IdeLocation create(String path) throws CorruptedIdeLocationException { + return create0(path); } /** - * Returns a list of paths of Eclipse installations. + * Create a new EclipseLocation by pointing at either the directory contains the Eclipse executable, or the executable itself, + * or an eclipse.ini file. * - * The search process works by scanning for each 'source dir' for either an eclipse installation or a folder containing the text returned - * by getDirName(). If such a folder is found, this process is applied recursively. On windows, this process is run on each drive letter - * which represents a physical hard disk. If the native windows API call to determine these drive letters fails, only 'C:' is checked. + * @throws NotAnIdeLocationException + * If this isn't an Eclipse executable or a directory with an + * Eclipse executable. */ - private List<String> getSourceDirsOnWindowsWithDriveLetters() { - List<String> driveLetters = asList("C"); - try { - driveLetters = getDrivesOnWindows(); - } catch (Throwable ignore) { - ignore.printStackTrace(); + private IdeLocation create0(String path) throws CorruptedIdeLocationException { + if (path == null) throw new NullPointerException("path"); + String iniName = descriptor.getIniFileName(); + File p = new File(path); + + if (!p.exists()) return null; + if (p.isDirectory()) { + for (String possibleExeName : descriptor.getExecutableNames()) { + File f = new File(p, possibleExeName); + if (f.exists()) return findEclipseIniFromExe(f, 0); + } + + File f = new File(p, iniName); + if (f.exists()) return makeLocation(canonical(p), f); } - List<String> sourceDirs = new ArrayList<String>(); - for (String letter : driveLetters) { - for (String possibleSource : getSourceDirsOnWindows()) { - if (!isDriveSpecificOnWindows(possibleSource)) { - sourceDirs.add(letter + ":" + possibleSource); - } + + if (p.isFile()) { + if (p.getName().equalsIgnoreCase(iniName)) { + return makeLocation(canonical(p.getParentFile()), p); } } - for (String possibleSource : getSourceDirsOnWindows()) { - if (isDriveSpecificOnWindows(possibleSource)) sourceDirs.add(possibleSource); + + if (descriptor.getExecutableNames().contains(p.getName().toLowerCase())) { + return findEclipseIniFromExe(p, 0); } - return sourceDirs; + return null; } - public boolean isDriveSpecificOnWindows(String path) { - return path.length() > 1 && path.charAt(1) == ':'; - } - - protected List<String> getSourceDirsOnMac() { - return Arrays.asList("/Applications", System.getProperty("user.home", ".")); - } - - protected List<String> getSourceDirsOnUnix() { - return Arrays.asList(System.getProperty("user.home", ".")); - } - - private List<File> transformToFiles(List<String> fileNames) { - List<File> files = new ArrayList<File>(); - for (String fileName : fileNames) { - files.add(new File(fileName)); + private IdeLocation findEclipseIniFromExe(File exePath, int loopCounter) throws CorruptedIdeLocationException { + String iniName = descriptor.getIniFileName(); + /* Try looking for eclipse.ini as sibling to the executable */ { + File ini = new File(exePath.getParentFile(), iniName); + if (ini.isFile()) return makeLocation(canonical(exePath), ini); } - return files; + + String macAppName = descriptor.getMacAppName(); + /* Try looking for Eclipse.app/Contents/MacOS/eclipse.ini as sibling to executable; this works on Mac OS X. */ { + File ini = new File(exePath.getParentFile(), macAppName + "/Contents/MacOS/" + iniName); + if (ini.isFile()) return makeLocation(canonical(exePath), ini); + } + + /* Starting with Eclipse Mars (with the oomph installer), the structure has changed, and it's now at Eclipse.app/Contents/Eclipse/eclipse.ini*/ { + File ini = new File(exePath.getParentFile(), macAppName + "/Contents/Eclipse/" + iniName); + if (ini.isFile()) return makeLocation(canonical(exePath), ini); + } + + /* If executable is a soft link, follow it and retry. */ { + if (loopCounter < 50) { + try { + String oPath = exePath.getAbsolutePath(); + String nPath = exePath.getCanonicalPath(); + if (!oPath.equals(nPath)) try { + IdeLocation loc = findEclipseIniFromExe(new File(nPath), loopCounter + 1); + if (loc != null) return loc; + } catch (CorruptedIdeLocationException ignore) { + // Unlinking didn't help find an eclipse, so continue. + } + } catch (IOException ignore) { /* okay, that didn't work, assume it isn't a soft link then. */ } + } + } + + /* If executable is a linux LSB-style path, then look in the usual places that package managers like apt-get use.*/ { + String path = exePath.getAbsolutePath(); + try { + path = exePath.getCanonicalPath(); + } catch (IOException ignore) { /* We'll stick with getAbsolutePath()'s result then. */ } + + String unixAppName = descriptor.getUnixAppName(); + if (path.equals("/usr/bin/" + unixAppName) || path.equals("/bin/" + unixAppName) || path.equals("/usr/local/bin/" + unixAppName)) { + File ini = new File("/usr/lib/" + unixAppName + "/" + iniName); + if (ini.isFile()) return makeLocation(path, ini); + ini = new File("/usr/local/lib/" + unixAppName + "/" + iniName); + if (ini.isFile()) return makeLocation(path, ini); + ini = new File("/usr/local/etc/" + unixAppName + "/" + iniName); + if (ini.isFile()) return makeLocation(path, ini); + ini = new File("/etc/" + iniName); + if (ini.isFile()) return makeLocation(path, ini); + } + } + + /* If we get this far, we lose. */ + return null; } - private List<File> getFlatSourceLocationsOnUnix() { - List<File> dirs = new ArrayList<File>(); - dirs.add(new File("/usr/bin/")); - dirs.add(new File("/usr/local/bin/")); - dirs.add(new File(System.getProperty("user.home", "."), "bin/")); - return dirs; + private IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException { + return new EclipseProductLocation(descriptor, name, ini); } - private List<File> getNestedSourceLocationOnUnix() { - List<File> dirs = new ArrayList<File>(); - dirs.add(new File("/usr/local/share")); - dirs.add(new File("/usr/local")); - dirs.add(new File("/usr/share")); - return dirs; + @Override public Pattern getLocationSelectors() { + return descriptor.getLocationSelectors(); } /** @@ -141,7 +162,7 @@ public class EclipseFinder extends IdeFinder { */ @Override public void findIdes(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems) { - switch (getOS()) { + switch (OsUtils.getOS()) { case WINDOWS: new WindowsFinder().findEclipse(locations, problems); break; @@ -155,17 +176,74 @@ public class EclipseFinder extends IdeFinder { } } + private List<File> transformToFiles(List<String> fileNames) { + List<File> files = new ArrayList<File>(); + for (String fileName : fileNames) { + files.add(new File(fileName)); + } + return files; + } + + private List<File> getFlatSourceLocationsOnUnix() { + List<File> dirs = new ArrayList<File>(); + dirs.add(new File("/usr/bin/")); + dirs.add(new File("/usr/local/bin/")); + dirs.add(new File(System.getProperty("user.home", "."), "bin/")); + return dirs; + } + + private List<File> getNestedSourceLocationOnUnix() { + List<File> dirs = new ArrayList<File>(); + dirs.add(new File("/usr/local/share")); + dirs.add(new File("/usr/local")); + dirs.add(new File("/usr/share")); + return dirs; + } + private class UnixFinder extends DirectoryFinder { UnixFinder() { super(getNestedSourceLocationOnUnix(), getFlatSourceLocationsOnUnix()); } @Override protected String findEclipseOnPlatform(File dir) { - File possible = new File(dir, getUnixExecutableName()); + File possible = new File(dir, descriptor.getUnixAppName()); return (possible.exists()) ? possible.getAbsolutePath() : null; } } + /** + * Returns a list of paths of Eclipse installations. + * + * The search process works by scanning for each 'source dir' for either an eclipse installation or a folder containing the text returned + * by getDirName(). If such a folder is found, this process is applied recursively. On windows, this process is run on each drive letter + * which represents a physical hard disk. If the native windows API call to determine these drive letters fails, only 'C:' is checked. + */ + private List<String> getSourceDirsOnWindowsWithDriveLetters() { + List<String> driveLetters = asList("C"); + try { + driveLetters = OsUtils.getDrivesOnWindows(); + } catch (Throwable ignore) { + ignore.printStackTrace(); + } + List<String> sourceDirs = new ArrayList<String>(); + for (String letter : driveLetters) { + for (String possibleSource : descriptor.getSourceDirsOnWindows()) { + if (!isDriveSpecificOnWindows(possibleSource)) { + sourceDirs.add(letter + ":" + possibleSource); + } + } + } + for (String possibleSource : descriptor.getSourceDirsOnWindows()) { + if (isDriveSpecificOnWindows(possibleSource)) sourceDirs.add(possibleSource); + } + + return sourceDirs; + } + + private boolean isDriveSpecificOnWindows(String path) { + return path.length() > 1 && path.charAt(1) == ':'; + } + private class WindowsFinder extends DirectoryFinder { WindowsFinder() { super(transformToFiles(getSourceDirsOnWindowsWithDriveLetters()), Collections.<File>emptyList()); @@ -174,20 +252,20 @@ public class EclipseFinder extends IdeFinder { /** Checks if the provided directory contains 'eclipse.exe', and if so, returns the directory, otherwise null. */ @Override protected String findEclipseOnPlatform(File dir) { - File possible = new File(dir, getWindowsExecutableName()); + File possible = new File(dir, descriptor.getWindowsExecutableName()); return (possible.isFile()) ? dir.getAbsolutePath() : null; } } private class MacFinder extends DirectoryFinder { MacFinder() { - super(transformToFiles(getSourceDirsOnMac()), Collections.<File>emptyList()); + super(transformToFiles(descriptor.getSourceDirsOnMac()), Collections.<File>emptyList()); } protected String findEclipseOnPlatform(File dir) { - if (dir.getName().toLowerCase().equals(getMacExecutableName().toLowerCase())) return dir.getParent(); - if (dir.getName().toLowerCase().contains(getDirName())) { - if (new File(dir, getMacExecutableName()).exists()) return dir.toString(); + if (dir.getName().toLowerCase().equals(descriptor.getMacAppName().toLowerCase())) return dir.getParent(); + if (dir.getName().toLowerCase().contains(descriptor.getDirectoryName())) { + if (new File(dir, descriptor.getMacAppName()).exists()) return dir.toString(); } return null; } @@ -202,14 +280,14 @@ public class EclipseFinder extends IdeFinder { this.flatSourceDirs = flatSourceDirs; } - public void findEclipse(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems) { + void findEclipse(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems) { for (File dir : nestedSourceDirs) recurseDirectory(locations, problems, dir); for (File dir : flatSourceDirs) findEclipse(locations, problems, dir); } - protected abstract String findEclipseOnPlatform(File dir); + abstract String findEclipseOnPlatform(File dir); - protected void recurseDirectory(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems, File dir) { + void recurseDirectory(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems, File dir) { recurseDirectory0(locations, problems, dir, 0); } @@ -223,19 +301,19 @@ public class EclipseFinder extends IdeFinder { for (File dir : listFiles) { if (!dir.isDirectory()) continue; try { - if (dir.getName().toLowerCase().contains(getDirName())) { + if (dir.getName().toLowerCase().contains(descriptor.getDirectoryName())) { findEclipse(locations, problems, dir); if (loopCounter < 50) recurseDirectory0(locations, problems, dir, loopCounter + 1); } } catch (Exception ignore) {} } } - + private void findEclipse(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems, File dir) { String eclipseLocation = findEclipseOnPlatform(dir); if (eclipseLocation != null) { try { - IdeLocation newLocation = createLocation(eclipseLocation); + IdeLocation newLocation = create(eclipseLocation); if (newLocation != null) locations.add(newLocation); } catch (CorruptedIdeLocationException e) { problems.add(e); diff --git a/src/installer/lombok/installer/eclipse/JbdsFinder.java b/src/installer/lombok/installer/eclipse/JbdsFinder.java deleted file mode 100644 index 2dfaacba..00000000 --- a/src/installer/lombok/installer/eclipse/JbdsFinder.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2013 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.installer.eclipse; - -import java.util.Arrays; -import java.util.List; - -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder; -import lombok.installer.IdeLocation; - -import org.mangosdk.spi.ProviderFor; - -/** - * JBDS (JBoss Developer Studio) is an eclipse variant. - * Other than different executable names, it's the same as eclipse, as far as lombok support goes. - */ -@ProviderFor(IdeFinder.class) -public class JbdsFinder extends EclipseFinder { - @Override protected IdeLocation createLocation(String guess) throws CorruptedIdeLocationException { - return new JbdsLocationProvider().create0(guess); - } - - @Override protected String getDirName() { - return "studio"; - } - - @Override protected String getMacExecutableName() { - return "jbdevstudio.app"; - } - - @Override protected String getUnixExecutableName() { - return "jbdevstudio"; - } - - @Override protected String getWindowsExecutableName() { - return "jbdevstudio.exe"; - } - - @Override protected List<String> getSourceDirsOnWindows() { - return Arrays.asList("\\", "\\Program Files", "\\Program Files (x86)", System.getProperty("user.home", ".")); - } - - @Override protected List<String> getSourceDirsOnMac() { - return Arrays.asList("/Applications", System.getProperty("user.home", ".")); - } - - @Override protected List<String> getSourceDirsOnUnix() { - return Arrays.asList(System.getProperty("user.home", ".")); - } -} diff --git a/src/installer/lombok/installer/eclipse/JbdsLocation.java b/src/installer/lombok/installer/eclipse/JbdsLocation.java deleted file mode 100644 index 81fb5261..00000000 --- a/src/installer/lombok/installer/eclipse/JbdsLocation.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2013 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.installer.eclipse; - -import java.io.File; -import java.net.URL; - -import lombok.installer.CorruptedIdeLocationException; - -public class JbdsLocation extends EclipseLocation { - public JbdsLocation(String nameOfLocation, File pathToEclipseIni) throws CorruptedIdeLocationException { - super(nameOfLocation, pathToEclipseIni); - } - - @Override public URL getIdeIcon() { - return JbdsLocation.class.getResource("jbds.png"); - } - - @Override protected String getIniFileName() { - return "jbdevstudio.ini"; - } - - @Override protected String getTypeName() { - return "JBoss Developer Studio"; - } -} diff --git a/src/installer/lombok/installer/eclipse/JbdsLocationProvider.java b/src/installer/lombok/installer/eclipse/JbdsLocationProvider.java index e6df0e43..635f304a 100644 --- a/src/installer/lombok/installer/eclipse/JbdsLocationProvider.java +++ b/src/installer/lombok/installer/eclipse/JbdsLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 The Project Lombok Authors. + * Copyright (C) 2013-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,49 +21,24 @@ */ package lombok.installer.eclipse; -import java.io.File; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; +import java.util.Collections; -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeLocation; import lombok.installer.IdeLocationProvider; -import lombok.installer.IdeFinder.OS; import org.mangosdk.spi.ProviderFor; @ProviderFor(IdeLocationProvider.class) -public class JbdsLocationProvider extends EclipseLocationProvider { - @Override protected List<String> getEclipseExecutableNames() { - return Arrays.asList("jbdevstudio.app", "jbdevstudio.exe", "jbdevstudioc.exe", "jbdevstudio"); - } - - @Override protected String getIniName() { - return "jbdevstudio.ini"; - } - - @Override protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException { - return new JbdsLocation(name, ini); - } - - @Override protected String getMacAppName() { - return "jbdevstudio.app"; - } +public class JbdsLocationProvider extends EclipseProductLocationProvider { - @Override protected String getUnixAppName() { - return "jbdevstudio"; - } + private static final EclipseProductDescriptor JBDS = new StandardProductDescriptor( + "JBoss Developer Studio", + "jbdevstudio", + "studio", + JbdsLocationProvider.class.getResource("jbds.png"), + Collections.<String>emptySet() + ); - @Override public Pattern getLocationSelectors(OS os) { - switch (os) { - case MAC_OS_X: - return Pattern.compile("^(jbdevstudio|jbdevstudio\\.ini|jbdevstudio\\.app)$", Pattern.CASE_INSENSITIVE); - case WINDOWS: - return Pattern.compile("^(jbdevstudioc?\\.exe|jbdevstudio\\.ini)$", Pattern.CASE_INSENSITIVE); - default: - case UNIX: - return Pattern.compile("^(jbdevstudio|jbdevstudio\\.ini)$", Pattern.CASE_INSENSITIVE); - } + public JbdsLocationProvider() { + super(JBDS); } } diff --git a/src/installer/lombok/installer/eclipse/MyEclipseFinder.java b/src/installer/lombok/installer/eclipse/MyEclipseFinder.java deleted file mode 100644 index 6ba8c861..00000000 --- a/src/installer/lombok/installer/eclipse/MyEclipseFinder.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2009 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.installer.eclipse; - -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder; -import lombok.installer.IdeLocation; -import org.mangosdk.spi.ProviderFor; - -import java.util.Arrays; -import java.util.List; - -/** - * MyEclipse is an eclipse variant. - * Other than different executable names, it's the same as eclipse, as far as lombok support goes. - */ -@ProviderFor(IdeFinder.class) -public class MyEclipseFinder extends EclipseFinder { - @Override protected IdeLocation createLocation(String guess) throws CorruptedIdeLocationException { - return new MyEclipseLocationProvider().create0(guess); - } - - @Override protected String getDirName() { - return "myeclipse"; - } - - @Override protected String getMacExecutableName() { - return "myeclipse.app"; - } - - @Override protected String getUnixExecutableName() { - return "myeclipse"; - } - - @Override protected String getWindowsExecutableName() { - return "myeclipse.exe"; - } - - @Override protected List<String> getSourceDirsOnWindows() { - return Arrays.asList("\\", "\\Program Files", "\\Program Files (x86)", System.getProperty("user.home", ".")); - } - - @Override protected List<String> getSourceDirsOnMac() { - return Arrays.asList("/Applications", System.getProperty("user.home", ".")); - } - - @Override protected List<String> getSourceDirsOnUnix() { - return Arrays.asList(System.getProperty("user.home", ".")); - } -} diff --git a/src/installer/lombok/installer/eclipse/MyEclipseLocation.java b/src/installer/lombok/installer/eclipse/MyEclipseLocation.java deleted file mode 100644 index e8f0da21..00000000 --- a/src/installer/lombok/installer/eclipse/MyEclipseLocation.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2009 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.installer.eclipse; - -import lombok.installer.CorruptedIdeLocationException; - -import java.io.File; -import java.net.URL; - -public class MyEclipseLocation extends EclipseLocation { - public MyEclipseLocation(String nameOfLocation, File pathToEclipseIni) throws CorruptedIdeLocationException { - super(nameOfLocation, pathToEclipseIni); - } - - @Override public URL getIdeIcon() { - return MyEclipseLocation.class.getResource("myeclipse.png"); - } - - @Override protected String getIniFileName() { - return "myeclipse.ini"; - } - - @Override protected String getTypeName() { - return "MyEclipse"; - } -} diff --git a/src/installer/lombok/installer/eclipse/MyEclipseLocationProvider.java b/src/installer/lombok/installer/eclipse/MyEclipseLocationProvider.java index 3c3d45be..298cabd6 100644 --- a/src/installer/lombok/installer/eclipse/MyEclipseLocationProvider.java +++ b/src/installer/lombok/installer/eclipse/MyEclipseLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 The Project Lombok Authors. + * Copyright (C) 2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,48 +21,24 @@ */ package lombok.installer.eclipse; -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder.OS; -import lombok.installer.IdeLocation; +import java.util.Collections; + import lombok.installer.IdeLocationProvider; -import org.mangosdk.spi.ProviderFor; -import java.io.File; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; +import org.mangosdk.spi.ProviderFor; @ProviderFor(IdeLocationProvider.class) -public class MyEclipseLocationProvider extends EclipseLocationProvider { - @Override protected List<String> getEclipseExecutableNames() { - return Arrays.asList("myeclipse.app", "myeclipse.exe", "myeclipsec.exe", "myeclipse"); - } - - @Override protected String getIniName() { - return "myeclipse.ini"; - } +public class MyEclipseLocationProvider extends EclipseProductLocationProvider { - @Override protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException { - return new MyEclipseLocation(name, ini); - } - - @Override protected String getMacAppName() { - return "myeclipse.app"; - } - - @Override protected String getUnixAppName() { - return "myeclipse"; - } + private static final EclipseProductDescriptor MY_ECLIPSE = new StandardProductDescriptor( + "MyEclipse", + "myeclipse", + "myeclipse", + MyEclipseLocationProvider.class.getResource("myeclipse.png"), + Collections.<String>emptySet() + ); - @Override public Pattern getLocationSelectors(OS os) { - switch (os) { - case MAC_OS_X: - return Pattern.compile("^(myeclipse|myeclipse\\.ini|myeclipse\\.app)$", Pattern.CASE_INSENSITIVE); - case WINDOWS: - return Pattern.compile("^(myeclipsec?\\.exe|myeclipse\\.ini)$", Pattern.CASE_INSENSITIVE); - default: - case UNIX: - return Pattern.compile("^(myeclipse|myeclipse\\.ini)$", Pattern.CASE_INSENSITIVE); - } + public MyEclipseLocationProvider() { + super(MY_ECLIPSE); } } diff --git a/src/installer/lombok/installer/eclipse/RhdsFinder.java b/src/installer/lombok/installer/eclipse/RhdsFinder.java deleted file mode 100644 index 5e639fa5..00000000 --- a/src/installer/lombok/installer/eclipse/RhdsFinder.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2013 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.installer.eclipse; - -import java.util.Arrays; -import java.util.List; - -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder; -import lombok.installer.IdeLocation; - -import org.mangosdk.spi.ProviderFor; - -/** - * RHDS (Red Hat JBoss Developer Studio) is an eclipse variant. - * Other than different executable names, it's the same as eclipse, as far as lombok support goes. - */ -@ProviderFor(IdeFinder.class) -public class RhdsFinder extends EclipseFinder { - @Override protected IdeLocation createLocation(String guess) throws CorruptedIdeLocationException { - return new RhdsLocationProvider().create0(guess); - } - - @Override protected String getDirName() { - return "studio"; - } - - @Override protected String getMacExecutableName() { - return "devstudio.app"; - } - - @Override protected String getUnixExecutableName() { - return "devstudio"; - } - - @Override protected String getWindowsExecutableName() { - return "devstudio.exe"; - } - - @Override protected List<String> getSourceDirsOnWindows() { - return Arrays.asList("\\", "\\Program Files", "\\Program Files (x86)", System.getProperty("user.home", ".")); - } - - @Override protected List<String> getSourceDirsOnMac() { - return Arrays.asList("/Applications", System.getProperty("user.home", ".")); - } - - @Override protected List<String> getSourceDirsOnUnix() { - return Arrays.asList(System.getProperty("user.home", ".")); - } -} diff --git a/src/installer/lombok/installer/eclipse/RhdsLocation.java b/src/installer/lombok/installer/eclipse/RhdsLocation.java deleted file mode 100644 index dbe1812c..00000000 --- a/src/installer/lombok/installer/eclipse/RhdsLocation.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2013 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.installer.eclipse; - -import java.io.File; -import java.net.URL; - -import lombok.installer.CorruptedIdeLocationException; - -public class RhdsLocation extends EclipseLocation { - public RhdsLocation(String nameOfLocation, File pathToEclipseIni) throws CorruptedIdeLocationException { - super(nameOfLocation, pathToEclipseIni); - } - - @Override public URL getIdeIcon() { - return RhdsLocation.class.getResource("rhds.png"); - } - - @Override protected String getIniFileName() { - return "devstudio.ini"; - } - - @Override protected String getTypeName() { - return "Red Hat JBoss Developer Studio"; - } -} diff --git a/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java b/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java index fabddba2..5e1d303d 100644 --- a/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java +++ b/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 The Project Lombok Authors. + * Copyright (C) 2013-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,49 +21,24 @@ */ package lombok.installer.eclipse; -import java.io.File; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; +import java.util.Collections; -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeLocation; import lombok.installer.IdeLocationProvider; -import lombok.installer.IdeFinder.OS; import org.mangosdk.spi.ProviderFor; @ProviderFor(IdeLocationProvider.class) -public class RhdsLocationProvider extends EclipseLocationProvider { - @Override protected List<String> getEclipseExecutableNames() { - return Arrays.asList("devstudio.app", "devstudio.exe", "devstudioc.exe", "devstudio"); - } - - @Override protected String getIniName() { - return "devstudio.ini"; - } - - @Override protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException { - return new RhdsLocation(name, ini); - } - - @Override protected String getMacAppName() { - return "devstudio.app"; - } +public class RhdsLocationProvider extends EclipseProductLocationProvider { - @Override protected String getUnixAppName() { - return "devstudio"; - } + private static final EclipseProductDescriptor RHDS = new StandardProductDescriptor( + "Red Hat JBoss Developer Studio", + "devstudio", + "studio", + RhdsLocationProvider.class.getResource("rhds.png"), + Collections.<String>emptySet() + ); - @Override public Pattern getLocationSelectors(OS os) { - switch (os) { - case MAC_OS_X: - return Pattern.compile("^(devstudio|devstudio\\.ini|devstudio\\.app)$", Pattern.CASE_INSENSITIVE); - case WINDOWS: - return Pattern.compile("^(devstudioc?\\.exe|devstudio\\.ini)$", Pattern.CASE_INSENSITIVE); - default: - case UNIX: - return Pattern.compile("^(devstudio|devstudio\\.ini)$", Pattern.CASE_INSENSITIVE); - } + public RhdsLocationProvider() { + super(RHDS); } } diff --git a/src/installer/lombok/installer/eclipse/STSFinder.java b/src/installer/lombok/installer/eclipse/STSFinder.java deleted file mode 100644 index 82bc9b80..00000000 --- a/src/installer/lombok/installer/eclipse/STSFinder.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2009 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.installer.eclipse; - -import java.util.Arrays; -import java.util.List; - -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder; -import lombok.installer.IdeLocation; - -import org.mangosdk.spi.ProviderFor; - -/** - * STS (Springsource Tool Suite) is an eclipse variant. - * Other than different executable names, it's the same as eclipse, as far as lombok support goes. - */ -@ProviderFor(IdeFinder.class) -public class STSFinder extends EclipseFinder { - @Override protected IdeLocation createLocation(String guess) throws CorruptedIdeLocationException { - return new STSLocationProvider().create0(guess); - } - - @Override protected String getDirName() { - return "sts"; - } - - @Override protected String getMacExecutableName() { - return "STS.app"; - } - - @Override protected String getUnixExecutableName() { - return "STS"; - } - - @Override protected String getWindowsExecutableName() { - return "STS.exe"; - } - - @Override protected List<String> getSourceDirsOnWindows() { - return Arrays.asList("\\", "\\springsource", "\\Program Files", "\\Program Files (x86)", "\\Program Files\\springsource", "\\Program Files (x86)\\springsource", System.getProperty("user.home", "."), System.getProperty("user.home", ".") + "\\springsource"); - } - - @Override protected List<String> getSourceDirsOnMac() { - return Arrays.asList("/Applications", "/Applications/springsource", System.getProperty("user.home", "."), System.getProperty("user.home", ".") + "/springsource"); - } - - @Override protected List<String> getSourceDirsOnUnix() { - return Arrays.asList(System.getProperty("user.home", "."), System.getProperty("user.home", ".") + "/springsource"); - } -} diff --git a/src/installer/lombok/installer/eclipse/STSLocationProvider.java b/src/installer/lombok/installer/eclipse/STSLocationProvider.java index 7d129838..d2efb956 100644 --- a/src/installer/lombok/installer/eclipse/STSLocationProvider.java +++ b/src/installer/lombok/installer/eclipse/STSLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,49 +21,23 @@ */ package lombok.installer.eclipse; -import java.io.File; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; +import java.util.Collections; -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeLocation; import lombok.installer.IdeLocationProvider; -import lombok.installer.IdeFinder.OS; import org.mangosdk.spi.ProviderFor; @ProviderFor(IdeLocationProvider.class) -public class STSLocationProvider extends EclipseLocationProvider { - @Override protected List<String> getEclipseExecutableNames() { - return Arrays.asList("sts.app", "sts.exe", "stsc.exe", "sts"); - } - - @Override protected String getIniName() { - return "STS.ini"; - } - - @Override protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException { - return new STSLocation(name, ini); - } - - @Override protected String getMacAppName() { - return "STS.app"; - } +public class STSLocationProvider extends EclipseProductLocationProvider { - @Override protected String getUnixAppName() { - return "STS"; - } + private static final EclipseProductDescriptor STS = new StandardProductDescriptor("STS", + "STS", + "sts", + STSLocationProvider.class.getResource("STS.png"), + Collections.singleton("springsource") + ); - @Override public Pattern getLocationSelectors(OS os) { - switch (os) { - case MAC_OS_X: - return Pattern.compile("^(sts|sts\\.ini|sts\\.app)$", Pattern.CASE_INSENSITIVE); - case WINDOWS: - return Pattern.compile("^(stsc?\\.exe|sts\\.ini)$", Pattern.CASE_INSENSITIVE); - default: - case UNIX: - return Pattern.compile("^(sts|sts\\.ini)$", Pattern.CASE_INSENSITIVE); - } + public STSLocationProvider() { + super(STS); } } diff --git a/src/installer/lombok/installer/eclipse/StandardProductDescriptor.java b/src/installer/lombok/installer/eclipse/StandardProductDescriptor.java new file mode 100644 index 00000000..47e103aa --- /dev/null +++ b/src/installer/lombok/installer/eclipse/StandardProductDescriptor.java @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2016 The Project Lombok Authors. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok.installer.eclipse; + +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.regex.Pattern; + +import lombok.installer.OsUtils; + +public class StandardProductDescriptor implements EclipseProductDescriptor { + + private static final String USER_HOME = System.getProperty("user.home", "."); + private static final String[] WINDOWS_ROOTS = {"\\", "\\Program Files", "\\Program Files (x86)", USER_HOME}; + private static final String[] MAC_ROOTS = {"/Applications", USER_HOME}; + private static final String[] UNIX_ROOTS = {USER_HOME}; + + private final String productName; + private final String windowsName; + private final String unixName; + private final String macAppName; + private final List<String> executableNames; + private final List<String> sourceDirsOnWindows; + private final List<String> sourceDirsOnMac; + private final List<String> sourceDirsOnUnix; + private final String iniFileName; + private final Pattern locationSelectors; + private final String directoryName; + private final URL ideIcon; + + public StandardProductDescriptor(String productName, String baseName, String directoryName, URL ideIcon, Collection<String> alternativeDirectoryNames) { + this.productName = productName; + this.windowsName = baseName + ".exe"; + this.unixName = baseName; + this.macAppName = baseName + ".app"; + this.executableNames = executableNames(baseName); + this.sourceDirsOnWindows = generateAlternatives(WINDOWS_ROOTS, "\\", alternativeDirectoryNames); + this.sourceDirsOnMac = generateAlternatives(MAC_ROOTS, "/", alternativeDirectoryNames); + this.sourceDirsOnUnix = generateAlternatives(UNIX_ROOTS, "/", alternativeDirectoryNames); + this.iniFileName = baseName + ".ini"; + this.locationSelectors = getLocationSelectors(baseName); + this.directoryName = directoryName.toLowerCase(); + this.ideIcon = ideIcon; + } + + @Override public String getProductName() { + return productName; + } + + @Override public String getWindowsExecutableName() { + return windowsName; + } + + @Override public String getUnixAppName() { + return unixName; + } + + @Override public String getMacAppName() { + return macAppName; + } + + @Override public String getDirectoryName() { + return directoryName; + } + + @Override public List<String> getExecutableNames() { + return executableNames; + } + + @Override public List<String> getSourceDirsOnWindows() { + return sourceDirsOnWindows; + } + + @Override public List<String> getSourceDirsOnMac() { + return sourceDirsOnMac; + } + + @Override public List<String> getSourceDirsOnUnix() { + return sourceDirsOnUnix; + } + + @Override public String getIniFileName() { + return iniFileName; + } + + @Override public Pattern getLocationSelectors() { + return locationSelectors; + } + + @Override public URL getIdeIcon() { + return ideIcon; + } + + private static Pattern getLocationSelectors(String baseName) { + return Pattern.compile(String.format(platformPattern(), baseName.toLowerCase()), Pattern.CASE_INSENSITIVE); + } + + private static String platformPattern() { + switch (OsUtils.getOS()) { + case MAC_OS_X: + return "^(%s|%<s\\.ini|%<s\\.app)$"; + case WINDOWS: + return "^(%sc?\\.exe|%<s\\.ini)$"; + default: + case UNIX: + return "^(%s|%<s\\.ini)$"; + } + } + + private static List<String> executableNames(String baseName) { + String base = baseName.toLowerCase(); + return Collections.unmodifiableList(Arrays.asList(base, base + ".app", base + ".exe", base + "c.exe")); + } + + private static List<String> generateAlternatives(String[] roots, String pathSeparator, Collection<String> alternatives) { + List<String> result = new ArrayList<String>(); + for (String root : roots) { + result.add(concat(root, pathSeparator, "")); + for (String alternative : alternatives) { + result.add(concat(root, pathSeparator, alternative)); + } + } + return Collections.unmodifiableList(result); + } + + private static String concat(String base, String pathSeparator, String alternative) { + if (alternative.isEmpty()) { + return base; + } + if (base.endsWith(pathSeparator)) { + return base + alternative.replaceAll("[\\/]", "\\" + pathSeparator); + } + return base + pathSeparator + alternative.replaceAll("[\\/]", "\\" + pathSeparator); + } +} diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java index a04ea171..8dee33ad 100644 --- a/test/transform/resource/after-delombok/Accessors.java +++ b/test/transform/resource/after-delombok/Accessors.java @@ -2,11 +2,13 @@ class AccessorsFluent { private String fieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -17,16 +19,19 @@ class AccessorsFluentOnClass { private String otherFieldWithOverride = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -36,6 +41,7 @@ class AccessorsChain { private boolean isRunning; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; @@ -46,6 +52,7 @@ class AccessorsPrefix { private String fActualField; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -55,11 +62,13 @@ class AccessorsPrefix2 { private String fActualField; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFieldName(final String fieldName) { this.fieldName = fieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -72,12 +81,14 @@ class AccessorsPrefix3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "AccessorsPrefix3(fName=" + this.getName() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof AccessorsPrefix3)) return false; @@ -90,12 +101,14 @@ class AccessorsPrefix3 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof AccessorsPrefix3; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -108,6 +121,7 @@ class AccessorsFluentGenerics<T extends Number> { private String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AccessorsFluentGenerics<T> name(final String name) { this.name = name; return this; @@ -117,6 +131,7 @@ class AccessorsFluentNoChaining { private String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void name(final String name) { this.name = name; } @@ -125,6 +140,7 @@ class AccessorsFluentStatic<T extends Number> { private static String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static void name(final String name) { AccessorsFluentStatic.name = name; } diff --git a/test/transform/resource/after-delombok/AccessorsConfiguration.java b/test/transform/resource/after-delombok/AccessorsConfiguration.java index 84a686c8..f98b7939 100644 --- a/test/transform/resource/after-delombok/AccessorsConfiguration.java +++ b/test/transform/resource/after-delombok/AccessorsConfiguration.java @@ -2,11 +2,13 @@ class AccessorsConfiguration { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String fieldName() { return this.m_FieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void fieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -15,6 +17,7 @@ class AccessorsConfiguration2 { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setM_FieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -23,6 +26,7 @@ class AccessorsConfiguration3 { private String fFieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AccessorsConfiguration3 setFieldName(final String fFieldName) { this.fFieldName = fFieldName; return this; diff --git a/test/transform/resource/after-delombok/BuilderChainAndFluent.java b/test/transform/resource/after-delombok/BuilderChainAndFluent.java index dd3a347a..7a1f487e 100644 --- a/test/transform/resource/after-delombok/BuilderChainAndFluent.java +++ b/test/transform/resource/after-delombok/BuilderChainAndFluent.java @@ -2,38 +2,46 @@ class BuilderChainAndFluent { private final int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderChainAndFluent(final int yes) { this.yes = yes; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderChainAndFluentBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderChainAndFluentBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setYes(final int yes) { this.yes = yes; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderChainAndFluent build() { return new BuilderChainAndFluent(yes); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderChainAndFluentBuilder builder() { return new BuilderChainAndFluentBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java index 76e0add1..15d4e25c 100644 --- a/test/transform/resource/after-delombok/BuilderComplex.java +++ b/test/transform/resource/after-delombok/BuilderComplex.java @@ -4,61 +4,74 @@ class BuilderComplex { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class VoidBuilder<T extends Number> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private T number; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int arg2; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String arg3; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private BuilderComplex selfRef; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated VoidBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public VoidBuilder<T> number(final T number) { this.number = number; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public VoidBuilder<T> arg2(final int arg2) { this.arg2 = arg2; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public VoidBuilder<T> arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public VoidBuilder<T> selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void execute() { BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderComplex.VoidBuilder(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T extends Number> VoidBuilder<T> builder() { return new VoidBuilder<T>(); } diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java index 61e237d0..668977ab 100644 --- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java +++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java @@ -5,61 +5,74 @@ class BuilderInstanceMethod<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public class StringBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int show; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private List<T> also; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int $andMe; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated StringBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StringBuilder show(final int show) { this.show = show; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StringBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StringBuilder also(final List<T> also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String build() { return BuilderInstanceMethod.this.create(show, yes, also, $andMe); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderInstanceMethod.StringBuilder(show=" + this.show + ", yes=" + this.yes + ", also=" + this.also + ", $andMe=" + this.$andMe + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StringBuilder builder() { return new StringBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java index a12ad047..ecf74aa3 100644 --- a/test/transform/resource/after-delombok/BuilderSimple.java +++ b/test/transform/resource/after-delombok/BuilderSimple.java @@ -6,49 +6,59 @@ class BuilderSimple<T> { private int $butNotMe; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSimple(final int yes, final List<T> also) { this.yes = yes; this.also = also; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSimpleBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private List<T> also; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSimpleBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSimpleBuilder<T> yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSimpleBuilder<T> also(final List<T> also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSimple<T> build() { return new BuilderSimple<T>(yes, also); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> BuilderSimpleBuilder<T> builder() { return new BuilderSimpleBuilder<T>(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java index 79ffbc8b..851fc3db 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java @@ -12,6 +12,7 @@ class BuilderSingularGuavaListsSets<T> { private ImmutableTable<? extends Number, ? extends Number, String> users; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) { this.cards = cards; this.frogs = frogs; @@ -21,28 +22,36 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularGuavaListsSetsBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder<T> cards; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder<Number> frogs; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableSortedSet.Builder<String> passes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> card(final T card) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); @@ -50,6 +59,7 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); @@ -57,12 +67,14 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> clearCards() { this.cards = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); @@ -70,6 +82,7 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); @@ -77,12 +90,14 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() { this.frogs = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); @@ -90,6 +105,7 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); @@ -97,12 +113,14 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() { this.rawSet = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); @@ -110,6 +128,7 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); @@ -117,12 +136,14 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> clearPasses() { this.passes = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> 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); @@ -130,6 +151,7 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.putAll(users); @@ -137,12 +159,14 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> clearUsers() { this.users = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSets<T> build() { com.google.common.collect.ImmutableList<T> cards = this.cards == null ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build(); com.google.common.collect.ImmutableCollection<Number> frogs = this.frogs == null ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build(); @@ -154,12 +178,14 @@ class BuilderSingularGuavaListsSets<T> { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> BuilderSingularGuavaListsSetsBuilder<T> builder() { return new BuilderSingularGuavaListsSetsBuilder<T>(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java index 1ad8fa83..22a4a750 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java @@ -8,6 +8,7 @@ class BuilderSingularGuavaMaps<K, V> { private ImmutableBiMap rawMap; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) { this.battleaxes = battleaxes; this.vertices = vertices; @@ -15,22 +16,28 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularGuavaMapsBuilder<K, V> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularGuavaMapsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> battleaxe(final K key, final V value) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.put(key, value); @@ -38,6 +45,7 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.putAll(battleaxes); @@ -45,12 +53,14 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() { this.battleaxes = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> vertex(final Integer key, final V value) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.put(key, value); @@ -58,6 +68,7 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.putAll(vertices); @@ -65,12 +76,14 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> clearVertices() { this.vertices = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> 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); @@ -78,6 +91,7 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.putAll(rawMap); @@ -85,12 +99,14 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() { this.rawMap = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMaps<K, V> build() { com.google.common.collect.ImmutableMap<K, V> battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build(); com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build(); @@ -100,12 +116,14 @@ class BuilderSingularGuavaMaps<K, V> { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <K, V> BuilderSingularGuavaMapsBuilder<K, V> builder() { return new BuilderSingularGuavaMapsBuilder<K, V>(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java index 9b409404..03b6ced7 100644 --- a/test/transform/resource/after-delombok/BuilderSingularLists.java +++ b/test/transform/resource/after-delombok/BuilderSingularLists.java @@ -7,6 +7,7 @@ class BuilderSingularLists<T> { private List rawList; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) { this.children = children; this.scarves = scarves; @@ -14,22 +15,28 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularListsBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<T> children; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<Number> scarves; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<java.lang.Object> rawList; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> child(final T child) { if (this.children == null) this.children = new java.util.ArrayList<T>(); this.children.add(child); @@ -37,6 +44,7 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) { if (this.children == null) this.children = new java.util.ArrayList<T>(); this.children.addAll(children); @@ -44,12 +52,14 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> scarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>(); this.scarves.add(scarf); @@ -57,6 +67,7 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) { if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>(); this.scarves.addAll(scarves); @@ -64,12 +75,14 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>(); this.rawList.add(rawList); @@ -77,6 +90,7 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>(); this.rawList.addAll(rawList); @@ -84,12 +98,14 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularLists<T> build() { java.util.List<T> children; switch (this.children == null ? 0 : this.children.size()) { @@ -129,12 +145,14 @@ class BuilderSingularLists<T> { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> BuilderSingularListsBuilder<T> builder() { return new BuilderSingularListsBuilder<T>(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java index d5cd8f41..7e9e1680 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java @@ -5,6 +5,7 @@ class BuilderSingularNoAuto { private List<String> items; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) { this.things = things; this.widgets = widgets; @@ -12,22 +13,28 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularNoAutoBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<String> things; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<String> widgets; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<String> items; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularNoAutoBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder things(final String things) { if (this.things == null) this.things = new java.util.ArrayList<String>(); this.things.add(things); @@ -35,6 +42,7 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder things(final java.util.Collection<? extends String> things) { if (this.things == null) this.things = new java.util.ArrayList<String>(); this.things.addAll(things); @@ -42,12 +50,14 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder widget(final String widget) { if (this.widgets == null) this.widgets = new java.util.ArrayList<String>(); this.widgets.add(widget); @@ -55,6 +65,7 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder widgets(final java.util.Collection<? extends String> widgets) { if (this.widgets == null) this.widgets = new java.util.ArrayList<String>(); this.widgets.addAll(widgets); @@ -62,12 +73,14 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder items(final String items) { if (this.items == null) this.items = new java.util.ArrayList<String>(); this.items.add(items); @@ -75,6 +88,7 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder items(final java.util.Collection<? extends String> items) { if (this.items == null) this.items = new java.util.ArrayList<String>(); this.items.addAll(items); @@ -82,12 +96,14 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAuto build() { java.util.List<String> things; switch (this.things == null ? 0 : this.things.size()) { @@ -127,12 +143,14 @@ class BuilderSingularNoAuto { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAutoBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java index 7ffa647b..e9228db6 100644 --- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java @@ -7,6 +7,7 @@ class BuilderSingularRedirectToGuava { private Collection<Class<?>> doohickeys; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) { this.dangerMice = dangerMice; this.things = things; @@ -14,22 +15,28 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularRedirectToGuavaBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableSet.Builder<String> dangerMice; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularRedirectToGuavaBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); @@ -37,6 +44,7 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable<? extends String> dangerMice) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.addAll(dangerMice); @@ -44,12 +52,14 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder thing(final Integer key, final Number value) { if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.put(key, value); @@ -57,6 +67,7 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map<? extends Integer, ? extends Number> things) { if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.putAll(things); @@ -64,12 +75,14 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder doohickey(final Class<?> doohickey) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); @@ -77,6 +90,7 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.addAll(doohickeys); @@ -84,12 +98,14 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuava build() { java.util.Set<String> dangerMice = this.dangerMice == null ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build(); java.util.NavigableMap<Integer, Number> things = this.things == null ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build(); @@ -99,12 +115,14 @@ class BuilderSingularRedirectToGuava { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuavaBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java index c794726a..4c4e64e1 100644 --- a/test/transform/resource/after-delombok/BuilderSingularSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularSets.java @@ -8,6 +8,7 @@ class BuilderSingularSets<T> { private Set<String> stringSet; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) { this.dangerMice = dangerMice; this.octopodes = octopodes; @@ -16,25 +17,32 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularSetsBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<T> dangerMice; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<Number> octopodes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<java.lang.Object> rawSet; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<String> stringSet; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularSetsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> dangerMouse(final T dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.add(dangerMouse); @@ -42,6 +50,7 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.addAll(dangerMice); @@ -49,12 +58,14 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> clearDangerMice() { if (this.dangerMice != null) this.dangerMice.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> octopus(final Number octopus) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.add(octopus); @@ -62,6 +73,7 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.addAll(octopodes); @@ -69,12 +81,14 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> clearOctopodes() { if (this.octopodes != null) this.octopodes.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.add(rawSet); @@ -82,6 +96,7 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> rawSet(final java.util.Collection<?> rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.addAll(rawSet); @@ -89,12 +104,14 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> clearRawSet() { if (this.rawSet != null) this.rawSet.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> stringSet(final String stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.add(stringSet); @@ -102,6 +119,7 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.addAll(stringSet); @@ -109,12 +127,14 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> clearStringSet() { if (this.stringSet != null) this.stringSet.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSets<T> build() { java.util.Set<T> dangerMice; switch (this.dangerMice == null ? 0 : this.dangerMice.size()) { @@ -163,12 +183,14 @@ class BuilderSingularSets<T> { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> BuilderSingularSetsBuilder<T> builder() { return new BuilderSingularSetsBuilder<T>(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java index b8ffb7d3..37d05704 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java +++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java @@ -2,21 +2,26 @@ class BuilderSingularWithPrefixes { private java.util.List<String> _elems; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularWithPrefixes(final java.util.List<String> elems) { this._elems = elems; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularWithPrefixesBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<String> elems; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularWithPrefixesBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularWithPrefixesBuilder elem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.add(elem); @@ -24,6 +29,7 @@ class BuilderSingularWithPrefixes { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularWithPrefixesBuilder elems(final java.util.Collection<? extends String> elems) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.addAll(elems); @@ -31,12 +37,14 @@ class BuilderSingularWithPrefixes { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularWithPrefixesBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularWithPrefixes build() { java.util.List<String> elems; switch (this.elems == null ? 0 : this.elems.size()) { @@ -54,12 +62,14 @@ class BuilderSingularWithPrefixes { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderSingularWithPrefixesBuilder builder() { return new BuilderSingularWithPrefixesBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderValueData.java b/test/transform/resource/after-delombok/BuilderValueData.java index d08c6149..c8690f2a 100644 --- a/test/transform/resource/after-delombok/BuilderValueData.java +++ b/test/transform/resource/after-delombok/BuilderValueData.java @@ -3,40 +3,48 @@ final class BuilderAndValue { private final int zero = 0; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderAndValue() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderAndValueBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderAndValueBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderAndValue build() { return new BuilderAndValue(); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderAndValue.BuilderAndValueBuilder()"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderAndValueBuilder builder() { return new BuilderAndValueBuilder(); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getZero() { return this.zero; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndValue)) return false; @@ -47,6 +55,7 @@ final class BuilderAndValue { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -56,6 +65,7 @@ final class BuilderAndValue { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderAndValue(zero=" + this.getZero() + ")"; } @@ -65,40 +75,48 @@ class BuilderAndData { private final int zero = 0; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderAndData() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderAndDataBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderAndDataBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderAndData build() { return new BuilderAndData(); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderAndData.BuilderAndDataBuilder()"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderAndDataBuilder builder() { return new BuilderAndDataBuilder(); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getZero() { return this.zero; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof BuilderAndData)) return false; @@ -109,12 +127,14 @@ class BuilderAndData { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof BuilderAndData; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -124,6 +144,7 @@ class BuilderAndData { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderAndData(zero=" + this.getZero() + ")"; } diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java index df02c1f1..e5504c8c 100644 --- a/test/transform/resource/after-delombok/BuilderWithAccessors.java +++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java @@ -5,6 +5,7 @@ class BuilderWithAccessors { private int __bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { this.plower = plower; this.pUpper = upper; @@ -13,61 +14,74 @@ class BuilderWithAccessors { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderWithAccessorsBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int plower; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int upper; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int _bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithAccessorsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithAccessorsBuilder plower(final int plower) { this.plower = plower; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithAccessorsBuilder upper(final int upper) { this.upper = upper; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithAccessorsBuilder foo(final int foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithAccessorsBuilder _bar(final int _bar) { this._bar = _bar; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithAccessors build() { return new BuilderWithAccessors(plower, upper, foo, _bar); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderWithAccessorsBuilder builder() { return new BuilderWithAccessorsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java index fc1cdbb3..e6b09e6f 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java @@ -5,43 +5,51 @@ class BuilderWithExistingBuilderClass<T, K extends Number> { public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private boolean arg2; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String arg3; private Z arg1; public void arg2(boolean arg) { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithExistingBuilderClassBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) { this.arg1 = arg1; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithExistingBuilderClass build() { return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated 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") + @lombok.Generated public static <Z extends Number> BuilderWithExistingBuilderClassBuilder<Z> builder() { return new BuilderWithExistingBuilderClassBuilder<Z>(); } diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java index 7dfb046a..052cdee8 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java +++ b/test/transform/resource/after-delombok/BuilderWithToBuilder.java @@ -9,6 +9,7 @@ class BuilderWithToBuilder<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithToBuilder(final String one, final String two, final T foo, final List<T> bars) { this.mOne = one; this.mTwo = two; @@ -17,43 +18,53 @@ class BuilderWithToBuilder<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderWithToBuilderBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String one; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String two; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private T foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<T> bars; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> one(final String one) { this.one = one; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> two(final String two) { this.two = two; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> foo(final T foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> bar(final T bar) { if (this.bars == null) this.bars = new java.util.ArrayList<T>(); this.bars.add(bar); @@ -61,6 +72,7 @@ class BuilderWithToBuilder<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> bars(final java.util.Collection<? extends T> bars) { if (this.bars == null) this.bars = new java.util.ArrayList<T>(); this.bars.addAll(bars); @@ -68,12 +80,14 @@ class BuilderWithToBuilder<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> clearBars() { if (this.bars != null) this.bars.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilder<T> build() { java.util.List<T> bars; switch (this.bars == null ? 0 : this.bars.size()) { @@ -91,17 +105,20 @@ class BuilderWithToBuilder<T> { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> BuilderWithToBuilderBuilder<T> builder() { return new BuilderWithToBuilderBuilder<T>(); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> toBuilder() { return new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars); } @@ -116,48 +133,58 @@ class ConstructorWithToBuilder<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class ConstructorWithToBuilderBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String mOne; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private T bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated ConstructorWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorWithToBuilderBuilder<T> mOne(final String mOne) { this.mOne = mOne; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorWithToBuilderBuilder<T> bar(final T bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorWithToBuilder<T> build() { return new ConstructorWithToBuilder<T>(mOne, bar); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> ConstructorWithToBuilderBuilder<T> builder() { return new ConstructorWithToBuilderBuilder<T>(); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorWithToBuilderBuilder<T> toBuilder() { return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); } @@ -174,48 +201,58 @@ class StaticWithToBuilder<T, K> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class StaticWithToBuilderBuilder<Z> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String mOne; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private Z bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated StaticWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StaticWithToBuilderBuilder<Z> mOne(final String mOne) { this.mOne = mOne; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StaticWithToBuilderBuilder<Z> bar(final Z bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StaticWithToBuilder build() { return StaticWithToBuilder.<Z>test(mOne, bar); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "StaticWithToBuilder.StaticWithToBuilderBuilder(mOne=" + this.mOne + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <Z> StaticWithToBuilderBuilder<Z> builder() { return new StaticWithToBuilderBuilder<Z>(); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StaticWithToBuilderBuilder<T> toBuilder() { return new StaticWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); } diff --git a/test/transform/resource/after-delombok/BuilderWithTolerate.java b/test/transform/resource/after-delombok/BuilderWithTolerate.java index 6dc7e248..decb05d3 100644 --- a/test/transform/resource/after-delombok/BuilderWithTolerate.java +++ b/test/transform/resource/after-delombok/BuilderWithTolerate.java @@ -12,6 +12,7 @@ public class BuilderWithTolerate { public static class BuilderWithTolerateBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int value; @Tolerate @@ -21,11 +22,13 @@ public class BuilderWithTolerate { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithTolerateBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithTolerateBuilder value(final int value) { this.value = value; return this; @@ -33,6 +36,7 @@ public class BuilderWithTolerate { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithTolerate build() { return new BuilderWithTolerate(value); } @@ -40,6 +44,7 @@ public class BuilderWithTolerate { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value + ")"; } @@ -47,12 +52,14 @@ public class BuilderWithTolerate { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithTolerate(final int value) { this.value = value; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderWithTolerateBuilder builder() { return new BuilderWithTolerateBuilder(); } diff --git a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java index 793ec097..5db0e37a 100644 --- a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java +++ b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java @@ -2,6 +2,7 @@ class GetFoo { private int foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/CommentsInterspersed.java b/test/transform/resource/after-delombok/CommentsInterspersed.java index a1da2c3d..33712fea 100644 --- a/test/transform/resource/after-delombok/CommentsInterspersed.java +++ b/test/transform/resource/after-delombok/CommentsInterspersed.java @@ -13,6 +13,7 @@ public class CommentsInterspersed { }-*/ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getTest() { return this.test; } diff --git a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java index ff5278ff..d8883be1 100644 --- a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java +++ b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java @@ -2,6 +2,7 @@ class ConflictingStaticConstructorNames { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ConflictingStaticConstructorNames)) return false; @@ -11,12 +12,14 @@ class ConflictingStaticConstructorNames { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof ConflictingStaticConstructorNames; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -24,11 +27,13 @@ class ConflictingStaticConstructorNames { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ConflictingStaticConstructorNames()"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConflictingStaticConstructorNames() { } }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/Constructors.java b/test/transform/resource/after-delombok/Constructors.java index c138a00c..e3bb85ab 100644 --- a/test/transform/resource/after-delombok/Constructors.java +++ b/test/transform/resource/after-delombok/Constructors.java @@ -4,6 +4,7 @@ class RequiredArgsConstructor1 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public RequiredArgsConstructor1(final int x) { this.x = x; } @@ -14,6 +15,7 @@ class RequiredArgsConstructorAccess { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected RequiredArgsConstructorAccess(final int x) { this.x = x; } @@ -23,11 +25,13 @@ class RequiredArgsConstructorStaticName { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private RequiredArgsConstructorStaticName(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static RequiredArgsConstructorStaticName staticname(final int x) { return new RequiredArgsConstructorStaticName(x); } @@ -39,6 +43,7 @@ class RequiredArgsConstructorWithAnnotations { @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public RequiredArgsConstructorWithAnnotations(final int x) { this.x = x; } @@ -49,6 +54,7 @@ class AllArgsConstructor1 { @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AllArgsConstructor1(final int x, final String name) { this.x = x; this.name = name; @@ -59,6 +65,7 @@ class NoArgsConstructor1 { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public NoArgsConstructor1() { } } @@ -67,11 +74,13 @@ class RequiredArgsConstructorStaticNameGenerics<T extends Number> { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private RequiredArgsConstructorStaticNameGenerics(final T x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T extends Number> RequiredArgsConstructorStaticNameGenerics<T> of(final T x) { return new RequiredArgsConstructorStaticNameGenerics<T>(x); } @@ -81,11 +90,13 @@ class RequiredArgsConstructorStaticNameGenerics2<T extends Number> { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T extends Number> RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) { return new RequiredArgsConstructorStaticNameGenerics2<T>(x); } @@ -94,6 +105,7 @@ class AllArgsConstructorPackageAccess { final String x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated AllArgsConstructorPackageAccess(final String x) { this.x = x; } @@ -108,6 +120,7 @@ class NoArgsConstructor2 { byte z; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public NoArgsConstructor2() { this.x = 0; this.y = 0.0; diff --git a/test/transform/resource/after-delombok/ConstructorsConfiguration.java b/test/transform/resource/after-delombok/ConstructorsConfiguration.java index effc51b8..3c472c46 100644 --- a/test/transform/resource/after-delombok/ConstructorsConfiguration.java +++ b/test/transform/resource/after-delombok/ConstructorsConfiguration.java @@ -2,6 +2,7 @@ class ConstructorsConfiguration { int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorsConfiguration(final int x) { this.x = x; } @@ -11,6 +12,7 @@ class ConstructorsConfigurationExplicit { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorsConfigurationExplicit(final int x) { this.x = x; } diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java index 43c0ea66..b83c4cec 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java +++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java @@ -7,6 +7,7 @@ class ConstructorsWithAccessors { @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { this.plower = plower; this.pUpper = upper; diff --git a/test/transform/resource/after-delombok/DataConfiguration.java b/test/transform/resource/after-delombok/DataConfiguration.java index aadb35b6..c4accfcc 100644 --- a/test/transform/resource/after-delombok/DataConfiguration.java +++ b/test/transform/resource/after-delombok/DataConfiguration.java @@ -2,17 +2,20 @@ class DataConfiguration { final int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public DataConfiguration(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataConfiguration)) return false; @@ -23,12 +26,14 @@ class DataConfiguration { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataConfiguration; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -38,6 +43,7 @@ class DataConfiguration { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataConfiguration(x=" + this.getX() + ")"; } diff --git a/test/transform/resource/after-delombok/DataExtended.java b/test/transform/resource/after-delombok/DataExtended.java index 175738ad..27c0b44d 100644 --- a/test/transform/resource/after-delombok/DataExtended.java +++ b/test/transform/resource/after-delombok/DataExtended.java @@ -2,21 +2,25 @@ class DataExtended { int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public DataExtended() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataExtended)) return false; @@ -27,12 +31,14 @@ class DataExtended { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataExtended; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -42,6 +48,7 @@ class DataExtended { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataExtended(x=" + this.x + ")"; } diff --git a/test/transform/resource/after-delombok/DataIgnore.java b/test/transform/resource/after-delombok/DataIgnore.java index d5a3d81e..761ce42b 100644 --- a/test/transform/resource/after-delombok/DataIgnore.java +++ b/test/transform/resource/after-delombok/DataIgnore.java @@ -4,17 +4,20 @@ class DataIgnore { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public DataIgnore(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataIgnore)) return false; @@ -25,12 +28,14 @@ class DataIgnore { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataIgnore; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -40,6 +45,7 @@ class DataIgnore { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataIgnore(x=" + this.getX() + ")"; } diff --git a/test/transform/resource/after-delombok/DataOnEnum.java b/test/transform/resource/after-delombok/DataOnEnum.java index b3cd7967..214bae0d 100644 --- a/test/transform/resource/after-delombok/DataOnEnum.java +++ b/test/transform/resource/after-delombok/DataOnEnum.java @@ -3,17 +3,20 @@ public enum DataOnEnum { private final String someField; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getSomeField() { return this.someField; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataOnEnum(someField=" + this.getSomeField() + ")"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private DataOnEnum(final String someField) { this.someField = someField; } diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java index 0e15ab4c..4ac77e5c 100644 --- a/test/transform/resource/after-delombok/DataOnLocalClass.java +++ b/test/transform/resource/after-delombok/DataOnLocalClass.java @@ -5,27 +5,32 @@ class DataOnLocalClass1 { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Local(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local)) return false; @@ -39,12 +44,14 @@ class DataOnLocalClass1 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -56,6 +63,7 @@ class DataOnLocalClass1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Local(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -71,6 +79,7 @@ class DataOnLocalClass2 { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public InnerLocal(@lombok.NonNull final String name) { if (name == null) { throw new java.lang.NullPointerException("name"); @@ -80,11 +89,13 @@ class DataOnLocalClass2 { @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setName(@lombok.NonNull final String name) { if (name == null) { throw new java.lang.NullPointerException("name"); @@ -94,6 +105,7 @@ class DataOnLocalClass2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local.InnerLocal)) return false; @@ -106,12 +118,14 @@ class DataOnLocalClass2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local.InnerLocal; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -122,23 +136,27 @@ class DataOnLocalClass2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Local.InnerLocal(name=" + this.getName() + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Local(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local)) return false; @@ -149,12 +167,14 @@ class DataOnLocalClass2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -164,6 +184,7 @@ class DataOnLocalClass2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Local(x=" + this.getX() + ")"; } diff --git a/test/transform/resource/after-delombok/DataPlain.java b/test/transform/resource/after-delombok/DataPlain.java index ccebc55e..994bdc1f 100644 --- a/test/transform/resource/after-delombok/DataPlain.java +++ b/test/transform/resource/after-delombok/DataPlain.java @@ -4,27 +4,32 @@ class Data1 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Data1(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data1)) return false; @@ -38,12 +43,14 @@ class Data1 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data1; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -55,6 +62,7 @@ class Data1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data1(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -65,27 +73,32 @@ class Data2 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Data2(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data2)) return false; @@ -99,12 +112,14 @@ class Data2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data2; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -116,6 +131,7 @@ class Data2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data2(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -126,27 +142,32 @@ final class Data3 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Data3(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data3)) return false; @@ -160,6 +181,7 @@ final class Data3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -171,6 +193,7 @@ final class Data3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data3(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -181,23 +204,27 @@ final class Data4 extends java.util.Timer { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data4(x=" + this.getX() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data4)) return false; @@ -209,12 +236,14 @@ final class Data4 extends java.util.Timer { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data4; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -226,11 +255,13 @@ final class Data4 extends java.util.Timer { class Data5 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Data5() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data5)) return false; @@ -240,12 +271,14 @@ class Data5 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data5; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -253,6 +286,7 @@ class Data5 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data5()"; } @@ -260,11 +294,13 @@ class Data5 { final class Data6 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Data6() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data6)) return false; @@ -273,6 +309,7 @@ final class Data6 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -280,6 +317,7 @@ final class Data6 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data6()"; } diff --git a/test/transform/resource/after-delombok/DataWithGetter.java b/test/transform/resource/after-delombok/DataWithGetter.java index fb51e262..c93cc10c 100644 --- a/test/transform/resource/after-delombok/DataWithGetter.java +++ b/test/transform/resource/after-delombok/DataWithGetter.java @@ -5,22 +5,26 @@ class DataWithGetter { @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public DataWithGetter(final String z) { this.z = z; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setY(final int y) { this.y = y; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGetter)) return false; @@ -35,12 +39,14 @@ class DataWithGetter { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGetter; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -53,21 +59,25 @@ class DataWithGetter { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataWithGetter(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getY() { return this.y; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getZ() { return this.z; } diff --git a/test/transform/resource/after-delombok/DataWithGetterNone.java b/test/transform/resource/after-delombok/DataWithGetterNone.java index e332db02..dfd30639 100644 --- a/test/transform/resource/after-delombok/DataWithGetterNone.java +++ b/test/transform/resource/after-delombok/DataWithGetterNone.java @@ -5,22 +5,26 @@ class DataWithGetterNone { @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public DataWithGetterNone(final String z) { this.z = z; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setY(final int y) { this.y = y; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGetterNone)) return false; @@ -35,12 +39,14 @@ class DataWithGetterNone { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGetterNone; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -53,6 +59,7 @@ class DataWithGetterNone { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataWithGetterNone(x=" + this.x + ", y=" + this.y + ", z=" + this.z + ")"; } diff --git a/test/transform/resource/after-delombok/DelegateOnGetter.java b/test/transform/resource/after-delombok/DelegateOnGetter.java index 1d25dcc0..ae1ce320 100644 --- a/test/transform/resource/after-delombok/DelegateOnGetter.java +++ b/test/transform/resource/after-delombok/DelegateOnGetter.java @@ -6,6 +6,7 @@ class DelegateOnGetter { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Bar getBar() { java.lang.Object value = this.bar.get(); if (value == null) { @@ -28,11 +29,13 @@ class DelegateOnGetter { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setList(final java.util.ArrayList<java.lang.String> list) { this.getBar().setList(list); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getInt() { return this.getBar().getInt(); } diff --git a/test/transform/resource/after-delombok/DelegateOnGetterNone.java b/test/transform/resource/after-delombok/DelegateOnGetterNone.java index c4de4f88..ee0b1ab8 100644 --- a/test/transform/resource/after-delombok/DelegateOnGetterNone.java +++ b/test/transform/resource/after-delombok/DelegateOnGetterNone.java @@ -6,11 +6,13 @@ class DelegateOnGetterNone { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setList(final java.util.ArrayList<java.lang.String> list) { this.bar.setList(list); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getInt() { return this.bar.getInt(); } diff --git a/test/transform/resource/after-delombok/DelegateOnMethods.java b/test/transform/resource/after-delombok/DelegateOnMethods.java index 5082d961..db8621bc 100644 --- a/test/transform/resource/after-delombok/DelegateOnMethods.java +++ b/test/transform/resource/after-delombok/DelegateOnMethods.java @@ -8,6 +8,8 @@ abstract class DelegateOnMethods { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void bar(final java.util.ArrayList<java.lang.String> list) { this.getBar().bar(list); } diff --git a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java index 00a157f1..135b351d 100644 --- a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java +++ b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java @@ -26,6 +26,8 @@ class DelegatePlain { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void bar(final java.util.ArrayList<java.lang.String> list) { this.bar.bar(list); } @@ -33,6 +35,8 @@ class DelegatePlain { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void foo() { this.foo.foo(); } diff --git a/test/transform/resource/after-delombok/DelegateWithDeprecated.java b/test/transform/resource/after-delombok/DelegateWithDeprecated.java index 6a7651db..0f46f341 100644 --- a/test/transform/resource/after-delombok/DelegateWithDeprecated.java +++ b/test/transform/resource/after-delombok/DelegateWithDeprecated.java @@ -12,17 +12,20 @@ class DelegateWithDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void deprecatedAnnotation() { this.bar.deprecatedAnnotation(); } @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void deprecatedComment() { this.bar.deprecatedComment(); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void notDeprecated() { this.bar.notDeprecated(); } diff --git a/test/transform/resource/after-delombok/DelegateWithVarargs.java b/test/transform/resource/after-delombok/DelegateWithVarargs.java index 1d240524..91d7d466 100644 --- a/test/transform/resource/after-delombok/DelegateWithVarargs.java +++ b/test/transform/resource/after-delombok/DelegateWithVarargs.java @@ -8,21 +8,25 @@ class DelegateWithVarargs { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void justOneParameter(final int... varargs) { this.bar.justOneParameter(varargs); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void multipleParameters(final java.lang.String first, final int... varargs) { this.bar.multipleParameters(first, varargs); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void array(final int[] array) { this.bar.array(array); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void arrayVarargs(final int[]... arrayVarargs) { this.bar.arrayVarargs(arrayVarargs); } diff --git a/test/transform/resource/after-delombok/EncodingUsAscii.java b/test/transform/resource/after-delombok/EncodingUsAscii.java index 4d2b169f..0134f22d 100644 --- a/test/transform/resource/after-delombok/EncodingUsAscii.java +++ b/test/transform/resource/after-delombok/EncodingUsAscii.java @@ -4,6 +4,7 @@ class EncodingUsAscii { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "EncodingUsAscii(foo\u0e51\u0e51=" + this.foo\u0e51\u0e51 + ")"; } diff --git a/test/transform/resource/after-delombok/EncodingUtf8.java b/test/transform/resource/after-delombok/EncodingUtf8.java index b1a7dcd3..d57f1a0a 100644 --- a/test/transform/resource/after-delombok/EncodingUtf8.java +++ b/test/transform/resource/after-delombok/EncodingUtf8.java @@ -3,6 +3,7 @@ class EncodingUtf8 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "EncodingUtf8(foo๑๑=" + this.foo๑๑ + ")"; } diff --git a/test/transform/resource/after-delombok/EqualsAndHashCode.java b/test/transform/resource/after-delombok/EqualsAndHashCode.java index 7ade594a..858913b1 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCode.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCode.java @@ -7,6 +7,7 @@ class EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode)) return false; @@ -25,12 +26,14 @@ class EqualsAndHashCode { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -53,6 +56,7 @@ final class EqualsAndHashCode2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode2)) return false; @@ -67,6 +71,7 @@ final class EqualsAndHashCode2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -84,6 +89,7 @@ final class EqualsAndHashCode3 extends EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode3)) return false; @@ -93,12 +99,14 @@ final class EqualsAndHashCode3 extends EqualsAndHashCode { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode3; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -108,6 +116,7 @@ class EqualsAndHashCode4 extends EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode4)) return false; @@ -118,12 +127,14 @@ class EqualsAndHashCode4 extends EqualsAndHashCode { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode4; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java index 449a1b2e..97da983e 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java @@ -2,6 +2,7 @@ class EqualsAndHashCodeConfigKeys1Parent { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys1Parent)) return false; @@ -11,12 +12,14 @@ class EqualsAndHashCodeConfigKeys1Parent { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys1Parent; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -27,6 +30,7 @@ class EqualsAndHashCodeConfigKeys1 extends EqualsAndHashCodeConfigKeys1Parent { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys1)) return false; @@ -37,12 +41,14 @@ class EqualsAndHashCodeConfigKeys1 extends EqualsAndHashCodeConfigKeys1Parent { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys1; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java index 43c271fa..e823b7d5 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java @@ -2,6 +2,7 @@ class EqualsAndHashCodeConfigKeys2Parent { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys2Parent)) return false; @@ -11,12 +12,14 @@ class EqualsAndHashCodeConfigKeys2Parent { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys2Parent; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -27,6 +30,7 @@ class EqualsAndHashCodeConfigKeys2 extends EqualsAndHashCodeConfigKeys2Parent { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys2)) return false; @@ -38,12 +42,14 @@ class EqualsAndHashCodeConfigKeys2 extends EqualsAndHashCodeConfigKeys2Parent { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys2; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java index 6978bf00..026a74ad 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java @@ -18,6 +18,7 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithExistingMethods3)) return false; @@ -30,6 +31,7 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java index 4cf00601..679ca99d 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java @@ -10,6 +10,7 @@ class EqualsAndHashCodeWithOnParam { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(@Nullable final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithOnParam)) return false; @@ -28,12 +29,14 @@ class EqualsAndHashCodeWithOnParam { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(@Nullable final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithOnParam; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java index 2a75430f..471ee60c 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java +++ b/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java @@ -4,6 +4,7 @@ final class EqualsAndHashCodeOf { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeOf)) return false; @@ -14,6 +15,7 @@ final class EqualsAndHashCodeOf { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -27,6 +29,7 @@ final class EqualsAndHashCodeExclude { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeExclude)) return false; @@ -37,6 +40,7 @@ final class EqualsAndHashCodeExclude { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java b/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java index ebe6e2ed..37626fb5 100644 --- a/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java +++ b/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java @@ -3,6 +3,7 @@ class FieldDefaultsViaConfigAndRequiredArgsConstructor { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { this.x = x; } diff --git a/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java b/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java index 377145e4..5ebd47f1 100644 --- a/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java +++ b/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java @@ -3,6 +3,7 @@ class GenerateSuppressFBWarnings { @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") @javax.annotation.Generated("lombok") + @lombok.Generated public int getY() { return this.y; } diff --git a/test/transform/resource/after-delombok/GeneratedGlobalOff.java b/test/transform/resource/after-delombok/GeneratedGlobalOff.java new file mode 100644 index 00000000..6557b715 --- /dev/null +++ b/test/transform/resource/after-delombok/GeneratedGlobalOff.java @@ -0,0 +1,7 @@ +class GeneratedGlobalOff { + int x; + @java.lang.SuppressWarnings("all") + public int getX() { + return this.x; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/GeneratedGlobalOffJavaxOn.java b/test/transform/resource/after-delombok/GeneratedGlobalOffJavaxOn.java new file mode 100644 index 00000000..de034fe3 --- /dev/null +++ b/test/transform/resource/after-delombok/GeneratedGlobalOffJavaxOn.java @@ -0,0 +1,8 @@ +class GeneratedGlobalOffJavaxOn { + int x; + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + public int getX() { + return this.x; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/GeneratedGlobalOffLombokOn.java b/test/transform/resource/after-delombok/GeneratedGlobalOffLombokOn.java new file mode 100644 index 00000000..40cfa92e --- /dev/null +++ b/test/transform/resource/after-delombok/GeneratedGlobalOffLombokOn.java @@ -0,0 +1,8 @@ +class GeneratedGlobalOffLombokOn { + int x; + @java.lang.SuppressWarnings("all") + @lombok.Generated + public int getX() { + return this.x; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/GeneratedJavaxOff.java b/test/transform/resource/after-delombok/GeneratedJavaxOff.java new file mode 100644 index 00000000..d061ccba --- /dev/null +++ b/test/transform/resource/after-delombok/GeneratedJavaxOff.java @@ -0,0 +1,8 @@ +class GeneratedJavaxOff { + int x; + @java.lang.SuppressWarnings("all") + @lombok.Generated + public int getX() { + return this.x; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/GeneratedLombokOff.java b/test/transform/resource/after-delombok/GeneratedLombokOff.java new file mode 100644 index 00000000..59d146a4 --- /dev/null +++ b/test/transform/resource/after-delombok/GeneratedLombokOff.java @@ -0,0 +1,8 @@ +class GeneratedLombokOff { + int x; + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + public int getX() { + return this.x; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/GetterAccessLevel.java b/test/transform/resource/after-delombok/GetterAccessLevel.java index 217c77a9..2cb70954 100644 --- a/test/transform/resource/after-delombok/GetterAccessLevel.java +++ b/test/transform/resource/after-delombok/GetterAccessLevel.java @@ -12,46 +12,55 @@ class GetterAccessLevel { String value; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private boolean isPrivate() { return this.isPrivate; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated boolean isPackage() { return this.isPackage; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean isProtected() { return this.isProtected; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String getPrivateString() { return this.privateString; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated String getPackageString() { return this.packageString; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected String getProtectedString() { return this.protectedString; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getPublicString() { return this.publicString; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getValue() { return this.value; } diff --git a/test/transform/resource/after-delombok/GetterAlreadyExists.java b/test/transform/resource/after-delombok/GetterAlreadyExists.java index a45df1a9..556ea4a8 100644 --- a/test/transform/resource/after-delombok/GetterAlreadyExists.java +++ b/test/transform/resource/after-delombok/GetterAlreadyExists.java @@ -5,6 +5,7 @@ class Getter1 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isFoo() { return this.foo; } @@ -28,6 +29,7 @@ class Getter4 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -39,6 +41,7 @@ class Getter5 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -56,6 +59,7 @@ class Getter7 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -67,6 +71,7 @@ class Getter8 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -84,6 +89,7 @@ class Getter10 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isFoo() { return this.foo; } @@ -107,6 +113,7 @@ class Getter13 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -118,6 +125,7 @@ class Getter14 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -135,6 +143,7 @@ class Getter16 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -146,6 +155,7 @@ class Getter17 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterBoolean.java b/test/transform/resource/after-delombok/GetterBoolean.java index 49b52483..567ea94d 100644 --- a/test/transform/resource/after-delombok/GetterBoolean.java +++ b/test/transform/resource/after-delombok/GetterBoolean.java @@ -4,16 +4,19 @@ class Getter { boolean hasBaz; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isFoo() { return this.foo; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isBar() { return this.isBar; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isHasBaz() { return this.hasBaz; } @@ -25,6 +28,7 @@ class MoreGetter { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterDeprecated.java b/test/transform/resource/after-delombok/GetterDeprecated.java index d9d09e6c..09938d56 100644 --- a/test/transform/resource/after-delombok/GetterDeprecated.java +++ b/test/transform/resource/after-delombok/GetterDeprecated.java @@ -8,6 +8,7 @@ class GetterDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getAnnotation() { return this.annotation; } @@ -17,6 +18,7 @@ class GetterDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getJavadoc() { return this.javadoc; } diff --git a/test/transform/resource/after-delombok/GetterEnum.java b/test/transform/resource/after-delombok/GetterEnum.java index 841325c0..a74a012a 100644 --- a/test/transform/resource/after-delombok/GetterEnum.java +++ b/test/transform/resource/after-delombok/GetterEnum.java @@ -4,17 +4,20 @@ enum GetterEnum { private final String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private GetterEnum(final int id, final String name) { this.id = id; this.name = name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getId() { return this.id; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } diff --git a/test/transform/resource/after-delombok/GetterLazy.java b/test/transform/resource/after-delombok/GetterLazy.java index 2ea3cbf2..a36175fe 100644 --- a/test/transform/resource/after-delombok/GetterLazy.java +++ b/test/transform/resource/after-delombok/GetterLazy.java @@ -4,6 +4,7 @@ class GetterLazy { private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> fieldName = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>(); @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueType getFieldName() { java.lang.Object value = this.fieldName.get(); if (value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyBoolean.java b/test/transform/resource/after-delombok/GetterLazyBoolean.java index 41349447..bb439e65 100644 --- a/test/transform/resource/after-delombok/GetterLazyBoolean.java +++ b/test/transform/resource/after-delombok/GetterLazyBoolean.java @@ -7,6 +7,7 @@ class GetterLazyBoolean { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterLazyBoolean)) return false; @@ -17,12 +18,14 @@ class GetterLazyBoolean { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterLazyBoolean; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -32,11 +35,13 @@ class GetterLazyBoolean { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "GetterLazyBoolean(booleanValue=" + this.isBooleanValue() + ")"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isBooleanValue() { java.lang.Object value = this.booleanValue.get(); if (value == null) { @@ -53,6 +58,7 @@ class GetterLazyBoolean { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isOtherBooleanValue() { java.lang.Object value = this.otherBooleanValue.get(); if (value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyEahcToString.java b/test/transform/resource/after-delombok/GetterLazyEahcToString.java index 973eb6f1..7995663f 100644 --- a/test/transform/resource/after-delombok/GetterLazyEahcToString.java +++ b/test/transform/resource/after-delombok/GetterLazyEahcToString.java @@ -6,6 +6,7 @@ class GetterLazyEahcToString { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterLazyEahcToString)) return false; @@ -23,6 +24,8 @@ class GetterLazyEahcToString { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterLazyEahcToString; } @@ -30,6 +33,7 @@ class GetterLazyEahcToString { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -43,6 +47,7 @@ class GetterLazyEahcToString { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "GetterLazyEahcToString(value=" + this.getValue() + ", value2=" + this.value2 + ")"; } @@ -50,6 +55,8 @@ class GetterLazyEahcToString { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public String getValue() { java.lang.Object value = this.value.get(); if (value == null) { @@ -67,6 +74,7 @@ class GetterLazyEahcToString { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getValue2() { return this.value2; } diff --git a/test/transform/resource/after-delombok/GetterLazyInvalid.java b/test/transform/resource/after-delombok/GetterLazyInvalid.java index 311b7e4a..2b20c3d4 100644 --- a/test/transform/resource/after-delombok/GetterLazyInvalid.java +++ b/test/transform/resource/after-delombok/GetterLazyInvalid.java @@ -14,6 +14,7 @@ class GetterLazyInvalidClass { private final String fieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFieldName() { return this.fieldName; } diff --git a/test/transform/resource/after-delombok/GetterLazyNative.java b/test/transform/resource/after-delombok/GetterLazyNative.java index 0d88558d..cd0e0303 100644 --- a/test/transform/resource/after-delombok/GetterLazyNative.java +++ b/test/transform/resource/after-delombok/GetterLazyNative.java @@ -10,6 +10,7 @@ class GetterLazyNative { private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> intArrayField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>(); @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isBooleanField() { java.lang.Object value = this.booleanField.get(); if (value == null) { @@ -26,6 +27,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public byte getByteField() { java.lang.Object value = this.byteField.get(); if (value == null) { @@ -42,6 +44,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public short getShortField() { java.lang.Object value = this.shortField.get(); if (value == null) { @@ -58,6 +61,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getIntField() { java.lang.Object value = this.intField.get(); if (value == null) { @@ -74,6 +78,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public long getLongField() { java.lang.Object value = this.longField.get(); if (value == null) { @@ -90,6 +95,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public float getFloatField() { java.lang.Object value = this.floatField.get(); if (value == null) { @@ -106,6 +112,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public double getDoubleField() { java.lang.Object value = this.doubleField.get(); if (value == null) { @@ -122,6 +129,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public char getCharField() { java.lang.Object value = this.charField.get(); if (value == null) { @@ -138,6 +146,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int[] getIntArrayField() { java.lang.Object value = this.intArrayField.get(); if (value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyTransient.java b/test/transform/resource/after-delombok/GetterLazyTransient.java index dbebad90..a3327a6e 100644 --- a/test/transform/resource/after-delombok/GetterLazyTransient.java +++ b/test/transform/resource/after-delombok/GetterLazyTransient.java @@ -4,6 +4,7 @@ class GetterLazyTransient { private final transient int nonLazyTransientField = 3; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getNonTransientField() { java.lang.Object value = this.nonTransientField.get(); if (value == null) { @@ -20,6 +21,7 @@ class GetterLazyTransient { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getNonLazyTransientField() { return this.nonLazyTransientField; } diff --git a/test/transform/resource/after-delombok/GetterNone.java b/test/transform/resource/after-delombok/GetterNone.java index 743ff468..a24b04fa 100644 --- a/test/transform/resource/after-delombok/GetterNone.java +++ b/test/transform/resource/after-delombok/GetterNone.java @@ -3,6 +3,7 @@ class GetterNone { int foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/GetterOnClass.java b/test/transform/resource/after-delombok/GetterOnClass.java index a509f5cb..a9d1280c 100644 --- a/test/transform/resource/after-delombok/GetterOnClass.java +++ b/test/transform/resource/after-delombok/GetterOnClass.java @@ -3,6 +3,7 @@ class GetterOnClass1 { boolean isPublic; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @@ -13,11 +14,13 @@ class GetterOnClass2 { boolean isPackage; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean isProtected() { return this.isProtected; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated boolean isPackage() { return this.isPackage; } @@ -27,6 +30,7 @@ class GetterOnClass3 { boolean isPackage; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated boolean isPackage() { return this.isPackage; } @@ -36,6 +40,7 @@ class GetterOnClass4 { boolean isPrivate; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private boolean isPrivate() { return this.isPrivate; } @@ -45,6 +50,7 @@ class GetterOnClass5 { boolean isPublic; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @@ -55,12 +61,14 @@ class GetterOnClass6 { String nonNull; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getCouldBeNull() { return this.couldBeNull; } @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getNonNull() { return this.nonNull; } diff --git a/test/transform/resource/after-delombok/GetterOnMethod.java b/test/transform/resource/after-delombok/GetterOnMethod.java index 37ae83a4..8496e984 100644 --- a/test/transform/resource/after-delombok/GetterOnMethod.java +++ b/test/transform/resource/after-delombok/GetterOnMethod.java @@ -7,6 +7,7 @@ class GetterOnMethod { @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getI() { return this.i; } @@ -14,6 +15,7 @@ class GetterOnMethod { @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getJ() { return this.j; } @@ -21,6 +23,7 @@ class GetterOnMethod { @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getK() { return this.k; } diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors.java b/test/transform/resource/after-delombok/GetterOnMethodErrors.java index 094f989a..55949391 100644 --- a/test/transform/resource/after-delombok/GetterOnMethodErrors.java +++ b/test/transform/resource/after-delombok/GetterOnMethodErrors.java @@ -4,6 +4,7 @@ class GetterOnMethodErrors { private int test; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getTest() { return this.test; } diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java index 3114d23d..2ef4ac8e 100644 --- a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java +++ b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java @@ -11,38 +11,45 @@ class GetterOnMethodErrors2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getBad1() { return this.bad1; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getBad2() { return this.bad2; } @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getBad3() { return this.bad3; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getBad4() { return this.bad4; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getGood1() { return this.good1; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getGood2() { return this.good2; } @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getGood3() { return this.good3; } @@ -50,6 +57,7 @@ class GetterOnMethodErrors2 { @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getGood4() { return this.good4; } diff --git a/test/transform/resource/after-delombok/GetterOnStatic.java b/test/transform/resource/after-delombok/GetterOnStatic.java index 34c2dba1..d7ddca69 100644 --- a/test/transform/resource/after-delombok/GetterOnStatic.java +++ b/test/transform/resource/after-delombok/GetterOnStatic.java @@ -3,11 +3,13 @@ class Getter { static int bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static boolean isFoo() { return Getter.foo; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static int getBar() { return Getter.bar; } diff --git a/test/transform/resource/after-delombok/GetterPlain.java b/test/transform/resource/after-delombok/GetterPlain.java index 1cdfef8f..d489d63e 100644 --- a/test/transform/resource/after-delombok/GetterPlain.java +++ b/test/transform/resource/after-delombok/GetterPlain.java @@ -3,11 +3,13 @@ class GetterPlain { int foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getI() { return this.i; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterSetterJavadoc.java b/test/transform/resource/after-delombok/GetterSetterJavadoc.java index f156de92..21b339e8 100644 --- a/test/transform/resource/after-delombok/GetterSetterJavadoc.java +++ b/test/transform/resource/after-delombok/GetterSetterJavadoc.java @@ -5,6 +5,7 @@ class GetterSetterJavadoc1 { private int fieldName; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public GetterSetterJavadoc1() { } /** @@ -14,6 +15,7 @@ class GetterSetterJavadoc1 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -24,12 +26,14 @@ class GetterSetterJavadoc1 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterSetterJavadoc1)) return false; @@ -40,12 +44,14 @@ class GetterSetterJavadoc1 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterSetterJavadoc1; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -55,6 +61,7 @@ class GetterSetterJavadoc1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "GetterSetterJavadoc1(fieldName=" + this.getFieldName() + ")"; } @@ -71,6 +78,7 @@ class GetterSetterJavadoc2 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -81,6 +89,7 @@ class GetterSetterJavadoc2 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @@ -96,6 +105,7 @@ class GetterSetterJavadoc3 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -105,6 +115,7 @@ class GetterSetterJavadoc3 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @@ -121,6 +132,7 @@ class GetterSetterJavadoc4 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int fieldName() { return this.fieldName; } @@ -132,6 +144,7 @@ class GetterSetterJavadoc4 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public GetterSetterJavadoc4 fieldName(final int fieldName) { this.fieldName = fieldName; return this; @@ -148,6 +161,7 @@ class GetterSetterJavadoc5 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int fieldName() { return this.fieldName; } @@ -158,6 +172,7 @@ class GetterSetterJavadoc5 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public GetterSetterJavadoc5 fieldName(final int fieldName) { this.fieldName = fieldName; return this; diff --git a/test/transform/resource/after-delombok/GetterWithDollar.java b/test/transform/resource/after-delombok/GetterWithDollar.java index 21e5fac8..5ee3774f 100644 --- a/test/transform/resource/after-delombok/GetterWithDollar.java +++ b/test/transform/resource/after-delombok/GetterWithDollar.java @@ -2,6 +2,7 @@ class GetterWithDollar1 { int $i; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int get$i() { return this.$i; } @@ -11,11 +12,13 @@ class GetterWithDollar2 { int i; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int get$i() { return this.$i; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/InjectField.java b/test/transform/resource/after-delombok/InjectField.java index 8215f8d0..5adc5074 100644 --- a/test/transform/resource/after-delombok/InjectField.java +++ b/test/transform/resource/after-delombok/InjectField.java @@ -6,12 +6,16 @@ enum InjectField1 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName()); @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.lang.Object $LOCK = new java.lang.Object[0]; private static final String LOG_MESSAGE = "static initializer"; @@ -40,9 +44,11 @@ enum InjectField1 { class InjectField2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName()); @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; private static final String LOG_MESSAGE = "static initializer"; @@ -61,6 +67,7 @@ class InjectField2 { class InjectField3 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName()); static { log.log(Level.FINE, "static initializer"); diff --git a/test/transform/resource/after-delombok/LoggerCommons.java b/test/transform/resource/after-delombok/LoggerCommons.java index 85ad75b7..613c8c99 100644 --- a/test/transform/resource/after-delombok/LoggerCommons.java +++ b/test/transform/resource/after-delombok/LoggerCommons.java @@ -1,15 +1,18 @@ class LoggerCommons { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class); } class LoggerCommonsWithImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class); } class LoggerCommonsWithDifferentName { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("DifferentName"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerConfig.java b/test/transform/resource/after-delombok/LoggerConfig.java index fcfb118f..ab7671c6 100644 --- a/test/transform/resource/after-delombok/LoggerConfig.java +++ b/test/transform/resource/after-delombok/LoggerConfig.java @@ -1,5 +1,6 @@ class LoggerWithConfig { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private final org.slf4j.Logger myLogger = org.slf4j.LoggerFactory.getLogger(LoggerWithConfig.class); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerJBossLog.java b/test/transform/resource/after-delombok/LoggerJBossLog.java index 8769f1a2..2c62da68 100644 --- a/test/transform/resource/after-delombok/LoggerJBossLog.java +++ b/test/transform/resource/after-delombok/LoggerJBossLog.java @@ -1,17 +1,20 @@ class LoggerJBossLog { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated 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") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithImport.class); } class LoggerJBossLogOuter { static class Inner { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); } } @@ -19,5 +22,6 @@ class LoggerJBossLogOuter { class LoggerJBossLogWithDifferentLoggerName { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger("DifferentLogger"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerJul.java b/test/transform/resource/after-delombok/LoggerJul.java index eabfb94a..66bb5099 100644 --- a/test/transform/resource/after-delombok/LoggerJul.java +++ b/test/transform/resource/after-delombok/LoggerJul.java @@ -1,15 +1,18 @@ class LoggerJul { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated 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") + @lombok.Generated 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") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("DifferentName"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerLog4j.java b/test/transform/resource/after-delombok/LoggerLog4j.java index 39667670..e161c9fe 100644 --- a/test/transform/resource/after-delombok/LoggerLog4j.java +++ b/test/transform/resource/after-delombok/LoggerLog4j.java @@ -1,15 +1,18 @@ class LoggerLog4j { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated 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") + @lombok.Generated 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") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("DifferentName"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerLog4j2.java b/test/transform/resource/after-delombok/LoggerLog4j2.java index 4d1ef01f..f0ae54db 100644 --- a/test/transform/resource/after-delombok/LoggerLog4j2.java +++ b/test/transform/resource/after-delombok/LoggerLog4j2.java @@ -1,15 +1,18 @@ class LoggerLog4j2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class); } class LoggerLog4j2WithImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class); } class LoggerLog4j2WithDifferentName { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger("DifferentName"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerSlf4j.java b/test/transform/resource/after-delombok/LoggerSlf4j.java index 91109145..3178bd63 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4j.java +++ b/test/transform/resource/after-delombok/LoggerSlf4j.java @@ -1,17 +1,20 @@ class LoggerSlf4j { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); } class LoggerSlf4jWithImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class); } class LoggerSlf4jOuter { static class Inner { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } @@ -19,5 +22,6 @@ class LoggerSlf4jOuter { class LoggerSlf4jWithDifferentLoggerName { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("DifferentLogger"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java index a4e13afc..0fa5615d 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java @@ -6,18 +6,21 @@ enum LoggerSlf4jTypesEnum { ; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class); } enum LoggerSlf4jTypesEnumWithElement { FOO; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class); } interface LoggerSlf4jTypesInterfaceOuter { class Inner { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java index 8a1d543f..b83a1140 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java @@ -2,12 +2,14 @@ package before; class LoggerSlf4jWithPackage { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class); } class LoggerSlf4jWithPackageOuter { static class Inner { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } diff --git a/test/transform/resource/after-delombok/LoggerXSlf4j.java b/test/transform/resource/after-delombok/LoggerXSlf4j.java index ec1c3e4e..7da0247c 100644 --- a/test/transform/resource/after-delombok/LoggerXSlf4j.java +++ b/test/transform/resource/after-delombok/LoggerXSlf4j.java @@ -1,15 +1,18 @@ class LoggerXSlf4j { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated 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") + @lombok.Generated 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") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger("DifferentName"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/MixGetterVal.java b/test/transform/resource/after-delombok/MixGetterVal.java index ee747e2a..d5c36f39 100644 --- a/test/transform/resource/after-delombok/MixGetterVal.java +++ b/test/transform/resource/after-delombok/MixGetterVal.java @@ -10,6 +10,7 @@ class MixGetterVal { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/MultiFieldGetter.java b/test/transform/resource/after-delombok/MultiFieldGetter.java index 8ed250e1..9d21e7f0 100644 --- a/test/transform/resource/after-delombok/MultiFieldGetter.java +++ b/test/transform/resource/after-delombok/MultiFieldGetter.java @@ -3,11 +3,13 @@ class MultiFieldGetter { int y; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected int getY() { return this.y; } @@ -17,11 +19,13 @@ class MultiFieldGetter2 { int y; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated int getY() { return this.y; } diff --git a/test/transform/resource/after-delombok/NoArgsConstructorForce.java b/test/transform/resource/after-delombok/NoArgsConstructorForce.java index c1127c7c..f0071a31 100644 --- a/test/transform/resource/after-delombok/NoArgsConstructorForce.java +++ b/test/transform/resource/after-delombok/NoArgsConstructorForce.java @@ -6,6 +6,7 @@ public class NoArgsConstructorForce { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public NoArgsConstructorForce() { this.i = null; this.o = null; diff --git a/test/transform/resource/after-delombok/NonNullPlain.java b/test/transform/resource/after-delombok/NonNullPlain.java index 52a80c1a..46f7699d 100644 --- a/test/transform/resource/after-delombok/NonNullPlain.java +++ b/test/transform/resource/after-delombok/NonNullPlain.java @@ -13,6 +13,7 @@ class NonNullPlain { @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) { if (s == null) { throw new java.lang.NullPointerException("s"); @@ -23,27 +24,32 @@ class NonNullPlain { @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getI() { return this.i; } @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getS() { return this.s; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Object getO() { return this.o; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setI(@lombok.NonNull final int i) { this.i = i; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setS(@lombok.NonNull final String s) { if (s == null) { throw new java.lang.NullPointerException("s"); @@ -52,6 +58,7 @@ class NonNullPlain { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setO(final Object o) { this.o = o; } diff --git a/test/transform/resource/after-delombok/NonNullWithAlternateException.java b/test/transform/resource/after-delombok/NonNullWithAlternateException.java index 9b606076..1c0179c0 100644 --- a/test/transform/resource/after-delombok/NonNullWithAlternateException.java +++ b/test/transform/resource/after-delombok/NonNullWithAlternateException.java @@ -9,6 +9,7 @@ public class NonNullWithAlternateException { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setTest(@lombok.NonNull final String test) { if (test == null) { throw new java.lang.IllegalArgumentException("test is null"); diff --git a/test/transform/resource/after-delombok/SetterAccessLevel.java b/test/transform/resource/after-delombok/SetterAccessLevel.java index 0bf20cd7..eff16797 100644 --- a/test/transform/resource/after-delombok/SetterAccessLevel.java +++ b/test/transform/resource/after-delombok/SetterAccessLevel.java @@ -7,26 +7,31 @@ class SetterAccessLevel { boolean value; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected void setProtected(final boolean isProtected) { this.isProtected = isProtected; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setValue(final boolean value) { this.value = value; } diff --git a/test/transform/resource/after-delombok/SetterAlreadyExists.java b/test/transform/resource/after-delombok/SetterAlreadyExists.java index 52e0ca10..5f492d07 100644 --- a/test/transform/resource/after-delombok/SetterAlreadyExists.java +++ b/test/transform/resource/after-delombok/SetterAlreadyExists.java @@ -24,6 +24,7 @@ class Setter5 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFoo(final String foo) { this.foo = foo; } @@ -34,6 +35,7 @@ class Setter6 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFoo(final String foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/SetterDeprecated.java b/test/transform/resource/after-delombok/SetterDeprecated.java index 7e984c6d..9d19d06c 100644 --- a/test/transform/resource/after-delombok/SetterDeprecated.java +++ b/test/transform/resource/after-delombok/SetterDeprecated.java @@ -8,6 +8,7 @@ class SetterDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setAnnotation(final int annotation) { this.annotation = annotation; } @@ -17,6 +18,7 @@ class SetterDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setJavadoc(final int javadoc) { this.javadoc = javadoc; } diff --git a/test/transform/resource/after-delombok/SetterOnClass.java b/test/transform/resource/after-delombok/SetterOnClass.java index eaf57def..2821ed05 100644 --- a/test/transform/resource/after-delombok/SetterOnClass.java +++ b/test/transform/resource/after-delombok/SetterOnClass.java @@ -3,6 +3,7 @@ class SetterOnClass1 { boolean isPublic; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @@ -13,11 +14,13 @@ class SetterOnClass2 { boolean isPackage; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected void setProtected(final boolean isProtected) { this.isProtected = isProtected; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @@ -27,6 +30,7 @@ class SetterOnClass3 { boolean isPackage; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @@ -36,6 +40,7 @@ class SetterOnClass4 { boolean isPrivate; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @@ -45,6 +50,7 @@ class SetterOnClass5 { boolean isPublic; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @@ -55,11 +61,13 @@ class SetterOnClass6 { String nonNull; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setCouldBeNull(final String couldBeNull) { this.couldBeNull = couldBeNull; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setNonNull(@lombok.NonNull final String nonNull) { if (nonNull == null) { throw new java.lang.NullPointerException("nonNull"); diff --git a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java index c166f936..b9da6342 100644 --- a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java +++ b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java @@ -7,6 +7,7 @@ class SetterOnMethodOnParam { @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setI(final int i) { this.i = i; } @@ -14,6 +15,7 @@ class SetterOnMethodOnParam { @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setJ(@Test final int j) { this.j = j; } @@ -21,6 +23,7 @@ class SetterOnMethodOnParam { @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setK(@Test final int k) { this.k = k; } diff --git a/test/transform/resource/after-delombok/SetterOnStatic.java b/test/transform/resource/after-delombok/SetterOnStatic.java index a1947b36..4612df2b 100644 --- a/test/transform/resource/after-delombok/SetterOnStatic.java +++ b/test/transform/resource/after-delombok/SetterOnStatic.java @@ -3,11 +3,13 @@ class Setter { static int bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static void setFoo(final boolean foo) { Setter.foo = foo; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static void setBar(final int bar) { Setter.bar = bar; } diff --git a/test/transform/resource/after-delombok/SetterPlain.java b/test/transform/resource/after-delombok/SetterPlain.java index 3f55bd21..3aaf89d5 100644 --- a/test/transform/resource/after-delombok/SetterPlain.java +++ b/test/transform/resource/after-delombok/SetterPlain.java @@ -3,11 +3,13 @@ class SetterPlain { int foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setI(final int i) { this.i = i; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFoo(final int foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/SetterWithDollar.java b/test/transform/resource/after-delombok/SetterWithDollar.java index 3bdafa1b..cd8b0f21 100644 --- a/test/transform/resource/after-delombok/SetterWithDollar.java +++ b/test/transform/resource/after-delombok/SetterWithDollar.java @@ -4,6 +4,8 @@ class SetterWithDollar1 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void set$i(final int $i) { this.$i = $i; } @@ -15,11 +17,14 @@ class SetterWithDollar2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void set$i(final int $i) { this.$i = $i; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setI(final int i) { this.i = i; } diff --git a/test/transform/resource/after-delombok/SimpleTypeResolution.java b/test/transform/resource/after-delombok/SimpleTypeResolution.java index 1e45bb79..0360e80e 100644 --- a/test/transform/resource/after-delombok/SimpleTypeResolution.java +++ b/test/transform/resource/after-delombok/SimpleTypeResolution.java @@ -6,6 +6,7 @@ class SimpleTypeResolutionSuccess { private int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/SynchronizedPlain.java b/test/transform/resource/after-delombok/SynchronizedPlain.java index f0082faf..4e9ecac1 100644 --- a/test/transform/resource/after-delombok/SynchronizedPlain.java +++ b/test/transform/resource/after-delombok/SynchronizedPlain.java @@ -1,6 +1,7 @@ class SynchronizedPlain1 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; void test() { synchronized (this.$lock) { @@ -16,6 +17,7 @@ class SynchronizedPlain1 { class SynchronizedPlain2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.lang.Object $LOCK = new java.lang.Object[0]; static void test() { synchronized (SynchronizedPlain2.$LOCK) { diff --git a/test/transform/resource/after-delombok/ToStringConfiguration.java b/test/transform/resource/after-delombok/ToStringConfiguration.java index c44f8b75..85d02c61 100644 --- a/test/transform/resource/after-delombok/ToStringConfiguration.java +++ b/test/transform/resource/after-delombok/ToStringConfiguration.java @@ -3,11 +3,13 @@ class ToStringConfiguration { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration(" + this.x + ")"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @@ -17,6 +19,7 @@ class ToStringConfiguration2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration2(x=" + this.x + ")"; } @@ -26,11 +29,13 @@ class ToStringConfiguration3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration3(" + this.getX() + ")"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/ToStringInner.java b/test/transform/resource/after-delombok/ToStringInner.java index e8cea8fd..095b8c05 100644 --- a/test/transform/resource/after-delombok/ToStringInner.java +++ b/test/transform/resource/after-delombok/ToStringInner.java @@ -6,6 +6,7 @@ class ToStringOuter { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringInner(y=" + this.y + ")"; } @@ -15,6 +16,7 @@ class ToStringOuter { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringStaticInner(y=" + this.y + ")"; } @@ -25,6 +27,7 @@ class ToStringOuter { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name + ")"; } @@ -34,6 +37,7 @@ class ToStringOuter { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter(x=" + this.x + ", name=" + this.name + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringPlain.java b/test/transform/resource/after-delombok/ToStringPlain.java index a4265575..07bb0a87 100644 --- a/test/transform/resource/after-delombok/ToStringPlain.java +++ b/test/transform/resource/after-delombok/ToStringPlain.java @@ -4,6 +4,7 @@ class ToString1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToString1(x=" + this.x + ", name=" + this.name + ")"; } @@ -14,6 +15,7 @@ class ToString2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToString2(x=" + this.x + ", name=" + this.name + ")"; } diff --git a/test/transform/resource/after-delombok/Tolerate.java b/test/transform/resource/after-delombok/Tolerate.java index 387739af..089f732f 100644 --- a/test/transform/resource/after-delombok/Tolerate.java +++ b/test/transform/resource/after-delombok/Tolerate.java @@ -12,6 +12,8 @@ class Tolerate { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void setPattern(final Pattern pattern) { this.pattern = pattern; } @@ -19,6 +21,8 @@ class Tolerate { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public Pattern getPattern() { return this.pattern; } @@ -38,6 +42,8 @@ class Tolerate2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public Pattern getPattern() { return this.pattern; } @@ -45,6 +51,8 @@ class Tolerate2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public Tolerate2 withPattern(final Pattern pattern) { return this.pattern == pattern ? this : new Tolerate2(pattern); } @@ -52,6 +60,7 @@ class Tolerate2 { @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Tolerate2(final Pattern pattern) { this.pattern = pattern; } diff --git a/test/transform/resource/after-delombok/TrickyTypeResolution.java b/test/transform/resource/after-delombok/TrickyTypeResolution.java index 6badfbf4..05a31da6 100644 --- a/test/transform/resource/after-delombok/TrickyTypeResolution.java +++ b/test/transform/resource/after-delombok/TrickyTypeResolution.java @@ -15,6 +15,7 @@ class TrickySuccess { int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/UtilityClass.java b/test/transform/resource/after-delombok/UtilityClass.java index 6b3c1761..80bb1b7c 100644 --- a/test/transform/resource/after-delombok/UtilityClass.java +++ b/test/transform/resource/after-delombok/UtilityClass.java @@ -8,6 +8,7 @@ final class UtilityClass { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private UtilityClass() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -18,6 +19,7 @@ class UtilityInner { static int member; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private InnerInnerInner() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -29,6 +31,7 @@ class UtilityInner { static int member; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private InsideEnum() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -39,6 +42,7 @@ class UtilityInner { static int member; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private InsideInterface() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } diff --git a/test/transform/resource/after-delombok/ValueCallSuper.java b/test/transform/resource/after-delombok/ValueCallSuper.java index e0065885..79dcead3 100644 --- a/test/transform/resource/after-delombok/ValueCallSuper.java +++ b/test/transform/resource/after-delombok/ValueCallSuper.java @@ -3,11 +3,13 @@ class ValueParent { final class ValueCallSuper extends ValueParent { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueCallSuper() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueCallSuper)) return false; @@ -18,12 +20,14 @@ final class ValueCallSuper extends ValueParent { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof ValueCallSuper; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -33,6 +37,7 @@ final class ValueCallSuper extends ValueParent { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ValueCallSuper()"; } diff --git a/test/transform/resource/after-delombok/ValueExperimental.java b/test/transform/resource/after-delombok/ValueExperimental.java index 20e7a9f4..723cfe87 100644 --- a/test/transform/resource/after-delombok/ValueExperimental.java +++ b/test/transform/resource/after-delombok/ValueExperimental.java @@ -1,11 +1,13 @@ final class ValueExperimental1 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueExperimental1() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueExperimental1)) return false; @@ -14,6 +16,7 @@ final class ValueExperimental1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -21,6 +24,7 @@ final class ValueExperimental1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ValueExperimental1()"; } @@ -28,11 +32,13 @@ final class ValueExperimental1 { final class ValueExperimental2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueExperimental2() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueExperimental2)) return false; @@ -41,6 +47,7 @@ final class ValueExperimental2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -48,6 +55,7 @@ final class ValueExperimental2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ValueExperimental2()"; } diff --git a/test/transform/resource/after-delombok/ValueExperimentalStarImport.java b/test/transform/resource/after-delombok/ValueExperimentalStarImport.java index ea9c4600..add5b3d6 100644 --- a/test/transform/resource/after-delombok/ValueExperimentalStarImport.java +++ b/test/transform/resource/after-delombok/ValueExperimentalStarImport.java @@ -2,12 +2,14 @@ import lombok.experimental.*; final class ValueExperimentalStarImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueExperimentalStarImport() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueExperimentalStarImport)) return false; @@ -16,6 +18,7 @@ final class ValueExperimentalStarImport { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -23,6 +26,7 @@ final class ValueExperimentalStarImport { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ValueExperimentalStarImport()"; } diff --git a/test/transform/resource/after-delombok/ValuePlain.java b/test/transform/resource/after-delombok/ValuePlain.java index 056cdacf..f20f4aea 100644 --- a/test/transform/resource/after-delombok/ValuePlain.java +++ b/test/transform/resource/after-delombok/ValuePlain.java @@ -4,23 +4,27 @@ final class Value1 { @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Value1(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value1)) return false; @@ -34,6 +38,7 @@ final class Value1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -45,6 +50,7 @@ final class Value1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Value1(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -55,23 +61,27 @@ class Value2 { @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Value2(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value2)) return false; @@ -85,12 +95,14 @@ class Value2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Value2; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -102,6 +114,7 @@ class Value2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Value2(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -112,23 +125,27 @@ final class Value3 { @java.beans.ConstructorProperties({"x", "y"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Value3(final int x, final int y) { this.x = x; this.y = y; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getY() { return this.y; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value3)) return false; @@ -140,6 +157,7 @@ final class Value3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -150,6 +168,7 @@ final class Value3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Value3(x=" + this.getX() + ", y=" + this.getY() + ")"; } diff --git a/test/transform/resource/after-delombok/ValueStaticField.java b/test/transform/resource/after-delombok/ValueStaticField.java index b4d60724..d5334869 100644 --- a/test/transform/resource/after-delombok/ValueStaticField.java +++ b/test/transform/resource/after-delombok/ValueStaticField.java @@ -3,11 +3,13 @@ final class ValueStaticField { static String PASSWORD = "Ken sent me"; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueStaticField() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueStaticField)) return false; @@ -16,6 +18,7 @@ final class ValueStaticField { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -23,6 +26,7 @@ final class ValueStaticField { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ValueStaticField()"; } diff --git a/test/transform/resource/after-delombok/WitherAccessLevel.java b/test/transform/resource/after-delombok/WitherAccessLevel.java index 7ec03215..b828c5c6 100644 --- a/test/transform/resource/after-delombok/WitherAccessLevel.java +++ b/test/transform/resource/after-delombok/WitherAccessLevel.java @@ -9,26 +9,31 @@ class WitherAccessLevel { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private WitherAccessLevel withPrivate(final boolean isPrivate) { return this.isPrivate == isPrivate ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated WitherAccessLevel withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected WitherAccessLevel withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherAccessLevel withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherAccessLevel withValue(final boolean value) { return this.value == value ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value); } diff --git a/test/transform/resource/after-delombok/WitherAlreadyExists.java b/test/transform/resource/after-delombok/WitherAlreadyExists.java index 48dda94d..352d3f18 100644 --- a/test/transform/resource/after-delombok/WitherAlreadyExists.java +++ b/test/transform/resource/after-delombok/WitherAlreadyExists.java @@ -34,6 +34,7 @@ class Wither5 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Wither5 withFoo(final String foo) { return this.foo == foo ? this : new Wither5(foo); } @@ -46,6 +47,7 @@ class Wither6 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Wither6 withFoo(final String foo) { return this.foo == foo ? this : new Wither6(foo); } diff --git a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java index 2ffd310c..f285d75d 100644 --- a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java +++ b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java @@ -7,6 +7,7 @@ class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> { @java.beans.ConstructorProperties({"test", "test2", "y", "z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) { this.test = test; this.test2 = test2; @@ -15,11 +16,13 @@ class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherAndAllArgsConstructor<T, J, L> withTest(final J test) { return this.test == test ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) { return this.test2 == test2 ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z); } diff --git a/test/transform/resource/after-delombok/WitherDeprecated.java b/test/transform/resource/after-delombok/WitherDeprecated.java index 712bd603..18fb598f 100644 --- a/test/transform/resource/after-delombok/WitherDeprecated.java +++ b/test/transform/resource/after-delombok/WitherDeprecated.java @@ -10,6 +10,7 @@ class WitherDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherDeprecated withAnnotation(final int annotation) { return this.annotation == annotation ? this : new WitherDeprecated(annotation, this.javadoc); } @@ -19,6 +20,7 @@ class WitherDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherDeprecated withJavadoc(final int javadoc) { return this.javadoc == javadoc ? this : new WitherDeprecated(this.annotation, javadoc); } diff --git a/test/transform/resource/after-delombok/WitherOnClass.java b/test/transform/resource/after-delombok/WitherOnClass.java index ae352d33..98c789e8 100644 --- a/test/transform/resource/after-delombok/WitherOnClass.java +++ b/test/transform/resource/after-delombok/WitherOnClass.java @@ -5,6 +5,7 @@ class WitherOnClass1 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherOnClass1 withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WitherOnClass1(this.isNone, isPublic); } @@ -17,11 +18,13 @@ class WitherOnClass2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated 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") + @lombok.Generated WitherOnClass2 withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage); } @@ -34,11 +37,13 @@ class WitherOnClass3 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherOnClass3 withCouldBeNull(final String couldBeNull) { return this.couldBeNull == couldBeNull ? this : new WitherOnClass3(couldBeNull, this.nonNull); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherOnClass3 withNonNull(@lombok.NonNull final String nonNull) { if (nonNull == null) { throw new java.lang.NullPointerException("nonNull"); @@ -54,6 +59,7 @@ class WitherOnClass4 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherOnClass4 withY(final int fY) { return this.fY == fY ? this : new WitherOnClass4(fY); } diff --git a/test/transform/resource/after-delombok/WitherPlain.java b/test/transform/resource/after-delombok/WitherPlain.java index 548ff299..3a0d42f7 100644 --- a/test/transform/resource/after-delombok/WitherPlain.java +++ b/test/transform/resource/after-delombok/WitherPlain.java @@ -7,11 +7,13 @@ class WitherPlain { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherPlain withI(final int i) { return this.i == i ? this : new WitherPlain(i, this.foo); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherPlain withFoo(final int foo) { return this.foo == foo ? this : new WitherPlain(this.i, foo); } diff --git a/test/transform/resource/after-delombok/WitherWithAbstract.java b/test/transform/resource/after-delombok/WitherWithAbstract.java index d5bfeef8..5acb8e84 100644 --- a/test/transform/resource/after-delombok/WitherWithAbstract.java +++ b/test/transform/resource/after-delombok/WitherWithAbstract.java @@ -2,5 +2,6 @@ abstract class WitherWithAbstract { String foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public abstract WitherWithAbstract withFoo(final String foo); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/WitherWithGenerics.java b/test/transform/resource/after-delombok/WitherWithGenerics.java index fd466559..c124276d 100644 --- a/test/transform/resource/after-delombok/WitherWithGenerics.java +++ b/test/transform/resource/after-delombok/WitherWithGenerics.java @@ -7,16 +7,19 @@ class WitherWithGenerics<T, J extends T, L extends java.lang.Number> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherWithGenerics<T, J, L> withTest(final J test) { return this.test == test ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { return this.test2 == test2 ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { return this.test3 == test3 ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3); } diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java index 450c35fa..09b94c8e 100644 --- a/test/transform/resource/after-ecj/Accessors.java +++ b/test/transform/resource/after-ecj/Accessors.java @@ -3,10 +3,10 @@ class AccessorsFluent { AccessorsFluent() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String fieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluent fieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; } @@ -17,14 +17,14 @@ class AccessorsFluent { AccessorsFluentOnClass() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluentOnClass fieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String fieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getOtherFieldWithOverride() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } } @@ -33,7 +33,7 @@ class AccessorsChain { AccessorsChain() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsChain setRunning(final boolean isRunning) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; } @@ -44,7 +44,7 @@ class AccessorsChain { AccessorsPrefix() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setActualField(final String fActualField) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setActualField(final String fActualField) { this.fActualField = fActualField; } } @@ -54,10 +54,10 @@ class AccessorsChain { AccessorsPrefix2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFieldName(final String fieldName) { this.fieldName = fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setActualField(final String fActualField) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setActualField(final String fActualField) { this.fActualField = fActualField; } } @@ -69,10 +69,10 @@ class AccessorsChain { private String getName() { return fName; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("AccessorsPrefix3(fName=" + this.getName()) + ")"); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof AccessorsPrefix3))) @@ -86,10 +86,10 @@ class AccessorsChain { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof AccessorsPrefix3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $fName = this.getName(); @@ -102,7 +102,7 @@ class AccessorsFluentGenerics<T extends Number> { AccessorsFluentGenerics() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluentGenerics<T> name(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AccessorsFluentGenerics<T> name(final String name) { this.name = name; return this; } @@ -112,7 +112,7 @@ class AccessorsFluentNoChaining { AccessorsFluentNoChaining() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void name(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void name(final String name) { this.name = name; } } @@ -123,7 +123,7 @@ class AccessorsFluentStatic<T extends Number> { AccessorsFluentStatic() { super(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void name(final String name) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void name(final String name) { AccessorsFluentStatic.name = name; } } diff --git a/test/transform/resource/after-ecj/AccessorsConfiguration.java b/test/transform/resource/after-ecj/AccessorsConfiguration.java index fdf2ff85..7db470c5 100644 --- a/test/transform/resource/after-ecj/AccessorsConfiguration.java +++ b/test/transform/resource/after-ecj/AccessorsConfiguration.java @@ -3,10 +3,10 @@ class AccessorsConfiguration { AccessorsConfiguration() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String fieldName() { return this.m_FieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void fieldName(final String m_FieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void fieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } } @@ -15,7 +15,7 @@ class AccessorsConfiguration { AccessorsConfiguration2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setM_FieldName(final String m_FieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setM_FieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } } @@ -24,7 +24,7 @@ class AccessorsConfiguration { AccessorsConfiguration3() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsConfiguration3 setFieldName(final String fFieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AccessorsConfiguration3 setFieldName(final String fFieldName) { this.fFieldName = fFieldName; return this; } diff --git a/test/transform/resource/after-ecj/BuilderChainAndFluent.java b/test/transform/resource/after-ecj/BuilderChainAndFluent.java index 1554cf44..78d0bdec 100644 --- a/test/transform/resource/after-ecj/BuilderChainAndFluent.java +++ b/test/transform/resource/after-ecj/BuilderChainAndFluent.java @@ -1,25 +1,25 @@ @lombok.experimental.Builder(fluent = false,chain = false) class BuilderChainAndFluent { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderChainAndFluentBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluentBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderChainAndFluentBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int yes; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderChainAndFluentBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setYes(final int yes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setYes(final int yes) { this.yes = yes; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluent build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderChainAndFluent build() { return new BuilderChainAndFluent(yes); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes) + ")"); } } private final int yes; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluent(final int yes) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderChainAndFluent(final int yes) { super(); this.yes = yes; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderChainAndFluentBuilder builder() { return new BuilderChainAndFluentBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java index c63ad8e6..48995923 100644 --- a/test/transform/resource/after-ecj/BuilderComplex.java +++ b/test/transform/resource/after-ecj/BuilderComplex.java @@ -1,34 +1,34 @@ import java.util.List; import lombok.experimental.Builder; class BuilderComplex { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class VoidBuilder<T extends Number> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T number; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int arg2; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String arg3; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderComplex selfRef; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class VoidBuilder<T extends Number> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated T number; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int arg2; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String arg3; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderComplex selfRef; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> number(final T number) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> number(final T number) { this.number = number; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> arg2(final int arg2) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> arg2(final int arg2) { this.arg2 = arg2; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> arg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> arg3(final String arg3) { this.arg3 = arg3; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> selfRef(final BuilderComplex selfRef) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void execute() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void execute() { BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((("BuilderComplex.VoidBuilder(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")"); } } @@ -37,7 +37,7 @@ class BuilderComplex { } private static @Builder(buildMethodName = "execute") <T extends Number>void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) { } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>VoidBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T extends Number>VoidBuilder<T> builder() { return new VoidBuilder<T>(); } } diff --git a/test/transform/resource/after-ecj/BuilderInstanceMethod.java b/test/transform/resource/after-ecj/BuilderInstanceMethod.java index ff7d0aab..985e8e1c 100644 --- a/test/transform/resource/after-ecj/BuilderInstanceMethod.java +++ b/test/transform/resource/after-ecj/BuilderInstanceMethod.java @@ -1,33 +1,33 @@ import java.util.List; class BuilderInstanceMethod<T> { - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class StringBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int show; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") List<T> also; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int $andMe; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class StringBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int show; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int yes; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated List<T> also; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int $andMe; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder show(final int show) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder show(final int show) { this.show = show; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder yes(final int yes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder yes(final int yes) { this.yes = yes; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder also(final List<T> also) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder also(final List<T> also) { this.also = also; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder $andMe(final int $andMe) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String build() { return BuilderInstanceMethod.this.create(show, yes, also, $andMe); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((("BuilderInstanceMethod.StringBuilder(show=" + this.show) + ", yes=") + this.yes) + ", also=") + this.also) + ", $andMe=") + this.$andMe) + ")"); } } @@ -37,7 +37,7 @@ class BuilderInstanceMethod<T> { public @lombok.Builder String create(int show, final int yes, List<T> also, int $andMe) { return (((("" + show) + yes) + also) + $andMe); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder builder() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder builder() { return new StringBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSimple.java b/test/transform/resource/after-ecj/BuilderSimple.java index 53d1ed9e..c235201e 100644 --- a/test/transform/resource/after-ecj/BuilderSimple.java +++ b/test/transform/resource/after-ecj/BuilderSimple.java @@ -1,23 +1,23 @@ import java.util.List; @lombok.Builder class BuilderSimple<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSimpleBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") List<T> also; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSimpleBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int yes; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated List<T> also; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSimpleBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder<T> yes(final int yes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSimpleBuilder<T> yes(final int yes) { this.yes = yes; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder<T> also(final List<T> also) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSimpleBuilder<T> also(final List<T> also) { this.also = also; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimple<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSimple<T> build() { return new BuilderSimple<T>(yes, also); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes) + ", also=") + this.also) + ")"); } } @@ -25,12 +25,12 @@ import java.util.List; private final int yes; private List<T> also; private int $butNotMe; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimple(final int yes, final List<T> also) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSimple(final int yes, final List<T> also) { super(); this.yes = yes; this.also = also; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSimpleBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>BuilderSimpleBuilder<T> builder() { return new BuilderSimpleBuilder<T>(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java index 5cf9f4ac..2a596964 100644 --- a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java @@ -5,96 +5,96 @@ import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.ImmutableTable; import lombok.Singular; @lombok.Builder class BuilderSingularGuavaListsSets<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularGuavaListsSetsBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<T> cards; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<Number> frogs; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedSet.Builder<String> passes; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularGuavaListsSetsBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableList.Builder<T> cards; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableList.Builder<Number> frogs; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableSortedSet.Builder<String> passes; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> card(T card) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> card(T card) { if ((this.cards == null)) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> cards(java.lang.Iterable<? extends T> cards) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> cards(java.lang.Iterable<? extends T> cards) { if ((this.cards == null)) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearCards() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> clearCards() { this.cards = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> frog(Number frog) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> frog(Number frog) { if ((this.frogs == null)) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> frogs(java.lang.Iterable<? extends Number> frogs) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> frogs(java.lang.Iterable<? extends Number> frogs) { if ((this.frogs == null)) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() { this.frogs = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Iterable<?> rawSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Iterable<?> rawSet) { if ((this.rawSet == null)) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() { this.rawSet = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> pass(String pass) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> pass(String pass) { if ((this.passes == null)) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> passes(java.lang.Iterable<? extends String> passes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> passes(java.lang.Iterable<? extends String> passes) { if ((this.passes == null)) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearPasses() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> clearPasses() { this.passes = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> user(Number rowKey, Number columnKey, String value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> user(Number rowKey, Number columnKey, String value) { if ((this.users == null)) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.put(rowKey, columnKey, value); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> users(com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> users(com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) { if ((this.users == null)) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.putAll(users); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearUsers() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> clearUsers() { this.users = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSets<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSets<T> build() { com.google.common.collect.ImmutableList<T> cards = ((this.cards == null) ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build()); com.google.common.collect.ImmutableCollection<Number> frogs = ((this.frogs == null) ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build()); com.google.common.collect.ImmutableSet<java.lang.Object> rawSet = ((this.rawSet == null) ? com.google.common.collect.ImmutableSet.<java.lang.Object>of() : this.rawSet.build()); @@ -102,7 +102,7 @@ import lombok.Singular; com.google.common.collect.ImmutableTable<Number, Number, String> users = ((this.users == null) ? com.google.common.collect.ImmutableTable.<Number, Number, String>of() : this.users.build()); return new BuilderSingularGuavaListsSets<T>(cards, frogs, rawSet, passes, users); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((((("BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ", users=") + this.users) + ")"); } } @@ -111,7 +111,7 @@ import lombok.Singular; private @SuppressWarnings("all") @Singular("rawSet") ImmutableSet rawSet; private @Singular ImmutableSortedSet<String> passes; private @Singular ImmutableTable<? extends Number, ? extends Number, String> users; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) { super(); this.cards = cards; this.frogs = frogs; @@ -119,7 +119,7 @@ import lombok.Singular; this.passes = passes; this.users = users; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularGuavaListsSetsBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>BuilderSingularGuavaListsSetsBuilder<T> builder() { return new BuilderSingularGuavaListsSetsBuilder<T>(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java index 378ec309..1988f097 100644 --- a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java @@ -3,81 +3,81 @@ import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableSortedMap; import lombok.Singular; @lombok.Builder class BuilderSingularGuavaMaps<K, V> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularGuavaMapsBuilder<K, V> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularGuavaMapsBuilder<K, V> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> battleaxe(K key, V value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> battleaxe(K key, V value) { if ((this.battleaxes == null)) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.put(key, value); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> battleaxes(java.util.Map<? extends K, ? extends V> battleaxes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> battleaxes(java.util.Map<? extends K, ? extends V> battleaxes) { if ((this.battleaxes == null)) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.putAll(battleaxes); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() { this.battleaxes = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> vertex(Integer key, V value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> vertex(Integer key, V value) { if ((this.vertices == null)) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.put(key, value); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> vertices(java.util.Map<? extends Integer, ? extends V> vertices) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> vertices(java.util.Map<? extends Integer, ? extends V> vertices) { if ((this.vertices == null)) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.putAll(vertices); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> clearVertices() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> clearVertices() { this.vertices = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.lang.Object key, java.lang.Object value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.lang.Object key, java.lang.Object value) { if ((this.rawMap == null)) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.put(key, value); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) { if ((this.rawMap == null)) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.putAll(rawMap); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() { this.rawMap = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMaps<K, V> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMaps<K, V> build() { com.google.common.collect.ImmutableMap<K, V> battleaxes = ((this.battleaxes == null) ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build()); com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = ((this.vertices == null) ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build()); com.google.common.collect.ImmutableBiMap<java.lang.Object, java.lang.Object> rawMap = ((this.rawMap == null) ? com.google.common.collect.ImmutableBiMap.<java.lang.Object, java.lang.Object>of() : this.rawMap.build()); return new BuilderSingularGuavaMaps<K, V>(battleaxes, vertices, rawMap); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")"); } } private @Singular ImmutableMap<K, V> battleaxes; private @Singular ImmutableSortedMap<Integer, ? extends V> vertices; private @SuppressWarnings("all") @Singular("rawMap") ImmutableBiMap rawMap; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) { super(); this.battleaxes = battleaxes; this.vertices = vertices; this.rawMap = rawMap; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() { return new BuilderSingularGuavaMapsBuilder<K, V>(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularLists.java b/test/transform/resource/after-ecj/BuilderSingularLists.java index e1036262..3293870a 100644 --- a/test/transform/resource/after-ecj/BuilderSingularLists.java +++ b/test/transform/resource/after-ecj/BuilderSingularLists.java @@ -3,65 +3,65 @@ import java.util.Collection; import lombok.Singular; @lombok.Builder class BuilderSingularLists<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularListsBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> children; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> scarves; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawList; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularListsBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<T> children; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<Number> scarves; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<java.lang.Object> rawList; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> child(T child) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> child(T child) { if ((this.children == null)) this.children = new java.util.ArrayList<T>(); this.children.add(child); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> children(java.util.Collection<? extends T> children) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> children(java.util.Collection<? extends T> children) { if ((this.children == null)) this.children = new java.util.ArrayList<T>(); this.children.addAll(children); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> clearChildren() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> clearChildren() { if ((this.children != null)) this.children.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> scarf(Number scarf) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> scarf(Number scarf) { if ((this.scarves == null)) this.scarves = new java.util.ArrayList<Number>(); this.scarves.add(scarf); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> scarves(java.util.Collection<? extends Number> scarves) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> scarves(java.util.Collection<? extends Number> scarves) { if ((this.scarves == null)) this.scarves = new java.util.ArrayList<Number>(); this.scarves.addAll(scarves); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> clearScarves() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> clearScarves() { if ((this.scarves != null)) this.scarves.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> rawList(java.lang.Object rawList) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> rawList(java.lang.Object rawList) { if ((this.rawList == null)) this.rawList = new java.util.ArrayList<java.lang.Object>(); this.rawList.add(rawList); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> rawList(java.util.Collection<?> rawList) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> rawList(java.util.Collection<?> rawList) { if ((this.rawList == null)) this.rawList = new java.util.ArrayList<java.lang.Object>(); this.rawList.addAll(rawList); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> clearRawList() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> clearRawList() { if ((this.rawList != null)) this.rawList.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularLists<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularLists<T> build() { java.util.List<T> children; switch (((this.children == null) ? 0 : this.children.size())) { case 0 : @@ -97,20 +97,20 @@ import lombok.Singular; } return new BuilderSingularLists<T>(children, scarves, rawList); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")"); } } private @Singular List<T> children; private @Singular Collection<? extends Number> scarves; private @SuppressWarnings("all") @Singular("rawList") List rawList; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) { super(); this.children = children; this.scarves = scarves; this.rawList = rawList; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularListsBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>BuilderSingularListsBuilder<T> builder() { return new BuilderSingularListsBuilder<T>(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingularMaps.java b/test/transform/resource/after-ecj/BuilderSingularMaps.java index 38ac0ed7..7e778452 100644 --- a/test/transform/resource/after-ecj/BuilderSingularMaps.java +++ b/test/transform/resource/after-ecj/BuilderSingularMaps.java @@ -2,19 +2,19 @@ import java.util.Map; import java.util.SortedMap; import lombok.Singular; @lombok.Builder class BuilderSingularMaps<K, V> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularMapsBuilder<K, V> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<K> women$key; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<V> women$value; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<K> men$key; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> men$value; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawMap$key; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawMap$value; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> stringMap$key; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<V> stringMap$value; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularMapsBuilder<K, V> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<K> women$key; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<V> women$value; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<K> men$key; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<Number> men$value; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<java.lang.Object> rawMap$key; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<java.lang.Object> rawMap$value; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> stringMap$key; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<V> stringMap$value; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) { if ((this.women$key == null)) { this.women$key = new java.util.ArrayList<K>(); @@ -24,7 +24,7 @@ import lombok.Singular; this.women$value.add(womanValue); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) { if ((this.women$key == null)) { this.women$key = new java.util.ArrayList<K>(); @@ -37,7 +37,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearWomen() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> clearWomen() { if ((this.women$key != null)) { this.women$key.clear(); @@ -45,7 +45,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) { if ((this.men$key == null)) { this.men$key = new java.util.ArrayList<K>(); @@ -55,7 +55,7 @@ import lombok.Singular; this.men$value.add(manValue); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) { if ((this.men$key == null)) { this.men$key = new java.util.ArrayList<K>(); @@ -68,7 +68,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearMen() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> clearMen() { if ((this.men$key != null)) { this.men$key.clear(); @@ -76,7 +76,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) { if ((this.rawMap$key == null)) { this.rawMap$key = new java.util.ArrayList<java.lang.Object>(); @@ -86,7 +86,7 @@ import lombok.Singular; this.rawMap$value.add(rawMapValue); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) { if ((this.rawMap$key == null)) { this.rawMap$key = new java.util.ArrayList<java.lang.Object>(); @@ -99,7 +99,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearRawMap() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> clearRawMap() { if ((this.rawMap$key != null)) { this.rawMap$key.clear(); @@ -107,7 +107,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) { if ((this.stringMap$key == null)) { this.stringMap$key = new java.util.ArrayList<String>(); @@ -117,7 +117,7 @@ import lombok.Singular; this.stringMap$value.add(stringMapValue); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) { if ((this.stringMap$key == null)) { this.stringMap$key = new java.util.ArrayList<String>(); @@ -130,7 +130,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearStringMap() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> clearStringMap() { if ((this.stringMap$key != null)) { this.stringMap$key.clear(); @@ -138,7 +138,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMaps<K, V> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMaps<K, V> build() { java.util.Map<K, V> women; switch (((this.women$key == null) ? 0 : this.women$key.size())) { case 0 : @@ -188,7 +188,7 @@ import lombok.Singular; } return new BuilderSingularMaps<K, V>(women, men, rawMap, stringMap); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((((((((((("BuilderSingularMaps.BuilderSingularMapsBuilder(women$key=" + this.women$key) + ", women$value=") + this.women$value) + ", men$key=") + this.men$key) + ", men$value=") + this.men$value) + ", rawMap$key=") + this.rawMap$key) + ", rawMap$value=") + this.rawMap$value) + ", stringMap$key=") + this.stringMap$key) + ", stringMap$value=") + this.stringMap$value) + ")"); } } @@ -196,14 +196,14 @@ import lombok.Singular; private @Singular SortedMap<K, ? extends Number> men; private @SuppressWarnings("all") @Singular("rawMap") Map rawMap; private @Singular("stringMap") Map<String, V> stringMap; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) { super(); this.women = women; this.men = men; this.rawMap = rawMap; this.stringMap = stringMap; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <K, V>BuilderSingularMapsBuilder<K, V> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <K, V>BuilderSingularMapsBuilder<K, V> builder() { return new BuilderSingularMapsBuilder<K, V>(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingularNoAuto.java b/test/transform/resource/after-ecj/BuilderSingularNoAuto.java index 1b79538c..6ea5a7db 100644 --- a/test/transform/resource/after-ecj/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-ecj/BuilderSingularNoAuto.java @@ -1,65 +1,65 @@ import java.util.List; import lombok.Singular; @lombok.Builder class BuilderSingularNoAuto { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularNoAutoBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> things; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> widgets; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> items; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularNoAutoBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> things; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> widgets; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> items; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder things(String things) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder things(String things) { if ((this.things == null)) this.things = new java.util.ArrayList<String>(); this.things.add(things); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder things(java.util.Collection<? extends String> things) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder things(java.util.Collection<? extends String> things) { if ((this.things == null)) this.things = new java.util.ArrayList<String>(); this.things.addAll(things); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder clearThings() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder clearThings() { if ((this.things != null)) this.things.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder widget(String widget) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder widget(String widget) { if ((this.widgets == null)) this.widgets = new java.util.ArrayList<String>(); this.widgets.add(widget); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder widgets(java.util.Collection<? extends String> widgets) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder widgets(java.util.Collection<? extends String> widgets) { if ((this.widgets == null)) this.widgets = new java.util.ArrayList<String>(); this.widgets.addAll(widgets); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder clearWidgets() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder clearWidgets() { if ((this.widgets != null)) this.widgets.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder items(String items) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder items(String items) { if ((this.items == null)) this.items = new java.util.ArrayList<String>(); this.items.add(items); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder items(java.util.Collection<? extends String> items) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder items(java.util.Collection<? extends String> items) { if ((this.items == null)) this.items = new java.util.ArrayList<String>(); this.items.addAll(items); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder clearItems() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder clearItems() { if ((this.items != null)) this.items.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAuto build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAuto build() { java.util.List<String> things; switch (((this.things == null) ? 0 : this.things.size())) { case 0 : @@ -95,20 +95,20 @@ import lombok.Singular; } return new BuilderSingularNoAuto(things, widgets, items); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things) + ", widgets=") + this.widgets) + ", items=") + this.items) + ")"); } } private @Singular List<String> things; private @Singular("widget") List<String> widgets; private @Singular List<String> items; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) { super(); this.things = things; this.widgets = widgets; this.items = items; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAutoBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java index 84335f46..2b65ba3f 100644 --- a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java @@ -3,81 +3,81 @@ import java.util.NavigableMap; import java.util.Collection; import lombok.Singular; @lombok.Builder class BuilderSingularRedirectToGuava { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularRedirectToGuavaBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSet.Builder<String> dangerMice; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularRedirectToGuavaBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableSet.Builder<String> dangerMice; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder dangerMouse(String dangerMouse) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder dangerMouse(String dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder dangerMice(java.lang.Iterable<? extends String> dangerMice) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder dangerMice(java.lang.Iterable<? extends String> dangerMice) { if ((this.dangerMice == null)) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder clearDangerMice() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder thing(Integer key, Number value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder thing(Integer key, Number value) { if ((this.things == null)) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.put(key, value); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder things(java.util.Map<? extends Integer, ? extends Number> things) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder things(java.util.Map<? extends Integer, ? extends Number> things) { if ((this.things == null)) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.putAll(things); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder clearThings() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder doohickey(Class<?> doohickey) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder doohickey(Class<?> doohickey) { if ((this.doohickeys == null)) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder doohickeys(java.lang.Iterable<? extends Class<?>> doohickeys) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder doohickeys(java.lang.Iterable<? extends Class<?>> doohickeys) { if ((this.doohickeys == null)) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.addAll(doohickeys); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuava build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuava build() { java.util.Set<String> dangerMice = ((this.dangerMice == null) ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build()); java.util.NavigableMap<Integer, Number> things = ((this.things == null) ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build()); java.util.Collection<Class<?>> doohickeys = ((this.doohickeys == null) ? com.google.common.collect.ImmutableList.<Class<?>>of() : this.doohickeys.build()); return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice) + ", things=") + this.things) + ", doohickeys=") + this.doohickeys) + ")"); } } private @Singular Set<String> dangerMice; private @Singular NavigableMap<Integer, Number> things; private @Singular Collection<Class<?>> doohickeys; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) { super(); this.dangerMice = dangerMice; this.things = things; this.doohickeys = doohickeys; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuavaBuilder(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingularSets.java b/test/transform/resource/after-ecj/BuilderSingularSets.java index 118eb16f..49a87fe9 100644 --- a/test/transform/resource/after-ecj/BuilderSingularSets.java +++ b/test/transform/resource/after-ecj/BuilderSingularSets.java @@ -2,83 +2,83 @@ import java.util.Set; import java.util.SortedSet; import lombok.Singular; @lombok.Builder class BuilderSingularSets<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularSetsBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> dangerMice; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> octopodes; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawSet; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> stringSet; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularSetsBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<T> dangerMice; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<Number> octopodes; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<java.lang.Object> rawSet; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> stringSet; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> dangerMouse(T dangerMouse) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> dangerMouse(T dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> dangerMice(java.util.Collection<? extends T> dangerMice) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> dangerMice(java.util.Collection<? extends T> dangerMice) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearDangerMice() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> clearDangerMice() { if ((this.dangerMice != null)) this.dangerMice.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> octopus(Number octopus) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> octopus(Number octopus) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.add(octopus); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> octopodes(java.util.Collection<? extends Number> octopodes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> octopodes(java.util.Collection<? extends Number> octopodes) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.addAll(octopodes); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearOctopodes() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> clearOctopodes() { if ((this.octopodes != null)) this.octopodes.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> rawSet(java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> rawSet(java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.add(rawSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> rawSet(java.util.Collection<?> rawSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> rawSet(java.util.Collection<?> rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearRawSet() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> clearRawSet() { if ((this.rawSet != null)) this.rawSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> stringSet(String stringSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> stringSet(String stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.add(stringSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> stringSet(java.util.Collection<? extends String> stringSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> stringSet(java.util.Collection<? extends String> stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.addAll(stringSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearStringSet() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> clearStringSet() { if ((this.stringSet != null)) this.stringSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSets<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSets<T> build() { java.util.Set<T> dangerMice; switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) { case 0 : @@ -124,7 +124,7 @@ import lombok.Singular; } return new BuilderSingularSets<T>(dangerMice, octopodes, rawSet, stringSet); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((("BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")"); } } @@ -132,14 +132,14 @@ import lombok.Singular; private @Singular SortedSet<? extends Number> octopodes; private @SuppressWarnings("all") @Singular("rawSet") Set rawSet; private @Singular("stringSet") Set<String> stringSet; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) { super(); this.dangerMice = dangerMice; this.octopodes = octopodes; this.rawSet = rawSet; this.stringSet = stringSet; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularSetsBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>BuilderSingularSetsBuilder<T> builder() { return new BuilderSingularSetsBuilder<T>(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java index c0e4af75..1351ae15 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java +++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java @@ -1,28 +1,28 @@ import lombok.Singular; @lombok.Builder @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixes { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularWithPrefixesBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> elems; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularWithPrefixesBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> elems; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixesBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder elem(String elem) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixesBuilder elem(String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList<String>(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder elems(java.util.Collection<? extends String> elems) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixesBuilder elems(java.util.Collection<? extends String> elems) { if ((this.elems == null)) this.elems = new java.util.ArrayList<String>(); this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder clearElems() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixesBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixes build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixes build() { java.util.List<String> elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -36,16 +36,16 @@ import lombok.Singular; } return new BuilderSingularWithPrefixes(elems); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems) + ")"); } } private @Singular java.util.List<String> _elems; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixes(final java.util.List<String> elems) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixes(final java.util.List<String> elems) { super(); this._elems = elems; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixesBuilder builder() { return new BuilderSingularWithPrefixesBuilder(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderValueData.java b/test/transform/resource/after-ecj/BuilderValueData.java index 4fcc04bf..855979f1 100644 --- a/test/transform/resource/after-ecj/BuilderValueData.java +++ b/test/transform/resource/after-ecj/BuilderValueData.java @@ -1,27 +1,27 @@ import java.util.List; final @lombok.Builder @lombok.Value class BuilderAndValue { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderAndValueBuilder { - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndValueBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderAndValueBuilder { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndValueBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndValue build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndValue build() { return new BuilderAndValue(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "BuilderAndValue.BuilderAndValueBuilder()"; } } private final int zero = 0; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndValue() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndValue() { super(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndValueBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndValueBuilder builder() { return new BuilderAndValueBuilder(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getZero() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getZero() { return this.zero; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderAndValue))) @@ -31,39 +31,39 @@ final @lombok.Builder @lombok.Value class BuilderAndValue { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getZero()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("BuilderAndValue(zero=" + this.getZero()) + ")"); } } @lombok.Builder @lombok.Data class BuilderAndData { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderAndDataBuilder { - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndDataBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderAndDataBuilder { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndDataBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndData build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndData build() { return new BuilderAndData(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "BuilderAndData.BuilderAndDataBuilder()"; } } private final int zero = 0; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndData() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndData() { super(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderAndDataBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndDataBuilder builder() { return new BuilderAndDataBuilder(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getZero() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getZero() { return this.zero; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof BuilderAndData))) @@ -75,16 +75,16 @@ final @lombok.Builder @lombok.Value class BuilderAndValue { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof BuilderAndData); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getZero()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("BuilderAndData(zero=" + this.getZero()) + ")"); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderWithAccessors.java b/test/transform/resource/after-ecj/BuilderWithAccessors.java index de93a75c..2846fd80 100644 --- a/test/transform/resource/after-ecj/BuilderWithAccessors.java +++ b/test/transform/resource/after-ecj/BuilderWithAccessors.java @@ -1,32 +1,32 @@ @lombok.Builder @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderWithAccessorsBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int plower; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int upper; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int foo; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int _bar; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderWithAccessorsBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int plower; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int upper; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int foo; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int _bar; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder plower(final int plower) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder plower(final int plower) { this.plower = plower; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder upper(final int upper) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder upper(final int upper) { this.upper = upper; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder foo(final int foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder foo(final int foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder _bar(final int _bar) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder _bar(final int _bar) { this._bar = _bar; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessors build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessors build() { return new BuilderWithAccessors(plower, upper, foo, _bar); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((("BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower) + ", upper=") + this.upper) + ", foo=") + this.foo) + ", _bar=") + this._bar) + ")"); } } @@ -34,14 +34,14 @@ private final int pUpper; private int _foo; private int __bar; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { super(); this.plower = plower; this.pUpper = upper; this._foo = foo; this.__bar = _bar; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder builder() { return new BuilderWithAccessorsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java index 1c23e0ee..114d4cfa 100644 --- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java +++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java @@ -1,26 +1,26 @@ import lombok.Builder; class BuilderWithExistingBuilderClass<T, K extends Number> { public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean arg2; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String arg3; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean arg2; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String arg3; private Z arg1; public void arg2(boolean arg) { } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithExistingBuilderClassBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) { this.arg1 = arg1; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) { this.arg3 = arg3; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClass<String, Z> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithExistingBuilderClass<String, Z> build() { return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")"); } } @@ -30,7 +30,7 @@ class BuilderWithExistingBuilderClass<T, K extends Number> { public static @Builder <Z extends Number>BuilderWithExistingBuilderClass<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) { return null; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <Z extends Number>BuilderWithExistingBuilderClassBuilder<Z> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <Z extends Number>BuilderWithExistingBuilderClassBuilder<Z> builder() { return new BuilderWithExistingBuilderClassBuilder<Z>(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilder.java b/test/transform/resource/after-ecj/BuilderWithToBuilder.java index 0d296cb6..d1245c70 100644 --- a/test/transform/resource/after-ecj/BuilderWithToBuilder.java +++ b/test/transform/resource/after-ecj/BuilderWithToBuilder.java @@ -1,44 +1,44 @@ import java.util.List; import lombok.Builder; @Builder(toBuilder = true) @lombok.experimental.Accessors(prefix = "m") class BuilderWithToBuilder<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderWithToBuilderBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String one; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String two; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T foo; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> bars; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderWithToBuilderBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String one; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String two; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated T foo; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<T> bars; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> one(final String one) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> one(final String one) { this.one = one; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> two(final String two) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> two(final String two) { this.two = two; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> foo(final T foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> foo(final T foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> bar(T bar) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> bar(T bar) { if ((this.bars == null)) this.bars = new java.util.ArrayList<T>(); this.bars.add(bar); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> bars(java.util.Collection<? extends T> bars) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> bars(java.util.Collection<? extends T> bars) { if ((this.bars == null)) this.bars = new java.util.ArrayList<T>(); this.bars.addAll(bars); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> clearBars() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> clearBars() { if ((this.bars != null)) this.bars.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilder<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilder<T> build() { java.util.List<T> bars; switch (((this.bars == null) ? 0 : this.bars.size())) { case 0 : @@ -52,7 +52,7 @@ import lombok.Builder; } return new BuilderWithToBuilder<T>(one, two, foo, bars); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((("BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one) + ", two=") + this.two) + ", foo=") + this.foo) + ", bars=") + this.bars) + ")"); } } @@ -63,39 +63,39 @@ import lombok.Builder; public static <K>K rrr(BuilderWithToBuilder<K> x) { return x.foo; } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilder(final String one, final String two, final T foo, final List<T> bars) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilder(final String one, final String two, final T foo, final List<T> bars) { super(); this.mOne = one; this.mTwo = two; this.foo = foo; this.bars = bars; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderWithToBuilderBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>BuilderWithToBuilderBuilder<T> builder() { return new BuilderWithToBuilderBuilder<T>(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> toBuilder() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> toBuilder() { return new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars); } } @lombok.experimental.Accessors(prefix = "m") class ConstructorWithToBuilder<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class ConstructorWithToBuilderBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String mOne; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T bar; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class ConstructorWithToBuilderBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String mOne; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated T bar; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorWithToBuilderBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder<T> mOne(final String mOne) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorWithToBuilderBuilder<T> mOne(final String mOne) { this.mOne = mOne; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder<T> bar(final T bar) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorWithToBuilderBuilder<T> bar(final T bar) { this.bar = bar; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilder<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorWithToBuilder<T> build() { return new ConstructorWithToBuilder<T>(mOne, bar); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne) + ", bar=") + this.bar) + ")"); } } @@ -106,32 +106,32 @@ import lombok.Builder; public @Builder(toBuilder = true) ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T bar) { super(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>ConstructorWithToBuilderBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>ConstructorWithToBuilderBuilder<T> builder() { return new ConstructorWithToBuilderBuilder<T>(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder<T> toBuilder() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorWithToBuilderBuilder<T> toBuilder() { return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); } } @lombok.experimental.Accessors(prefix = "m") class StaticWithToBuilder<T, K> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class StaticWithToBuilderBuilder<Z> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String mOne; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Z bar; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class StaticWithToBuilderBuilder<Z> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String mOne; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Z bar; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StaticWithToBuilderBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder<Z> mOne(final String mOne) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StaticWithToBuilderBuilder<Z> mOne(final String mOne) { this.mOne = mOne; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder<Z> bar(final Z bar) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StaticWithToBuilderBuilder<Z> bar(final Z bar) { this.bar = bar; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilder<Z, String> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StaticWithToBuilder<Z, String> build() { return StaticWithToBuilder.<Z>test(mOne, bar); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("StaticWithToBuilder.StaticWithToBuilderBuilder(mOne=" + this.mOne) + ", bar=") + this.bar) + ")"); } } @@ -146,10 +146,10 @@ import lombok.Builder; public static @Builder(toBuilder = true) <Z>StaticWithToBuilder<Z, String> test(String mOne, @Builder.ObtainVia(field = "foo") Z bar) { return new StaticWithToBuilder<Z, String>(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <Z>StaticWithToBuilderBuilder<Z> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <Z>StaticWithToBuilderBuilder<Z> builder() { return new StaticWithToBuilderBuilder<Z>(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder<T> toBuilder() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StaticWithToBuilderBuilder<T> toBuilder() { return new StaticWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); } } diff --git a/test/transform/resource/after-ecj/BuilderWithTolerate.java b/test/transform/resource/after-ecj/BuilderWithTolerate.java index 0b9b46a0..ec6ae542 100644 --- a/test/transform/resource/after-ecj/BuilderWithTolerate.java +++ b/test/transform/resource/after-ecj/BuilderWithTolerate.java @@ -2,21 +2,21 @@ import lombok.Builder; import lombok.experimental.Tolerate; public @Builder class BuilderWithTolerate { public static class BuilderWithTolerateBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int value; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int value; public @Tolerate BuilderWithTolerateBuilder value(String s) { return this.value(Integer.parseInt(s)); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerateBuilder() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithTolerateBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerateBuilder value(final int value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithTolerateBuilder value(final int value) { this.value = value; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerate build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithTolerate build() { return new BuilderWithTolerate(value); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value) + ")"); } } @@ -24,11 +24,11 @@ public @Builder class BuilderWithTolerate { public static void main(String[] args) { BuilderWithTolerate.builder().value("42").build(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerate(final int value) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithTolerate(final int value) { super(); this.value = value; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerateBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithTolerateBuilder builder() { return new BuilderWithTolerateBuilder(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java index 79b422cc..33596372 100644 --- a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java +++ b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java @@ -3,7 +3,7 @@ class GetFoo { GetFoo() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/CommentsInterspersed.java b/test/transform/resource/after-ecj/CommentsInterspersed.java index 95489d54..17eaba9f 100644 --- a/test/transform/resource/after-ecj/CommentsInterspersed.java +++ b/test/transform/resource/after-ecj/CommentsInterspersed.java @@ -6,7 +6,7 @@ public class CommentsInterspersed { super(); } public native void gwtTest(); - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getTest() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getTest() { return this.test; } } diff --git a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java index f9437f0e..e508ed14 100644 --- a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java +++ b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java @@ -1,5 +1,5 @@ @lombok.Data(staticConstructor = "of") @lombok.NoArgsConstructor class ConflictingStaticConstructorNames { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ConflictingStaticConstructorNames))) @@ -9,17 +9,17 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof ConflictingStaticConstructorNames); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ConflictingStaticConstructorNames()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConflictingStaticConstructorNames() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConflictingStaticConstructorNames() { super(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/Constructors.java b/test/transform/resource/after-ecj/Constructors.java index 4cc24a81..7537a0f8 100644 --- a/test/transform/resource/after-ecj/Constructors.java +++ b/test/transform/resource/after-ecj/Constructors.java @@ -1,7 +1,7 @@ @lombok.RequiredArgsConstructor class RequiredArgsConstructor1 { final int x; String name; - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructor1(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructor1(final int x) { super(); this.x = x; } @@ -9,7 +9,7 @@ @lombok.RequiredArgsConstructor(access = lombok.AccessLevel.PROTECTED) class RequiredArgsConstructorAccess { final int x; String name; - protected @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorAccess(final int x) { + protected @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorAccess(final int x) { super(); this.x = x; } @@ -17,18 +17,18 @@ @lombok.RequiredArgsConstructor(staticName = "staticname") class RequiredArgsConstructorStaticName { final int x; String name; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticName(final int x) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorStaticName(final int x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticName staticname(final int x) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorStaticName staticname(final int x) { return new RequiredArgsConstructorStaticName(x); } } @lombok.RequiredArgsConstructor() class RequiredArgsConstructorWithAnnotations { final int x; String name; - public @Deprecated @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorWithAnnotations(final int x) { + public @Deprecated @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorWithAnnotations(final int x) { super(); this.x = x; } @@ -36,7 +36,7 @@ @lombok.AllArgsConstructor class AllArgsConstructor1 { final int x; String name; - public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AllArgsConstructor1(final int x, final String name) { + public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AllArgsConstructor1(final int x, final String name) { super(); this.x = x; this.name = name; @@ -45,35 +45,35 @@ @lombok.NoArgsConstructor class NoArgsConstructor1 { int x; String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructor1() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated NoArgsConstructor1() { super(); } } @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics<T extends Number> { final T x; String name; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticNameGenerics(final T x) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorStaticNameGenerics(final T x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>RequiredArgsConstructorStaticNameGenerics<T> of(final T x) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T extends Number>RequiredArgsConstructorStaticNameGenerics<T> of(final T x) { return new RequiredArgsConstructorStaticNameGenerics<T>(x); } } @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics2<T extends Number> { final Class<T> x; String name; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T extends Number>RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) { return new RequiredArgsConstructorStaticNameGenerics2<T>(x); } } @lombok.AllArgsConstructor(access = lombok.AccessLevel.PACKAGE) class AllArgsConstructorPackageAccess { final String x; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AllArgsConstructorPackageAccess(final String x) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AllArgsConstructorPackageAccess(final String x) { super(); this.x = x; } @@ -86,7 +86,7 @@ final float f; final String s; byte z; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructor2() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated NoArgsConstructor2() { super(); this.x = 0; this.y = 0D; diff --git a/test/transform/resource/after-ecj/ConstructorsConfiguration.java b/test/transform/resource/after-ecj/ConstructorsConfiguration.java index 33a95181..8bd1e38b 100644 --- a/test/transform/resource/after-ecj/ConstructorsConfiguration.java +++ b/test/transform/resource/after-ecj/ConstructorsConfiguration.java @@ -1,13 +1,13 @@ @lombok.AllArgsConstructor class ConstructorsConfiguration { int x; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsConfiguration(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorsConfiguration(final int x) { super(); this.x = x; } } @lombok.AllArgsConstructor(suppressConstructorProperties = false) class ConstructorsConfigurationExplicit { int x; - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsConfigurationExplicit(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorsConfigurationExplicit(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java index 7c691b42..27ff3488 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java +++ b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java @@ -3,7 +3,7 @@ int pUpper; int _huh; int __huh2; - public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { + public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { super(); this.plower = plower; this.pUpper = upper; diff --git a/test/transform/resource/after-ecj/DataConfiguration.java b/test/transform/resource/after-ecj/DataConfiguration.java index 4ca1f093..83b95737 100644 --- a/test/transform/resource/after-ecj/DataConfiguration.java +++ b/test/transform/resource/after-ecj/DataConfiguration.java @@ -1,9 +1,9 @@ @lombok.Data class DataConfiguration { final int x; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataConfiguration))) @@ -15,19 +15,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataConfiguration); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("DataConfiguration(x=" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataConfiguration(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataConfiguration(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/DataExtended.java b/test/transform/resource/after-ecj/DataExtended.java index 46446a0f..875b4cd7 100644 --- a/test/transform/resource/after-ecj/DataExtended.java +++ b/test/transform/resource/after-ecj/DataExtended.java @@ -1,12 +1,12 @@ @lombok.Data @lombok.ToString(doNotUseGetters = true) class DataExtended { int x; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataExtended))) @@ -18,19 +18,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataExtended); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataExtended() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataExtended() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("DataExtended(x=" + this.x) + ")"); } } diff --git a/test/transform/resource/after-ecj/DataIgnore.java b/test/transform/resource/after-ecj/DataIgnore.java index dbf9713f..264f9927 100644 --- a/test/transform/resource/after-ecj/DataIgnore.java +++ b/test/transform/resource/after-ecj/DataIgnore.java @@ -1,10 +1,10 @@ @lombok.Data class DataIgnore { final int x; String $name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataIgnore))) @@ -16,19 +16,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataIgnore); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("DataIgnore(x=" + this.getX()) + ")"); } - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataIgnore(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataIgnore(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/DataOnEnum.java b/test/transform/resource/after-ecj/DataOnEnum.java index 917a840b..c80696dd 100644 --- a/test/transform/resource/after-ecj/DataOnEnum.java +++ b/test/transform/resource/after-ecj/DataOnEnum.java @@ -3,13 +3,13 @@ public @lombok.Getter @lombok.ToString @lombok.RequiredArgsConstructor enum Data private final String someField; <clinit>() { } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getSomeField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getSomeField() { return this.someField; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("DataOnEnum(someField=" + this.getSomeField()) + ")"); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataOnEnum(final String someField) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataOnEnum(final String someField) { super(); this.someField = someField; } diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java index 9d6bced1..ee7682bd 100644 --- a/test/transform/resource/after-ecj/DataOnLocalClass.java +++ b/test/transform/resource/after-ecj/DataOnLocalClass.java @@ -7,16 +7,16 @@ class DataOnLocalClass1 { @Data class Local { final int x; String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local))) @@ -32,10 +32,10 @@ class DataOnLocalClass1 { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -43,10 +43,10 @@ class DataOnLocalClass1 { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Local(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Local(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Local(final int x) { super(); this.x = x; } @@ -58,17 +58,17 @@ class DataOnLocalClass2 { @Data class Local { @Data class InnerLocal { @lombok.NonNull String name; - public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final @lombok.NonNull String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setName(final @lombok.NonNull String name) { if ((name == null)) { throw new java.lang.NullPointerException("name"); } this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local.InnerLocal))) @@ -82,20 +82,20 @@ class DataOnLocalClass2 { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local.InnerLocal); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $name = this.getName(); result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("Local.InnerLocal(name=" + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InnerLocal(final @lombok.NonNull String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated InnerLocal(final @lombok.NonNull String name) { super(); if ((name == null)) { @@ -105,10 +105,10 @@ class DataOnLocalClass2 { } } final int x; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local))) @@ -120,19 +120,19 @@ class DataOnLocalClass2 { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("Local(x=" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Local(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Local(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java index ba6c75c8..708b2102 100644 --- a/test/transform/resource/after-ecj/DataPlain.java +++ b/test/transform/resource/after-ecj/DataPlain.java @@ -2,16 +2,16 @@ import lombok.Data; @lombok.Data class Data1 { final int x; String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data1))) @@ -27,10 +27,10 @@ import lombok.Data; return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -38,10 +38,10 @@ import lombok.Data; result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Data1(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data1(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Data1(final int x) { super(); this.x = x; } @@ -49,16 +49,16 @@ import lombok.Data; @Data class Data2 { final int x; String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data2))) @@ -74,10 +74,10 @@ import lombok.Data; return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -85,10 +85,10 @@ import lombok.Data; result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Data2(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data2(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Data2(final int x) { super(); this.x = x; } @@ -96,16 +96,16 @@ import lombok.Data; final @Data class Data3 { final int x; String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data3))) @@ -119,7 +119,7 @@ final @Data class Data3 { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -127,10 +127,10 @@ final @Data class Data3 { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Data3(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data3(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Data3(final int x) { super(); this.x = x; } @@ -140,16 +140,16 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java Data4() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("Data4(x=" + this.getX()) + ")"); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data4))) @@ -163,10 +163,10 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data4); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + super.hashCode()); @@ -175,7 +175,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java } } @Data class Data5 { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data5))) @@ -185,36 +185,36 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data5); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "Data5()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data5() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Data5() { super(); } } final @Data class Data6 { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data6))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "Data6()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data6() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Data6() { super(); } } diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java index 5a358c89..62661aad 100644 --- a/test/transform/resource/after-ecj/DataWithGetter.java +++ b/test/transform/resource/after-ecj/DataWithGetter.java @@ -2,13 +2,13 @@ private int x; private int y; private final String z; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setY(final int y) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setY(final int y) { this.y = y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataWithGetter))) @@ -26,10 +26,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataWithGetter); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -38,20 +38,20 @@ result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("DataWithGetter(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")"); } - public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataWithGetter(final String z) { + public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataWithGetter(final String z) { super(); this.z = z; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getY() { return this.y; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getZ() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getZ() { return this.z; } } diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java index b03ce146..c28cf119 100644 --- a/test/transform/resource/after-ecj/DataWithGetterNone.java +++ b/test/transform/resource/after-ecj/DataWithGetterNone.java @@ -2,13 +2,13 @@ private int x; private int y; private final String z; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setY(final int y) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setY(final int y) { this.y = y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataWithGetterNone))) @@ -26,10 +26,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataWithGetterNone); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -38,10 +38,10 @@ result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("DataWithGetterNone(x=" + this.x) + ", y=") + this.y) + ", z=") + this.z) + ")"); } - public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataWithGetterNone(final String z) { + public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataWithGetterNone(final String z) { super(); this.z = z; } diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java index 06b57ceb..41c3e7b9 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetter.java +++ b/test/transform/resource/after-ecj/DelegateOnGetter.java @@ -9,7 +9,7 @@ class DelegateOnGetter { DelegateOnGetter() { super(); } - public @Delegate @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Bar getBar() { + public @Delegate @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Bar getBar() { java.lang.Object value = this.bar.get(); if ((value == null)) { @@ -35,10 +35,10 @@ class DelegateOnGetter { } return (Bar) ((value == this.bar) ? null : value); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getInt() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getInt() { return this.getBar().getInt(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setList(final java.util.ArrayList<java.lang.String> list) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setList(final java.util.ArrayList<java.lang.String> list) { this.getBar().setList(list); } } diff --git a/test/transform/resource/after-ecj/DelegateOnGetterNone.java b/test/transform/resource/after-ecj/DelegateOnGetterNone.java index 2018e1e9..86e508bc 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetterNone.java +++ b/test/transform/resource/after-ecj/DelegateOnGetterNone.java @@ -10,10 +10,10 @@ import lombok.Getter; DelegateOnGetterNone() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getInt() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getInt() { return this.bar.getInt(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setList(final java.util.ArrayList<java.lang.String> list) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setList(final java.util.ArrayList<java.lang.String> list) { this.bar.setList(list); } } diff --git a/test/transform/resource/after-ecj/DelegateOnMethods.java b/test/transform/resource/after-ecj/DelegateOnMethods.java index 3e833ebb..21b84654 100644 --- a/test/transform/resource/after-ecj/DelegateOnMethods.java +++ b/test/transform/resource/after-ecj/DelegateOnMethods.java @@ -7,7 +7,7 @@ abstract class DelegateOnMethods { super(); } public abstract @Delegate Bar getBar(); - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void bar(final java.util.ArrayList<java.lang.String> list) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void bar(final java.util.ArrayList<java.lang.String> list) { this.getBar().bar(list); } } diff --git a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java index 3718c5d9..31bb0be6 100644 --- a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java +++ b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java @@ -27,10 +27,10 @@ class DelegatePlain { DelegatePlain() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void bar(final java.util.ArrayList<java.lang.String> list) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void bar(final java.util.ArrayList<java.lang.String> list) { this.bar.bar(list); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void foo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void foo() { this.foo.foo(); } } diff --git a/test/transform/resource/after-ecj/DelegateWithDeprecated.java b/test/transform/resource/after-ecj/DelegateWithDeprecated.java index ab3aa188..89e78b8c 100644 --- a/test/transform/resource/after-ecj/DelegateWithDeprecated.java +++ b/test/transform/resource/after-ecj/DelegateWithDeprecated.java @@ -9,13 +9,13 @@ class DelegateWithDeprecated { DelegateWithDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void deprecatedAnnotation() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void deprecatedAnnotation() { this.bar.deprecatedAnnotation(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void deprecatedComment() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void deprecatedComment() { this.bar.deprecatedComment(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void notDeprecated() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void notDeprecated() { this.bar.notDeprecated(); } } diff --git a/test/transform/resource/after-ecj/DelegateWithVarargs.java b/test/transform/resource/after-ecj/DelegateWithVarargs.java index a0b5b7b5..98da057b 100644 --- a/test/transform/resource/after-ecj/DelegateWithVarargs.java +++ b/test/transform/resource/after-ecj/DelegateWithVarargs.java @@ -10,16 +10,16 @@ class DelegateWithVarargs { DelegateWithVarargs() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void array(final int[] array) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void array(final int[] array) { this.bar.array(array); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void arrayVarargs(final int[]... arrayVarargs) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void arrayVarargs(final int[]... arrayVarargs) { this.bar.arrayVarargs(arrayVarargs); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void justOneParameter(final int... varargs) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void justOneParameter(final int... varargs) { this.bar.justOneParameter(varargs); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void multipleParameters(final java.lang.String first, final int... varargs) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void multipleParameters(final java.lang.String first, final int... varargs) { this.bar.multipleParameters(first, varargs); } } diff --git a/test/transform/resource/after-ecj/EncodingUtf8.java b/test/transform/resource/after-ecj/EncodingUtf8.java index 29dce86f..b66feb0c 100644 --- a/test/transform/resource/after-ecj/EncodingUtf8.java +++ b/test/transform/resource/after-ecj/EncodingUtf8.java @@ -1,9 +1 @@ -@lombok.ToString class EncodingUtf8 { - String foo๑๑ = "\t\b "; - EncodingUtf8() { - super(); - } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { - return (("EncodingUtf8(foo๑๑=" + this.foo๑๑) + ")"); - } -}
\ No newline at end of file +//ignore: This test serves to check what happens with 'weird' characters when you use delombok. It's just not relevant for ecj. diff --git a/test/transform/resource/after-ecj/EqualsAndHashCode.java b/test/transform/resource/after-ecj/EqualsAndHashCode.java index c0bb5bbb..e72352cc 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCode.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCode.java @@ -7,7 +7,7 @@ EqualsAndHashCode() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode))) @@ -31,10 +31,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -56,7 +56,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 { EqualsAndHashCode2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode2))) @@ -74,7 +74,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -91,7 +91,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte EqualsAndHashCode3() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode3))) @@ -101,10 +101,10 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } @@ -113,7 +113,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte EqualsAndHashCode4() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode4))) @@ -125,10 +125,10 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode4); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + super.hashCode()); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java index d2c7b201..59c34377 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java @@ -2,7 +2,7 @@ EqualsAndHashCodeConfigKeys1Parent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys1Parent))) @@ -12,10 +12,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys1Parent); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } @@ -25,7 +25,7 @@ EqualsAndHashCodeConfigKeys1() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys1))) @@ -37,10 +37,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java index 0b93f980..2ce92965 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java @@ -2,7 +2,7 @@ EqualsAndHashCodeConfigKeys2Parent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys2Parent))) @@ -12,10 +12,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys2Parent); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } @@ -25,7 +25,7 @@ EqualsAndHashCodeConfigKeys2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys2))) @@ -39,10 +39,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + super.hashCode()); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java index e4efb336..477ee64c 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java @@ -24,7 +24,7 @@ final @lombok.EqualsAndHashCode(callSuper = true) class EqualsAndHashCodeWithExi private boolean canEqual(Object other) { return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithExistingMethods3))) @@ -38,7 +38,7 @@ final @lombok.EqualsAndHashCode(callSuper = true) class EqualsAndHashCodeWithExi return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + super.hashCode()); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java index a59d2835..f7845019 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java @@ -10,7 +10,7 @@ EqualsAndHashCodeWithOnParam() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final @Nullable java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final @Nullable java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithOnParam))) @@ -34,10 +34,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final @Nullable java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final @Nullable java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithOnParam); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java index 283c5430..fda2d69b 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java +++ b/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java @@ -4,7 +4,7 @@ final @lombok.EqualsAndHashCode(of = {"x"}) class EqualsAndHashCodeOf { EqualsAndHashCodeOf() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeOf))) @@ -14,7 +14,7 @@ final @lombok.EqualsAndHashCode(of = {"x"}) class EqualsAndHashCodeOf { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -27,7 +27,7 @@ final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude EqualsAndHashCodeExclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeExclude))) @@ -37,7 +37,7 @@ final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java b/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java index 6a727f1d..50658497 100644 --- a/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java +++ b/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java @@ -1,6 +1,6 @@ @lombok.RequiredArgsConstructor class FieldDefaultsViaConfigAndRequiredArgsConstructor { final int x; - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java b/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java index 407d41b6..78c46eae 100644 --- a/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java +++ b/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java @@ -3,7 +3,7 @@ class GenerateSuppressFBWarnings { GenerateSuppressFBWarnings() { super(); } - public @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") @javax.annotation.Generated("lombok") int getY() { + public @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") @javax.annotation.Generated("lombok") @lombok.Generated int getY() { return this.y; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/GeneratedGlobalOff.java b/test/transform/resource/after-ecj/GeneratedGlobalOff.java new file mode 100644 index 00000000..046bac10 --- /dev/null +++ b/test/transform/resource/after-ecj/GeneratedGlobalOff.java @@ -0,0 +1,9 @@ +class GeneratedGlobalOff { + @lombok.Getter int x; + GeneratedGlobalOff() { + super(); + } + public @java.lang.SuppressWarnings("all") int getX() { + return this.x; + } +} diff --git a/test/transform/resource/after-ecj/GeneratedGlobalOffJavaxOn.java b/test/transform/resource/after-ecj/GeneratedGlobalOffJavaxOn.java new file mode 100644 index 00000000..25aea362 --- /dev/null +++ b/test/transform/resource/after-ecj/GeneratedGlobalOffJavaxOn.java @@ -0,0 +1,9 @@ +class GeneratedGlobalOffJavaxOn { + @lombok.Getter int x; + GeneratedGlobalOffJavaxOn() { + super(); + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + return this.x; + } +} diff --git a/test/transform/resource/after-ecj/GeneratedGlobalOffLombokOn.java b/test/transform/resource/after-ecj/GeneratedGlobalOffLombokOn.java new file mode 100644 index 00000000..edb72863 --- /dev/null +++ b/test/transform/resource/after-ecj/GeneratedGlobalOffLombokOn.java @@ -0,0 +1,9 @@ +class GeneratedGlobalOffLombokOn { + @lombok.Getter int x; + GeneratedGlobalOffLombokOn() { + super(); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { + return this.x; + } +} diff --git a/test/transform/resource/after-ecj/GeneratedJavaxOff.java b/test/transform/resource/after-ecj/GeneratedJavaxOff.java new file mode 100644 index 00000000..43c2e954 --- /dev/null +++ b/test/transform/resource/after-ecj/GeneratedJavaxOff.java @@ -0,0 +1,9 @@ +class GeneratedJavaxOff { + @lombok.Getter int x; + GeneratedJavaxOff() { + super(); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { + return this.x; + } +} diff --git a/test/transform/resource/after-ecj/GeneratedLombokOff.java b/test/transform/resource/after-ecj/GeneratedLombokOff.java new file mode 100644 index 00000000..2f153ec7 --- /dev/null +++ b/test/transform/resource/after-ecj/GeneratedLombokOff.java @@ -0,0 +1,9 @@ +class GeneratedLombokOff { + @lombok.Getter int x; + GeneratedLombokOff() { + super(); + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + return this.x; + } +} diff --git a/test/transform/resource/after-ecj/GetterAccessLevel.java b/test/transform/resource/after-ecj/GetterAccessLevel.java index 533e05cc..9988a240 100644 --- a/test/transform/resource/after-ecj/GetterAccessLevel.java +++ b/test/transform/resource/after-ecj/GetterAccessLevel.java @@ -13,31 +13,31 @@ class GetterAccessLevel { GetterAccessLevel() { super(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPrivate() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPrivate() { return this.isPrivate; } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPackage() { return this.isPackage; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isProtected() { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isProtected() { return this.isProtected; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPublic() { return this.isPublic; } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPrivateString() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getPrivateString() { return this.privateString; } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPackageString() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getPackageString() { return this.packageString; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getProtectedString() { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getProtectedString() { return this.protectedString; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPublicString() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getPublicString() { return this.publicString; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getValue() { return this.value; } } diff --git a/test/transform/resource/after-ecj/GetterAlreadyExists.java b/test/transform/resource/after-ecj/GetterAlreadyExists.java index b0856dce..6e3a5d08 100644 --- a/test/transform/resource/after-ecj/GetterAlreadyExists.java +++ b/test/transform/resource/after-ecj/GetterAlreadyExists.java @@ -6,7 +6,7 @@ class Getter1 { boolean hasFoo() { return true; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isFoo() { return this.foo; } } @@ -36,7 +36,7 @@ class Getter4 { String hasFoo() { return null; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -48,7 +48,7 @@ class Getter5 { String isFoo() { return null; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -69,7 +69,7 @@ class Getter7 { boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -81,7 +81,7 @@ class Getter8 { boolean isFoo() { return false; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -102,7 +102,7 @@ class Getter10 { static boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isFoo() { return this.foo; } } @@ -132,7 +132,7 @@ class Getter13 { static boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -144,7 +144,7 @@ class Getter14 { static boolean isFoo() { return false; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -165,7 +165,7 @@ class Getter16 { static String hasFoo() { return ""; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -177,7 +177,7 @@ class Getter17 { static String isFoo() { return ""; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterBoolean.java b/test/transform/resource/after-ecj/GetterBoolean.java index a1d1446e..03619e7f 100644 --- a/test/transform/resource/after-ecj/GetterBoolean.java +++ b/test/transform/resource/after-ecj/GetterBoolean.java @@ -5,13 +5,13 @@ class Getter { Getter() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isFoo() { return this.foo; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBar() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isBar() { return this.isBar; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isHasBaz() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isHasBaz() { return this.hasBaz; } } @@ -23,7 +23,7 @@ class MoreGetter { boolean hasFoo() { return true; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterDeprecated.java b/test/transform/resource/after-ecj/GetterDeprecated.java index fc7ce561..d7e661fb 100644 --- a/test/transform/resource/after-ecj/GetterDeprecated.java +++ b/test/transform/resource/after-ecj/GetterDeprecated.java @@ -5,10 +5,10 @@ class GetterDeprecated { GetterDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getAnnotation() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getAnnotation() { return this.annotation; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getJavadoc() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getJavadoc() { return this.javadoc; } } diff --git a/test/transform/resource/after-ecj/GetterEnum.java b/test/transform/resource/after-ecj/GetterEnum.java index 22a5b0fd..d54b4809 100644 --- a/test/transform/resource/after-ecj/GetterEnum.java +++ b/test/transform/resource/after-ecj/GetterEnum.java @@ -7,13 +7,13 @@ import lombok.RequiredArgsConstructor; private final @Getter String name; <clinit>() { } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getId() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getId() { return this.id; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterEnum(final int id, final String name) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated GetterEnum(final int id, final String name) { super(); this.id = id; this.name = name; diff --git a/test/transform/resource/after-ecj/GetterLazy.java b/test/transform/resource/after-ecj/GetterLazy.java index d1ec507c..e48d5e31 100644 --- a/test/transform/resource/after-ecj/GetterLazy.java +++ b/test/transform/resource/after-ecj/GetterLazy.java @@ -8,7 +8,7 @@ class GetterLazy { GetterLazy() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueType getFieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueType getFieldName() { java.lang.Object value = this.fieldName.get(); if ((value == null)) { diff --git a/test/transform/resource/after-ecj/GetterLazyBoolean.java b/test/transform/resource/after-ecj/GetterLazyBoolean.java index 0a1d2564..2edae3bc 100644 --- a/test/transform/resource/after-ecj/GetterLazyBoolean.java +++ b/test/transform/resource/after-ecj/GetterLazyBoolean.java @@ -7,7 +7,7 @@ private static boolean calculateBoolean() { return true; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBooleanValue() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isBooleanValue() { java.lang.Object value = this.booleanValue.get(); if ((value == null)) { @@ -24,7 +24,7 @@ } return (java.lang.Boolean) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isOtherBooleanValue() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isOtherBooleanValue() { java.lang.Object value = this.otherBooleanValue.get(); if ((value == null)) { @@ -41,7 +41,7 @@ } return (java.lang.Boolean) value; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterLazyBoolean))) @@ -53,16 +53,16 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterLazyBoolean); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + (this.isBooleanValue() ? 79 : 97)); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("GetterLazyBoolean(booleanValue=" + this.isBooleanValue()) + ")"); } } diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java index 40716f8b..f192555e 100644 --- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java +++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java @@ -4,7 +4,7 @@ GetterLazyEahcToString() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getValue() { java.lang.Object value = this.value.get(); if ((value == null)) { @@ -21,10 +21,10 @@ } return (String) ((value == this.value) ? null : value); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue2() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getValue2() { return this.value2; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterLazyEahcToString))) @@ -42,10 +42,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterLazyEahcToString); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $value = this.getValue(); @@ -54,7 +54,7 @@ result = ((result * PRIME) + (($value2 == null) ? 43 : $value2.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("GetterLazyEahcToString(value=" + this.getValue()) + ", value2=") + this.value2) + ")"); } } diff --git a/test/transform/resource/after-ecj/GetterLazyInvalid.java b/test/transform/resource/after-ecj/GetterLazyInvalid.java index 8e2bc4f3..abfba640 100644 --- a/test/transform/resource/after-ecj/GetterLazyInvalid.java +++ b/test/transform/resource/after-ecj/GetterLazyInvalid.java @@ -27,7 +27,7 @@ class GetterLazyInvalidNone { GetterLazyInvalidClass() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFieldName() { return this.fieldName; } } diff --git a/test/transform/resource/after-ecj/GetterLazyNative.java b/test/transform/resource/after-ecj/GetterLazyNative.java index 40fe1c84..1bcc3206 100644 --- a/test/transform/resource/after-ecj/GetterLazyNative.java +++ b/test/transform/resource/after-ecj/GetterLazyNative.java @@ -11,7 +11,7 @@ class GetterLazyNative { GetterLazyNative() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBooleanField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isBooleanField() { java.lang.Object value = this.booleanField.get(); if ((value == null)) { @@ -28,7 +28,7 @@ class GetterLazyNative { } return (java.lang.Boolean) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") byte getByteField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated byte getByteField() { java.lang.Object value = this.byteField.get(); if ((value == null)) { @@ -45,7 +45,7 @@ class GetterLazyNative { } return (java.lang.Byte) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") short getShortField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated short getShortField() { java.lang.Object value = this.shortField.get(); if ((value == null)) { @@ -62,7 +62,7 @@ class GetterLazyNative { } return (java.lang.Short) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getIntField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getIntField() { java.lang.Object value = this.intField.get(); if ((value == null)) { @@ -79,7 +79,7 @@ class GetterLazyNative { } return (java.lang.Integer) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") long getLongField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated long getLongField() { java.lang.Object value = this.longField.get(); if ((value == null)) { @@ -96,7 +96,7 @@ class GetterLazyNative { } return (java.lang.Long) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") float getFloatField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated float getFloatField() { java.lang.Object value = this.floatField.get(); if ((value == null)) { @@ -113,7 +113,7 @@ class GetterLazyNative { } return (java.lang.Float) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") double getDoubleField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated double getDoubleField() { java.lang.Object value = this.doubleField.get(); if ((value == null)) { @@ -130,7 +130,7 @@ class GetterLazyNative { } return (java.lang.Double) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") char getCharField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated char getCharField() { java.lang.Object value = this.charField.get(); if ((value == null)) { @@ -147,7 +147,7 @@ class GetterLazyNative { } return (java.lang.Character) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int[] getIntArrayField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int[] getIntArrayField() { java.lang.Object value = this.intArrayField.get(); if ((value == null)) { diff --git a/test/transform/resource/after-ecj/GetterLazyTransient.java b/test/transform/resource/after-ecj/GetterLazyTransient.java index 9bc0d9ae..73eb920e 100644 --- a/test/transform/resource/after-ecj/GetterLazyTransient.java +++ b/test/transform/resource/after-ecj/GetterLazyTransient.java @@ -5,7 +5,7 @@ class GetterLazyTransient { GetterLazyTransient() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getNonTransientField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getNonTransientField() { java.lang.Object value = this.nonTransientField.get(); if ((value == null)) { @@ -22,7 +22,7 @@ class GetterLazyTransient { } return (java.lang.Integer) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getNonLazyTransientField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getNonLazyTransientField() { return this.nonLazyTransientField; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterNone.java b/test/transform/resource/after-ecj/GetterNone.java index e13379e0..56c19630 100644 --- a/test/transform/resource/after-ecj/GetterNone.java +++ b/test/transform/resource/after-ecj/GetterNone.java @@ -6,7 +6,7 @@ import lombok.Getter; GetterNone() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/GetterOnClass.java b/test/transform/resource/after-ecj/GetterOnClass.java index deb56392..8a822bcd 100644 --- a/test/transform/resource/after-ecj/GetterOnClass.java +++ b/test/transform/resource/after-ecj/GetterOnClass.java @@ -4,7 +4,7 @@ GetterOnClass1() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPublic() { return this.isPublic; } } @@ -15,10 +15,10 @@ GetterOnClass2() { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPackage() { return this.isPackage; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isProtected() { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isProtected() { return this.isProtected; } } @@ -28,7 +28,7 @@ GetterOnClass3() { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPackage() { return this.isPackage; } } @@ -38,7 +38,7 @@ GetterOnClass4() { super(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPrivate() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPrivate() { return this.isPrivate; } } @@ -48,7 +48,7 @@ GetterOnClass5() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPublic() { return this.isPublic; } } @@ -58,10 +58,10 @@ GetterOnClass6() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getCouldBeNull() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getCouldBeNull() { return this.couldBeNull; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getNonNull() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getNonNull() { return this.nonNull; } } diff --git a/test/transform/resource/after-ecj/GetterOnMethod.java b/test/transform/resource/after-ecj/GetterOnMethod.java index 6b227326..78cbf44d 100644 --- a/test/transform/resource/after-ecj/GetterOnMethod.java +++ b/test/transform/resource/after-ecj/GetterOnMethod.java @@ -7,13 +7,13 @@ class GetterOnMethod { GetterOnMethod() { super(); } - public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() { + public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getI() { return this.i; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getJ() { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getJ() { return this.j; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getK() { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getK() { return this.k; } } diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors.java b/test/transform/resource/after-ecj/GetterOnMethodErrors.java index 7ba02422..af196221 100644 --- a/test/transform/resource/after-ecj/GetterOnMethodErrors.java +++ b/test/transform/resource/after-ecj/GetterOnMethodErrors.java @@ -8,7 +8,7 @@ class PlaceFillerToMakeSurePositionIsRelevant { GetterOnMethodErrors() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getTest() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getTest() { return this.test; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java index 0dfd4c13..8801a199 100644 --- a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java +++ b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java @@ -12,28 +12,28 @@ class GetterOnMethodErrors2 { GetterOnMethodErrors2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad1() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getBad1() { return this.bad1; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad2() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getBad2() { return this.bad2; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad3() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getBad3() { return this.bad3; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad4() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getBad4() { return this.bad4; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood1() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getGood1() { return this.good1; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood2() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getGood2() { return this.good2; } - public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood3() { + public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getGood3() { return this.good3; } - public @Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood4() { + public @Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getGood4() { return this.good4; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterOnStatic.java b/test/transform/resource/after-ecj/GetterOnStatic.java index 89b83ed0..ec6d887e 100644 --- a/test/transform/resource/after-ecj/GetterOnStatic.java +++ b/test/transform/resource/after-ecj/GetterOnStatic.java @@ -6,10 +6,10 @@ class Getter { Getter() { super(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isFoo() { return Getter.foo; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBar() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getBar() { return Getter.bar; } } diff --git a/test/transform/resource/after-ecj/GetterPlain.java b/test/transform/resource/after-ecj/GetterPlain.java index d3801b62..6e1540ad 100644 --- a/test/transform/resource/after-ecj/GetterPlain.java +++ b/test/transform/resource/after-ecj/GetterPlain.java @@ -5,10 +5,10 @@ class GetterPlain { GetterPlain() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getI() { return this.i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterSetterJavadoc.java b/test/transform/resource/after-ecj/GetterSetterJavadoc.java index 275b408d..da2f4324 100644 --- a/test/transform/resource/after-ecj/GetterSetterJavadoc.java +++ b/test/transform/resource/after-ecj/GetterSetterJavadoc.java @@ -1,12 +1,12 @@ @lombok.Data class GetterSetterJavadoc1 { private int fieldName; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getFieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterSetterJavadoc1))) @@ -18,19 +18,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterSetterJavadoc1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getFieldName()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("GetterSetterJavadoc1(fieldName=" + this.getFieldName()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterSetterJavadoc1() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated GetterSetterJavadoc1() { super(); } } @@ -39,10 +39,10 @@ class GetterSetterJavadoc2 { GetterSetterJavadoc2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getFieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } } @@ -51,10 +51,10 @@ class GetterSetterJavadoc3 { GetterSetterJavadoc3() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getFieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } } @@ -63,10 +63,10 @@ class GetterSetterJavadoc3 { GetterSetterJavadoc4() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int fieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int fieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterSetterJavadoc4 fieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated GetterSetterJavadoc4 fieldName(final int fieldName) { this.fieldName = fieldName; return this; } @@ -76,10 +76,10 @@ class GetterSetterJavadoc3 { GetterSetterJavadoc5() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int fieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int fieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterSetterJavadoc5 fieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated GetterSetterJavadoc5 fieldName(final int fieldName) { this.fieldName = fieldName; return this; } diff --git a/test/transform/resource/after-ecj/GetterWithDollar.java b/test/transform/resource/after-ecj/GetterWithDollar.java index 424635ed..0223ae16 100644 --- a/test/transform/resource/after-ecj/GetterWithDollar.java +++ b/test/transform/resource/after-ecj/GetterWithDollar.java @@ -3,7 +3,7 @@ class GetterWithDollar1 { GetterWithDollar1() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int get$i() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int get$i() { return this.$i; } } @@ -13,10 +13,10 @@ class GetterWithDollar2 { GetterWithDollar2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int get$i() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int get$i() { return this.$i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/MixGetterVal.java b/test/transform/resource/after-ecj/MixGetterVal.java index fbc89a02..92882390 100644 --- a/test/transform/resource/after-ecj/MixGetterVal.java +++ b/test/transform/resource/after-ecj/MixGetterVal.java @@ -13,7 +13,7 @@ class MixGetterVal { final @val int a = getX(); m(a); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/MultiFieldGetter.java b/test/transform/resource/after-ecj/MultiFieldGetter.java index a608578e..0045de34 100644 --- a/test/transform/resource/after-ecj/MultiFieldGetter.java +++ b/test/transform/resource/after-ecj/MultiFieldGetter.java @@ -6,10 +6,10 @@ class MultiFieldGetter { MultiFieldGetter() { super(); } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getY() { return this.y; } } @@ -19,10 +19,10 @@ class MultiFieldGetter { MultiFieldGetter2() { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getY() { return this.y; } } diff --git a/test/transform/resource/after-ecj/NoArgsConstructorForce.java b/test/transform/resource/after-ecj/NoArgsConstructorForce.java index d0e69b0d..e191e5eb 100644 --- a/test/transform/resource/after-ecj/NoArgsConstructorForce.java +++ b/test/transform/resource/after-ecj/NoArgsConstructorForce.java @@ -3,7 +3,7 @@ public @NoArgsConstructor(force = true) class NoArgsConstructorForce { private final int[] i; private final Object[] o; private final java.util.List<?>[] fullQualifiedList; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructorForce() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated NoArgsConstructorForce() { super(); this.i = null; this.o = null; diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java index 592ff4b5..d9059d7a 100644 --- a/test/transform/resource/after-ecj/NonNullPlain.java +++ b/test/transform/resource/after-ecj/NonNullPlain.java @@ -5,7 +5,7 @@ import java.lang.annotation.*; @lombok.NonNull int i; @lombok.NonNull String s; @NotNull Object o; - public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) { + public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) { super(); if ((s == null)) { @@ -14,26 +14,26 @@ import java.lang.annotation.*; this.i = i; this.s = s; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getI() { return this.i; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getS() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getS() { return this.s; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Object getO() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Object getO() { return this.o; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @lombok.NonNull int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final @lombok.NonNull int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setS(final @lombok.NonNull String s) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setS(final @lombok.NonNull String s) { if ((s == null)) { throw new java.lang.NullPointerException("s"); } this.s = s; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setO(final Object o) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setO(final Object o) { this.o = o; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/NonNullWithAlternateException.java b/test/transform/resource/after-ecj/NonNullWithAlternateException.java index 1df18538..a2594b91 100644 --- a/test/transform/resource/after-ecj/NonNullWithAlternateException.java +++ b/test/transform/resource/after-ecj/NonNullWithAlternateException.java @@ -10,7 +10,7 @@ public class NonNullWithAlternateException { } System.out.println(arg); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setTest(final @lombok.NonNull String test) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setTest(final @lombok.NonNull String test) { if ((test == null)) { throw new java.lang.IllegalArgumentException("test is null"); diff --git a/test/transform/resource/after-ecj/SetterAccessLevel.java b/test/transform/resource/after-ecj/SetterAccessLevel.java index db26226f..a23e00cb 100644 --- a/test/transform/resource/after-ecj/SetterAccessLevel.java +++ b/test/transform/resource/after-ecj/SetterAccessLevel.java @@ -8,19 +8,19 @@ class SetterAccessLevel { SetterAccessLevel() { super(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setProtected(final boolean isProtected) { this.isProtected = isProtected; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setValue(final boolean value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setValue(final boolean value) { this.value = value; } } diff --git a/test/transform/resource/after-ecj/SetterAlreadyExists.java b/test/transform/resource/after-ecj/SetterAlreadyExists.java index 4a4d0c4c..228b07e4 100644 --- a/test/transform/resource/after-ecj/SetterAlreadyExists.java +++ b/test/transform/resource/after-ecj/SetterAlreadyExists.java @@ -37,7 +37,7 @@ class Setter5 { } void setFoo() { } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFoo(final String foo) { this.foo = foo; } } @@ -48,7 +48,7 @@ class Setter6 { } void setFoo(String foo, int x) { } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFoo(final String foo) { this.foo = foo; } } diff --git a/test/transform/resource/after-ecj/SetterDeprecated.java b/test/transform/resource/after-ecj/SetterDeprecated.java index 91008c96..dc899f8e 100644 --- a/test/transform/resource/after-ecj/SetterDeprecated.java +++ b/test/transform/resource/after-ecj/SetterDeprecated.java @@ -5,10 +5,10 @@ class SetterDeprecated { SetterDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setAnnotation(final int annotation) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setAnnotation(final int annotation) { this.annotation = annotation; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJavadoc(final int javadoc) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJavadoc(final int javadoc) { this.javadoc = javadoc; } } diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java index 8e6455d3..e3cebe68 100644 --- a/test/transform/resource/after-ecj/SetterOnClass.java +++ b/test/transform/resource/after-ecj/SetterOnClass.java @@ -4,7 +4,7 @@ SetterOnClass1() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } } @@ -15,10 +15,10 @@ SetterOnClass2() { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setProtected(final boolean isProtected) { this.isProtected = isProtected; } } @@ -28,7 +28,7 @@ SetterOnClass3() { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } } @@ -38,7 +38,7 @@ SetterOnClass4() { super(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } } @@ -48,7 +48,7 @@ SetterOnClass5() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } } @@ -58,10 +58,10 @@ SetterOnClass6() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setCouldBeNull(final String couldBeNull) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setCouldBeNull(final String couldBeNull) { this.couldBeNull = couldBeNull; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setNonNull(final @lombok.NonNull String nonNull) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setNonNull(final @lombok.NonNull String nonNull) { if ((nonNull == null)) { throw new java.lang.NullPointerException("nonNull"); diff --git a/test/transform/resource/after-ecj/SetterOnMethod.java b/test/transform/resource/after-ecj/SetterOnMethod.java index 4eaea8e5..8f4399eb 100644 --- a/test/transform/resource/after-ecj/SetterOnMethod.java +++ b/test/transform/resource/after-ecj/SetterOnMethod.java @@ -2,10 +2,10 @@ import lombok.Setter; class SetterOnMethod { @lombok.Setter() int i; @lombok.Setter() int j; - public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final int j) { this.j = j; } SetterOnMethod() { @@ -15,10 +15,10 @@ class SetterOnMethod { @lombok.Setter() class SetterOnClassOnMethod { int i; int j; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final int j) { this.j = j; } SetterOnClassOnMethod() { @@ -28,10 +28,10 @@ class SetterOnMethod { @lombok.Setter() class SetterOnClassAndOnAField { int i; @lombok.Setter() int j; - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final int j) { this.j = j; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } SetterOnClassAndOnAField() { diff --git a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java index 28799f42..ab580e22 100644 --- a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java +++ b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java @@ -7,13 +7,13 @@ class SetterOnMethodOnParam { SetterOnMethodOnParam() { super(); } - public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @Test int j) { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final @Test int j) { this.j = j; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setK(final @Test int k) { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setK(final @Test int k) { this.k = k; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/SetterOnParam.java b/test/transform/resource/after-ecj/SetterOnParam.java index 7c2d1fc6..d91645dc 100644 --- a/test/transform/resource/after-ecj/SetterOnParam.java +++ b/test/transform/resource/after-ecj/SetterOnParam.java @@ -2,10 +2,10 @@ import lombok.Setter; class SetterOnParam { @lombok.Setter() int i; @lombok.Setter() int j; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @SuppressWarnings("all") int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final @SuppressWarnings("all") int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int j) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int j) { this.j = j; } SetterOnParam() { @@ -15,10 +15,10 @@ class SetterOnParam { @lombok.Setter() class SetterOnClassOnParam { int i; int j; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final int j) { this.j = j; } SetterOnClassOnParam() { @@ -28,10 +28,10 @@ class SetterOnParam { @lombok.Setter() class SetterOnClassAndOnAFieldParam { int i; @lombok.Setter() int j; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int j) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int j) { this.j = j; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } SetterOnClassAndOnAFieldParam() { diff --git a/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java b/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java index 011b2241..fc60c75f 100644 --- a/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java +++ b/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java @@ -1,6 +1,6 @@ class SetterOnParamAndOnMethod { @lombok.Setter() int i; - public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @SuppressWarnings("all") int i) { + public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final @SuppressWarnings("all") int i) { this.i = i; } SetterOnParamAndOnMethod() { diff --git a/test/transform/resource/after-ecj/SetterOnStatic.java b/test/transform/resource/after-ecj/SetterOnStatic.java index 1c5b71ae..78799b42 100644 --- a/test/transform/resource/after-ecj/SetterOnStatic.java +++ b/test/transform/resource/after-ecj/SetterOnStatic.java @@ -6,10 +6,10 @@ class Setter { Setter() { super(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final boolean foo) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFoo(final boolean foo) { Setter.foo = foo; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setBar(final int bar) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setBar(final int bar) { Setter.bar = bar; } } diff --git a/test/transform/resource/after-ecj/SetterPlain.java b/test/transform/resource/after-ecj/SetterPlain.java index 4f428f0b..fc442efb 100644 --- a/test/transform/resource/after-ecj/SetterPlain.java +++ b/test/transform/resource/after-ecj/SetterPlain.java @@ -5,10 +5,10 @@ class SetterPlain { SetterPlain() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final int foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFoo(final int foo) { this.foo = foo; } } diff --git a/test/transform/resource/after-ecj/SetterWithDollar.java b/test/transform/resource/after-ecj/SetterWithDollar.java index e8bd91df..28fed82f 100644 --- a/test/transform/resource/after-ecj/SetterWithDollar.java +++ b/test/transform/resource/after-ecj/SetterWithDollar.java @@ -3,7 +3,7 @@ class SetterWithDollar1 { SetterWithDollar1() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void set$i(final int $i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void set$i(final int $i) { this.$i = $i; } } @@ -13,10 +13,10 @@ class SetterWithDollar2 { SetterWithDollar2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void set$i(final int $i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void set$i(final int $i) { this.$i = $i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } } diff --git a/test/transform/resource/after-ecj/SimpleTypeResolution.java b/test/transform/resource/after-ecj/SimpleTypeResolution.java index 736632bc..77d52ada 100644 --- a/test/transform/resource/after-ecj/SimpleTypeResolution.java +++ b/test/transform/resource/after-ecj/SimpleTypeResolution.java @@ -7,7 +7,7 @@ class SimpleTypeResolutionSuccess { private @lombok.Getter int x; SimpleTypeResolutionSuccess() { } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/ToStringConfiguration.java b/test/transform/resource/after-ecj/ToStringConfiguration.java index ca36d1b4..508c5f5a 100644 --- a/test/transform/resource/after-ecj/ToStringConfiguration.java +++ b/test/transform/resource/after-ecj/ToStringConfiguration.java @@ -5,10 +5,10 @@ import lombok.Getter; ToStringConfiguration() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration(" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } @@ -17,7 +17,7 @@ import lombok.Getter; ToStringConfiguration2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration2(x=" + this.x) + ")"); } } @@ -26,10 +26,10 @@ import lombok.Getter; ToStringConfiguration3() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration3(" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/ToStringInner.java b/test/transform/resource/after-ecj/ToStringInner.java index 027ccd0c..42fa81af 100644 --- a/test/transform/resource/after-ecj/ToStringInner.java +++ b/test/transform/resource/after-ecj/ToStringInner.java @@ -5,7 +5,7 @@ import lombok.ToString; ToStringInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringInner(y=" + this.y) + ")"); } } @@ -14,7 +14,7 @@ import lombok.ToString; ToStringStaticInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")"); } } @@ -24,7 +24,7 @@ import lombok.ToString; ToStringMoreInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")"); } } @@ -37,7 +37,7 @@ import lombok.ToString; ToStringOuter() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringPlain.java b/test/transform/resource/after-ecj/ToStringPlain.java index 939aa78e..fa87fde9 100644 --- a/test/transform/resource/after-ecj/ToStringPlain.java +++ b/test/transform/resource/after-ecj/ToStringPlain.java @@ -5,7 +5,7 @@ import lombok.ToString; ToString1() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("ToString1(x=" + this.x) + ", name=") + this.name) + ")"); } } @@ -15,7 +15,7 @@ import lombok.ToString; ToString2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("ToString2(x=" + this.x) + ", name=") + this.name) + ")"); } } diff --git a/test/transform/resource/after-ecj/Tolerate.java b/test/transform/resource/after-ecj/Tolerate.java index 1c7b1038..6b027163 100644 --- a/test/transform/resource/after-ecj/Tolerate.java +++ b/test/transform/resource/after-ecj/Tolerate.java @@ -7,10 +7,10 @@ import java.util.regex.Pattern; public @lombok.experimental.Tolerate void setPattern(String pattern) { setPattern(Pattern.compile(pattern)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPattern(final Pattern pattern) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPattern(final Pattern pattern) { this.pattern = pattern; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Pattern getPattern() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Pattern getPattern() { return this.pattern; } } @@ -22,13 +22,13 @@ import java.util.regex.Pattern; public Tolerate2 withPattern(String nameGlob, String extensionGlob) { return withPattern(((nameGlob.replace("*", ".*") + "\\.") + extensionGlob.replace("*", ".*"))); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Pattern getPattern() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Pattern getPattern() { return this.pattern; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Tolerate2 withPattern(final Pattern pattern) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Tolerate2 withPattern(final Pattern pattern) { return ((this.pattern == pattern) ? this : new Tolerate2(pattern)); } - public @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Tolerate2(final Pattern pattern) { + public @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Tolerate2(final Pattern pattern) { super(); this.pattern = pattern; } diff --git a/test/transform/resource/after-ecj/TrickyTypeResolution.java b/test/transform/resource/after-ecj/TrickyTypeResolution.java index 5ea802dc..aca9050d 100644 --- a/test/transform/resource/after-ecj/TrickyTypeResolution.java +++ b/test/transform/resource/after-ecj/TrickyTypeResolution.java @@ -20,7 +20,7 @@ class TrickySuccess { TrickySuccess() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/UtilityClass.java b/test/transform/resource/after-ecj/UtilityClass.java index 81d5d9e6..b2dfc0df 100644 --- a/test/transform/resource/after-ecj/UtilityClass.java +++ b/test/transform/resource/after-ecj/UtilityClass.java @@ -11,7 +11,7 @@ final @lombok.experimental.UtilityClass class UtilityClass { static void someMethod() { System.out.println(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") UtilityClass() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated UtilityClass() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -22,7 +22,7 @@ class UtilityInner { static int member; <clinit>() { } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InnerInnerInner() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated InnerInnerInner() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -36,7 +36,7 @@ class UtilityInner { static int member; <clinit>() { } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InsideEnum() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated InsideEnum() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -54,7 +54,7 @@ class UtilityInner { static int member; <clinit>() { } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InsideInterface() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated InsideInterface() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } diff --git a/test/transform/resource/after-ecj/ValueCallSuper.java b/test/transform/resource/after-ecj/ValueCallSuper.java index ecd4a1ef..7d046e56 100644 --- a/test/transform/resource/after-ecj/ValueCallSuper.java +++ b/test/transform/resource/after-ecj/ValueCallSuper.java @@ -4,7 +4,7 @@ class ValueParent { }
}
final @lombok.Value class ValueCallSuper extends ValueParent {
- public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
+ public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) {
if ((o == this))
return true;
if ((! (o instanceof ValueCallSuper)))
@@ -16,19 +16,19 @@ final @lombok.Value class ValueCallSuper extends ValueParent { return false;
return true;
}
- protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
+ protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) {
return (other instanceof ValueCallSuper);
}
- public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
+ public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() {
final int PRIME = 59;
int result = 1;
result = ((result * PRIME) + super.hashCode());
return result;
}
- public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+ public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() {
return "ValueCallSuper()";
}
- public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueCallSuper() {
+ public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueCallSuper() {
super();
}
}
diff --git a/test/transform/resource/after-ecj/ValueExperimental.java b/test/transform/resource/after-ecj/ValueExperimental.java index 92deb614..20c6d8f5 100644 --- a/test/transform/resource/after-ecj/ValueExperimental.java +++ b/test/transform/resource/after-ecj/ValueExperimental.java @@ -1,39 +1,39 @@ import lombok.experimental.Value; final @Value class ValueExperimental1 { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueExperimental1))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ValueExperimental1()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimental1() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueExperimental1() { super(); } } final @lombok.experimental.Value class ValueExperimental2 { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueExperimental2))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ValueExperimental2()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimental2() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueExperimental2() { super(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java index 5b366e04..94ff473a 100644 --- a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java +++ b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java @@ -1,20 +1,20 @@ import lombok.experimental.*; final @Value class ValueExperimentalStarImport { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueExperimentalStarImport))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ValueExperimentalStarImport()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimentalStarImport() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueExperimentalStarImport() { super(); } } diff --git a/test/transform/resource/after-ecj/ValuePlain.java b/test/transform/resource/after-ecj/ValuePlain.java index 6a3265c9..594e3f9b 100644 --- a/test/transform/resource/after-ecj/ValuePlain.java +++ b/test/transform/resource/after-ecj/ValuePlain.java @@ -2,13 +2,13 @@ import lombok.Value; final @lombok.Value class Value1 { private final int x; private final String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value1))) @@ -22,7 +22,7 @@ final @lombok.Value class Value1 { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -30,10 +30,10 @@ final @lombok.Value class Value1 { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Value1(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value1(final int x, final String name) { + public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Value1(final int x, final String name) { super(); this.x = x; this.name = name; @@ -42,13 +42,13 @@ final @lombok.Value class Value1 { @Value @lombok.experimental.NonFinal class Value2 { public final int x; private final String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value2))) @@ -64,10 +64,10 @@ final @lombok.Value class Value1 { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Value2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -75,10 +75,10 @@ final @lombok.Value class Value1 { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Value2(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value2(final int x, final String name) { + public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Value2(final int x, final String name) { super(); this.x = x; this.name = name; @@ -87,13 +87,13 @@ final @lombok.Value class Value1 { final @Value class Value3 { private @lombok.experimental.NonFinal int x; private final int y; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getY() { return this.y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value3))) @@ -105,17 +105,17 @@ final @Value class Value3 { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); result = ((result * PRIME) + this.getY()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Value3(x=" + this.getX()) + ", y=") + this.getY()) + ")"); } - public @java.beans.ConstructorProperties({"x", "y"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value3(final int x, final int y) { + public @java.beans.ConstructorProperties({"x", "y"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Value3(final int x, final int y) { super(); this.x = x; this.y = y; diff --git a/test/transform/resource/after-ecj/ValueStaticField.java b/test/transform/resource/after-ecj/ValueStaticField.java index 75e337ce..97677417 100644 --- a/test/transform/resource/after-ecj/ValueStaticField.java +++ b/test/transform/resource/after-ecj/ValueStaticField.java @@ -4,21 +4,21 @@ final @Value class ValueStaticField { static String PASSWORD = "Ken sent me"; <clinit>() { } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueStaticField))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ValueStaticField()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueStaticField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueStaticField() { super(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/WitherAccessLevel.java b/test/transform/resource/after-ecj/WitherAccessLevel.java index 18b896df..3248e8ce 100644 --- a/test/transform/resource/after-ecj/WitherAccessLevel.java +++ b/test/transform/resource/after-ecj/WitherAccessLevel.java @@ -9,19 +9,19 @@ class WitherAccessLevel { WitherAccessLevel(boolean isNone, boolean isPrivate, boolean isPackage, boolean isProtected, boolean isPublic, boolean value) { super(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAccessLevel withPrivate(final boolean isPrivate) { return ((this.isPrivate == isPrivate) ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value)); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAccessLevel withPackage(final boolean isPackage) { return ((this.isPackage == isPackage) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value)); } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAccessLevel withProtected(final boolean isProtected) { return ((this.isProtected == isProtected) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAccessLevel withPublic(final boolean isPublic) { return ((this.isPublic == isPublic) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withValue(final boolean value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAccessLevel withValue(final boolean value) { return ((this.value == value) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value)); } } diff --git a/test/transform/resource/after-ecj/WitherAlreadyExists.java b/test/transform/resource/after-ecj/WitherAlreadyExists.java index f0186ca3..9f1b3e12 100644 --- a/test/transform/resource/after-ecj/WitherAlreadyExists.java +++ b/test/transform/resource/after-ecj/WitherAlreadyExists.java @@ -37,7 +37,7 @@ class Wither5 { Wither5(String foo) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Wither5 withFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Wither5 withFoo(final String foo) { return ((this.foo == foo) ? this : new Wither5(foo)); } } @@ -48,7 +48,7 @@ class Wither6 { Wither6(String foo) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Wither6 withFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Wither6 withFoo(final String foo) { return ((this.foo == foo) ? this : new Wither6(foo)); } } diff --git a/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java b/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java index 4443085c..db0c5d7d 100644 --- a/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java +++ b/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java @@ -4,13 +4,13 @@ final int x = 10; int y = 20; final int z; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor<T, J, L> withTest(final J test) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAndAllArgsConstructor<T, J, L> withTest(final J test) { return ((this.test == test) ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) { return ((this.test2 == test2) ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z)); } - public @java.beans.ConstructorProperties({"test", "test2", "y", "z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) { + public @java.beans.ConstructorProperties({"test", "test2", "y", "z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) { super(); this.test = test; this.test2 = test2; diff --git a/test/transform/resource/after-ecj/WitherDeprecated.java b/test/transform/resource/after-ecj/WitherDeprecated.java index 90e5fb88..26c7a63f 100644 --- a/test/transform/resource/after-ecj/WitherDeprecated.java +++ b/test/transform/resource/after-ecj/WitherDeprecated.java @@ -5,10 +5,10 @@ class WitherDeprecated { WitherDeprecated(int annotation, int javadoc) { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherDeprecated withAnnotation(final int annotation) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherDeprecated withAnnotation(final int annotation) { return ((this.annotation == annotation) ? this : new WitherDeprecated(annotation, this.javadoc)); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherDeprecated withJavadoc(final int javadoc) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherDeprecated withJavadoc(final int javadoc) { return ((this.javadoc == javadoc) ? this : new WitherDeprecated(this.annotation, javadoc)); } } diff --git a/test/transform/resource/after-ecj/WitherOnClass.java b/test/transform/resource/after-ecj/WitherOnClass.java index 1d5414d0..b6048394 100644 --- a/test/transform/resource/after-ecj/WitherOnClass.java +++ b/test/transform/resource/after-ecj/WitherOnClass.java @@ -4,7 +4,7 @@ WitherOnClass1(boolean isNone, boolean isPublic) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass1 withPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass1 withPublic(final boolean isPublic) { return ((this.isPublic == isPublic) ? this : new WitherOnClass1(this.isNone, isPublic)); } } @@ -15,10 +15,10 @@ WitherOnClass2(boolean isNone, boolean isProtected, boolean isPackage) { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass2 withPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass2 withPackage(final boolean isPackage) { return ((this.isPackage == isPackage) ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage)); } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass2 withProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass2 withProtected(final boolean isProtected) { return ((this.isProtected == isProtected) ? this : new WitherOnClass2(this.isNone, isProtected, this.isPackage)); } } @@ -28,10 +28,10 @@ WitherOnClass3(String couldBeNull, String nonNull) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass3 withCouldBeNull(final String couldBeNull) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass3 withCouldBeNull(final String couldBeNull) { return ((this.couldBeNull == couldBeNull) ? this : new WitherOnClass3(couldBeNull, this.nonNull)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) { if ((nonNull == null)) { throw new java.lang.NullPointerException("nonNull"); @@ -46,7 +46,7 @@ super(); this.fY = y; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass4 withY(final int fY) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass4 withY(final int fY) { return ((this.fY == fY) ? this : new WitherOnClass4(fY)); } } diff --git a/test/transform/resource/after-ecj/WitherPlain.java b/test/transform/resource/after-ecj/WitherPlain.java index 52177ef1..0364bae4 100644 --- a/test/transform/resource/after-ecj/WitherPlain.java +++ b/test/transform/resource/after-ecj/WitherPlain.java @@ -7,10 +7,10 @@ class WitherPlain { this.i = i; this.foo = foo; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherPlain withI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherPlain withI(final int i) { return ((this.i == i) ? this : new WitherPlain(i, this.foo)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherPlain withFoo(final int foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherPlain withFoo(final int foo) { return ((this.foo == foo) ? this : new WitherPlain(this.i, foo)); } } diff --git a/test/transform/resource/after-ecj/WitherWithAbstract.java b/test/transform/resource/after-ecj/WitherWithAbstract.java index 90fd6448..de53630d 100644 --- a/test/transform/resource/after-ecj/WitherWithAbstract.java +++ b/test/transform/resource/after-ecj/WitherWithAbstract.java @@ -3,5 +3,5 @@ abstract class WitherWithAbstract { WitherWithAbstract() { super(); } - public abstract @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithAbstract withFoo(final String foo); + public abstract @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithAbstract withFoo(final String foo); } diff --git a/test/transform/resource/after-ecj/WitherWithGenerics.java b/test/transform/resource/after-ecj/WitherWithGenerics.java index 66d8a8f8..904e005a 100644 --- a/test/transform/resource/after-ecj/WitherWithGenerics.java +++ b/test/transform/resource/after-ecj/WitherWithGenerics.java @@ -6,13 +6,13 @@ class WitherWithGenerics<T, J extends T, L extends java.lang.Number> { public WitherWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest(final J test) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithGenerics<T, J, L> withTest(final J test) { return ((this.test == test) ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { return ((this.test2 == test2) ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { return ((this.test3 == test3) ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3)); } } diff --git a/test/transform/resource/before/GeneratedGlobalOff.java b/test/transform/resource/before/GeneratedGlobalOff.java new file mode 100644 index 00000000..89dcff62 --- /dev/null +++ b/test/transform/resource/before/GeneratedGlobalOff.java @@ -0,0 +1,5 @@ +//CONF: lombok.addGeneratedAnnotation = false +class GeneratedGlobalOff { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java b/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java new file mode 100644 index 00000000..dc7e9d8a --- /dev/null +++ b/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java @@ -0,0 +1,6 @@ +//CONF: lombok.addGeneratedAnnotation = false +//CONF: lombok.addJavaxGeneratedAnnotation = true +class GeneratedGlobalOffJavaxOn { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedGlobalOffLombokOn.java b/test/transform/resource/before/GeneratedGlobalOffLombokOn.java new file mode 100644 index 00000000..39e80f7e --- /dev/null +++ b/test/transform/resource/before/GeneratedGlobalOffLombokOn.java @@ -0,0 +1,6 @@ +//CONF: lombok.addGeneratedAnnotation = false +//CONF: lombok.addLombokGeneratedAnnotation = true +class GeneratedGlobalOffLombokOn { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedJavaxOff.java b/test/transform/resource/before/GeneratedJavaxOff.java new file mode 100644 index 00000000..db7ee0d1 --- /dev/null +++ b/test/transform/resource/before/GeneratedJavaxOff.java @@ -0,0 +1,5 @@ +//CONF: lombok.addJavaxGeneratedAnnotation = false +class GeneratedJavaxOff { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedLombokOff.java b/test/transform/resource/before/GeneratedLombokOff.java new file mode 100644 index 00000000..53fcc462 --- /dev/null +++ b/test/transform/resource/before/GeneratedLombokOff.java @@ -0,0 +1,5 @@ +//CONF: lombok.addLombokGeneratedAnnotation = false +class GeneratedLombokOff { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages index 0b520462..20a621df 100644 --- a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages +++ b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages @@ -1,3 +1,3 @@ 3 @NonNull is meaningless on a primitive. -16 @NonNull is meaningless on a primitive. -42 @NonNull is meaningless on a primitive.
\ No newline at end of file +17 @NonNull is meaningless on a primitive. +47 @NonNull is meaningless on a primitive.
\ No newline at end of file |