Merge remote-tracking branch 'origin/master' into playNiceWithOtherAP

AUTHORS

@@ -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>

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. 

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,10 +41,31 @@ 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}.
 	 * 

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();
 			}

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");
 	}

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;

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;

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()

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");
 			

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);

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 provided platform.
+	 * Return the usual name of the IDE executable or other obvious marker of an IDE installation on the current platform.
 	 */
-	public abstract Pattern getLocationSelectors(OS os);
+	Pattern getLocationSelectors();
+	
+	/**
+	 * 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.
+	 */
+	void findIdes(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems);
 }

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");
 		}

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) {

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);
 }

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);
-	}
+public class EclipseLocationProvider extends EclipseProductLocationProvider {
 	
-	protected List<String> getEclipseExecutableNames() {
-		return Arrays.asList("eclipse.app", "eclipse.exe", "eclipse");
-	}
+	private static final EclipseProductDescriptor ECLIPSE = new StandardProductDescriptor(
+			"Eclipse",
+			"eclipse",
+			"eclipse",
+			EclipseLocationProvider.class.getResource("eclipse.png"),
+			Collections.<String>emptySet()
+	);
 	
-	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 EclipseLocationProvider() {
+		super(ECLIPSE);
 	}
 }

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();
+}

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 final boolean hasLombok;
 	
-	private static final String OS_NEWLINE = IdeFinder.getOS().getLineEnding();
-	
-	protected String getTypeName() {
-		return "eclipse";
-	}
-	
-	protected String getIniFileName() {
-		return "eclipse.ini";
-	}
-	
-	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();
 	}
 }

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,85 +22,158 @@
 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";
+	EclipseProductLocationProvider(EclipseProductDescriptor descriptor) {
+		this.descriptor = descriptor;
 	}
 	
-	protected String getWindowsExecutableName() {
-		return "eclipse.exe";
-	}
-	
-	protected String getUnixExecutableName() {
-		return "eclipse";
-	}
-	
-	protected String getMacExecutableName() {
-		return "Eclipse.app";
-	}
-	
-	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();
-		}
-		List<String> sourceDirs = new ArrayList<String>();
-		for (String letter : driveLetters) {
-			for (String possibleSource : getSourceDirsOnWindows()) {
-				if (!isDriveSpecificOnWindows(possibleSource)) {
-					sourceDirs.add(letter + ":" + possibleSource);
-				}
+	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);
 			}
-		}
-		for (String possibleSource : getSourceDirsOnWindows()) {
-			if (isDriveSpecificOnWindows(possibleSource)) sourceDirs.add(possibleSource);
+			
+			File f = new File(p, iniName);
+			if (f.exists()) return makeLocation(canonical(p), f);
 		}
 		
-		return sourceDirs;
+		if (p.isFile()) {
+			if (p.getName().equalsIgnoreCase(iniName)) {
+				return makeLocation(canonical(p.getParentFile()), p);
+			}
+		}
+		
+		if (descriptor.getExecutableNames().contains(p.getName().toLowerCase())) {
+			return findEclipseIniFromExe(p, 0);
+		}
+		
+		return null;
 	}
 	
-	public boolean isDriveSpecificOnWindows(String path) {
-		return path.length() > 1 && path.charAt(1) == ':';
+	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);
+		}
+		
+		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;
 	}
 	
-	protected List<String> getSourceDirsOnMac() {
-		return Arrays.asList("/Applications", System.getProperty("user.home", "."));
+	private IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException {
+		return new EclipseProductLocation(descriptor, name, ini);
 	}
 	
-	protected List<String> getSourceDirsOnUnix() {
-		return Arrays.asList(System.getProperty("user.home", "."));
+	@Override public Pattern getLocationSelectors() {
+		return descriptor.getLocationSelectors();
+	}
+	
+	/**
+	 * Calls the OS-dependent 'find Eclipse' routine. If the local OS doesn't have a routine written for it,
+	 * null is returned.
+	 * 
+	 * @param locations
+	 *            List of valid eclipse locations - provide an empty list; this
+	 *            method will fill it.
+	 * @param problems
+	 *            List of eclipse locations that seem to contain half-baked
+	 *            eclipses that can't be installed. Provide an empty list; this
+	 *            method will fill it.
+	 */
+	@Override
+	public void findIdes(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems) {
+		switch (OsUtils.getOS()) {
+		case WINDOWS:
+			new WindowsFinder().findEclipse(locations, problems);
+			break;
+		case MAC_OS_X:
+			new MacFinder().findEclipse(locations, problems);
+			break;
+		default:
+		case UNIX:
+			new UnixFinder().findEclipse(locations, problems);
+			break;
+		}
 	}
 	
 	private List<File> transformToFiles(List<String> fileNames) {
@@ -127,45 +200,50 @@ public class EclipseFinder extends IdeFinder {
 		return dirs;
 	}
 	
-	/**
-	 * Calls the OS-dependent 'find Eclipse' routine. If the local OS doesn't have a routine written for it,
-	 * null is returned.
-	 * 
-	 * @param locations
-	 *            List of valid eclipse locations - provide an empty list; this
-	 *            method will fill it.
-	 * @param problems
-	 *            List of eclipse locations that seem to contain half-baked
-	 *            eclipses that can't be installed. Provide an empty list; this
-	 *            method will fill it.
-	 */
-	@Override
-	public void findIdes(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems) {
-		switch (getOS()) {
-		case WINDOWS:
-			new WindowsFinder().findEclipse(locations, problems);
-			break;
-		case MAC_OS_X:
-			new MacFinder().findEclipse(locations, problems);
-			break;
-		default:
-		case UNIX:
-			new UnixFinder().findEclipse(locations, problems);
-			break;
-		}
-	}
-	
 	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);

src/installer/lombok/installer/eclipse/JbdsFinder.java

@@ -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", "."));
-	}
-}

src/installer/lombok/installer/eclipse/JbdsLocation.java

@@ -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";
-	}
-}

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");
-	}
+public class JbdsLocationProvider extends EclipseProductLocationProvider {
 	
-	@Override protected String getIniName() {
-		return "jbdevstudio.ini";
-	}
+	private static final EclipseProductDescriptor JBDS = new StandardProductDescriptor(
+			"JBoss Developer Studio",
+			"jbdevstudio",
+			"studio",
+			JbdsLocationProvider.class.getResource("jbds.png"),
+			Collections.<String>emptySet()
+	);
 	
-	@Override protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException {
-		return new JbdsLocation(name, ini);
-	}
-	
-	@Override protected String getMacAppName() {
-		return "jbdevstudio.app";
-	}
-	
-	@Override protected String getUnixAppName() {
-		return "jbdevstudio";
-	}
-	
-	@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);
 	}
 }

src/installer/lombok/installer/eclipse/MyEclipseFinder.java

@@ -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", "."));
-	}
-}

src/installer/lombok/installer/eclipse/MyEclipseLocation.java

@@ -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";
-	}
-}

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;
-
 @ProviderFor(IdeLocationProvider.class)
-public class MyEclipseLocationProvider extends EclipseLocationProvider {
-	@Override protected List<String> getEclipseExecutableNames() {
-		return Arrays.asList("myeclipse.app", "myeclipse.exe", "myeclipsec.exe", "myeclipse");
-	}
+public class MyEclipseLocationProvider extends EclipseProductLocationProvider {
 	
-	@Override protected String getIniName() {
-		return "myeclipse.ini";
-	}
+	private static final EclipseProductDescriptor MY_ECLIPSE = new StandardProductDescriptor(
+			"MyEclipse",
+			"myeclipse",
+			"myeclipse",
+			MyEclipseLocationProvider.class.getResource("myeclipse.png"),
+			Collections.<String>emptySet()
+	);
 	
-	@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";
-	}
-	
-	@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);
 	}
 }

src/installer/lombok/installer/eclipse/RhdsFinder.java

@@ -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", "."));
-	}
-}

src/installer/lombok/installer/eclipse/RhdsLocation.java

@@ -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";
-	}
-}

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");
-	}
+public class RhdsLocationProvider extends EclipseProductLocationProvider {
 	
-	@Override protected String getIniName() {
-		return "devstudio.ini";
-	}
+	private static final EclipseProductDescriptor RHDS = new StandardProductDescriptor(
+			"Red Hat JBoss Developer Studio",
+			"devstudio",
+			"studio",
+			RhdsLocationProvider.class.getResource("rhds.png"),
+			Collections.<String>emptySet()
+	); 
 	
-	@Override protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException {
-		return new RhdsLocation(name, ini);
-	}
-	
-	@Override protected String getMacAppName() {
-		return "devstudio.app";
-	}
-	
-	@Override protected String getUnixAppName() {
-		return "devstudio";
-	}
-	
-	@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);
 	}
 }

src/installer/lombok/installer/eclipse/STSFinder.java

@@ -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");
-	}
-}

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");
-	}
+public class STSLocationProvider extends EclipseProductLocationProvider {
 	
-	@Override protected String getIniName() {
-		return "STS.ini";
-	}
+	private static final EclipseProductDescriptor STS = new StandardProductDescriptor("STS",
+			"STS",
+			"sts",
+			STSLocationProvider.class.getResource("STS.png"),
+			Collections.singleton("springsource")
+	);
 	
-	@Override protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException {
-		return new STSLocation(name, ini);
-	}
-	
-	@Override protected String getMacAppName() {
-		return "STS.app";
-	}
-	
-	@Override protected String getUnixAppName() {
-		return "STS";
-	}
-	
-	@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);
 	}
 }

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);
+	}
+}

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;
 	}

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;

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();
 	}

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>();
 	}

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();
 	}

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>();
 	}

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>();
 	}

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>();
 	}

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>();
 	}

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();
 	}

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();
 	}

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>();
 	}

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();
 	}

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() + ")";
 	}

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();
 	}

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>();
 	}

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);
 	}

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();
 	}

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;
 	}

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;
 	}

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() {
 	}
 }

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;

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;
 	}

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;

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() + ")";
 	}

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 + ")";
 	}

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() + ")";
 	}

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;
 	}

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() + ")";
 			}

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()";
 	}

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;
 	}

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 + ")";
 	}

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();
 	}

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();
 	}

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);
 	}

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();
 	}

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();
 	}

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);
 	}

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 + ")";
 	}

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๑๑ + ")";
 	}

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;

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;

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;

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;

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;

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;

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;
 	}

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;
 	}

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;
+	}
+}

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;
+	}
+}

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;
+	}
+}

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;
+	}
+}

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;
+	}
+}

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;
 	}

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;
 	}

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;
 	}

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;
 	}

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;
 	}

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) {

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) {

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;
 	}

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;
 	}

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) {

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;
 	}

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;
 	}

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;
 	}

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;
 	}

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;
 	}

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;
 	}

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;
 	}