diff options
376 files changed, 3890 insertions, 1474 deletions
@@ -1,12 +1,16 @@ 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> +Liu DongMiao <liudongmiao@gmail.com> Luan Nico <luannico27@gmail.com> 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> @@ -16,6 +20,7 @@ Roel Spilker <r.spilker@gmail.com> Sander Koning <askoning@gmail.com> Szymon Pacanowski <spacanowski@gmail.com> Taiki Sugawara <buzz.taiki@gmail.com> +Thomas Darimont <thomas.darimont@gmail.com> Yun Zhi Lin <yun@yunspace.com> By adding your name to this list, you grant full and irrevocable copyright and patent indemnity to Project Lombok and all use of Project Lombok, and you certify that you have the right to do so for all commits you add to Project Lombok. @@ -17,4 +17,3 @@ twitter: @surial home: http://zwitserloot.com/ Roel Spilker -twitter: @rspilker @@ -226,7 +226,8 @@ the common tasks and can be called on to run the main aspects of all the sub-scr </ivy:compile> <mkdir dir="build/lombok/META-INF" /> <mkdir dir="build/lombok/META-INF/services" /> - <echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.launch.AnnotationProcessorHider$AnnotationProcessor</echo> + <echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.launch.AnnotationProcessorHider$AnnotationProcessor +lombok.launch.AnnotationProcessorHider$ClaimingProcessor</echo> </target> <target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile"> diff --git a/buildScripts/eclipse-run-tests.template b/buildScripts/eclipse-run-tests.template index 530341ab..0c00c236 100644 --- a/buildScripts/eclipse-run-tests.template +++ b/buildScripts/eclipse-run-tests.template @@ -20,7 +20,7 @@ <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/lombok/@JAVAC_LOCATION@" path="3" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/lombok/lib/test/com.google.guava-guava.jar" path="3" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/lombok/lib/test/com.google.code.findbugs-findbugs.jar" path="3" type="2"/> "/> - <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="lombok"/> </runtimeClasspathEntry> "/> + <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="true" project="lombok"/> </runtimeClasspathEntry> "/> </listAttribute> <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.@JAVA_VERSION@"/> diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.20.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.22.xml index f8ddcb51..85e2f9ef 100644 --- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.20.xml +++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.22.xml @@ -1,5 +1,5 @@ <ivy-module version="2.0"> - <info organisation="org.projectlombok" module="lombok.patcher" revision="0.20" publication="20150408000000"> + <info organisation="org.projectlombok" module="lombok.patcher" revision="0.22" publication="20161107000000"> <license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" /> <ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" /> <ivyauthor name="rspilker" url="http://github.com/rspilker" /> @@ -9,6 +9,6 @@ <conf name="default" /> </configurations> <publications> - <artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.20.jar" /> + <artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.22.jar" /> </publications> </ivy-module> diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index f2f319e9..3a851fcd 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -15,7 +15,7 @@ <conf name="javac7" /> </configurations> <dependencies> - <dependency org="org.projectlombok" name="lombok.patcher" rev="0.20" conf="buildBase->default; runtime->default" /> + <dependency org="org.projectlombok" name="lombok.patcher" rev="0.22" conf="buildBase->default; runtime->default" /> <dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="buildBase->runtime; runtime" /> <dependency org="junit" name="junit" rev="4.8.2" conf="test->default; contrib->sources" /> @@ -24,6 +24,8 @@ <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="test->default; contrib->sources"/> <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="test->default; contrib->sources"/> <dependency org="org.slf4j" name="slf4j-ext" rev="1.6.1" conf="test->default; contrib->sources"/> + <dependency org="org.jboss.logging" name="jboss-logging" rev="3.3.0.Final" conf="test->default; contrib->sources"/> + <dependency org="com.google.guava" name="guava" rev="18.0" conf="test->default; contrib->sources" /> <dependency org="com.google.code.findbugs" name="findbugs" rev="3.0.0" conf="test->master" /> diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index aae2285f..19b995d3 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -155,6 +155,9 @@ such as converting the changelog into HTML, and creating javadoc. <param name="transformationName" value="Singular-snippet" /> </antcall> <antcall target="-integrateSnippet"> + <param name="transformationName" value="experimental/var" /> + </antcall> + <antcall target="-integrateSnippet"> <param name="transformationName" value="experimental/Delegate" /> </antcall> <antcall target="-integrateSnippet"> diff --git a/doc/changelog.markdown b/doc/changelog.markdown index d9587b3b..0c731776 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -1,8 +1,26 @@ Lombok Changelog ---------------- -### v1.16.8 (March 7th, 2016) +### 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. +* CHANGE: `@Value` and `@FieldDefaults` no longer touch static fields [Issue #1254](https://github.com/rzwitserloot/lombok/issues/1254) +* BUGFIX: `val` in lambda expressions now work as expected [Issue #911](https://github.com/rzwitserloot/lombok/issues/911) +* BUGFIX: `Getter(lazy=true)` now emits an error message when used on a transient field [Issue #1236](https://github.com/rzwitserloot/lombok/issues/1236) +* BUGFIX: Annotation Processors that use ecj internally (dagger) no longer give linkage errors [Issue #1218](https://github.com/rzwitserloot/lombok/issues/1218) +* PLATFORM: Red Hat JBoss Developer Studio is now correctly identified by the installer [Issue #1164](https://github.com/rzwitserloot/lombok/issues/1164) +* BUGFIX: delombok: for-loops with initializers that are not local variables would be generated incorrectly [Issue #1076](https://github.com/rzwitserloot/lombok/issues/1076) + +### v1.16.10 (July 15th, 2016) +* FEATURE: Added support for JBoss logger [Issue #1103](https://github.com/rzwitserloot/lombok/issues/1103) +* ENHANCEMENT: Running `javac -Xlint:all` would generate a warning about unclaimed annotations [Issue #1117](https://github.com/rzwitserloot/lombok/issues/1117) +* BUGFIX: Eclipse Mars would sometimes throw a NullPointerException when using `@Delegate` [Issue #913](https://github.com/rzwitserloot/lombok/issues/913) +* ENHANCEMENT: Add support for older maven-compiler-plugin [Issue #1138](https://github.com/rzwitserloot/lombok/issues/1138) +### v1.16.8 (March 7th, 2016) * PLATFORM: Starting jdk9 support: No more error message regarding `pid` * FEATURE: `@Builder` updates: It now generates `clearFieldName()` methods if `@Singular` is used. [Issue #967](https://github.com/rzwitserloot/lombok/issues/967). * FEATURE: `@Builder` updates: The annotation can now be put on instance methods. [Issue #63](https://github.com/rzwitserloot/lombok/issues/63). diff --git a/src/core/lombok/ConfigurationKeys.java b/src/core/lombok/ConfigurationKeys.java index 73caf295..ff17ca09 100644 --- a/src/core/lombok/ConfigurationKeys.java +++ b/src/core/lombok/ConfigurationKeys.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 The Project Lombok Authors. + * Copyright (C) 2013-2017 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -41,11 +41,32 @@ public class ConfigurationKeys { /** * lombok configuration: {@code lombok.addGeneratedAnnotation} = {@code true} | {@code false}. * - * If unset or {@code true}, lombok generates {@code @javax.annotation.Generated("lombok")} on all fields, methods, and types that are generated. + * If unset or {@code true}, lombok generates various annotations to mark generated code like {@code @javax.annotation.Generated("lombok")} and {@code @lombok.Generated}. + * + * @see ConfigurationKeys#ADD_JAVAX_GENERATED_ANNOTATIONS + * @see ConfigurationKeys#ADD_LOMBOK_GENERATED_ANNOTATIONS */ public static final ConfigurationKey<Boolean> ADD_GENERATED_ANNOTATIONS = new ConfigurationKey<Boolean>("lombok.addGeneratedAnnotation", "Generate @javax.annotation.Generated on all generated code (default: true).") {}; /** + * lombok configuration: {@code lombok.addJavaxGeneratedAnnotation} = {@code true} | {@code false}. + * + * If unset or {@code true}, lombok generates {@code @javax.annotation.Generated("lombok")} on all fields, methods, and types that are generated, unless {@code lombok.addGeneratedAnnotation} is set to {@code false}. + * + * @see ConfigurationKeys#ADD_GENERATED_ANNOTATIONS + */ + public static final ConfigurationKey<Boolean> ADD_JAVAX_GENERATED_ANNOTATIONS = new ConfigurationKey<Boolean>("lombok.addJavaxGeneratedAnnotation", "Generate @javax.annotation.Generated on all generated code (default: follow lombok.addGeneratedAnnotation).") {}; + + /** + * lombok configuration: {@code lombok.addLombokGeneratedAnnotation} = {@code true} | {@code false}. + * + * If unset or {@code true}, lombok generates {@code @lombok.Generated} on all fields, methods, and types that are generated, unless {@code lombok.addGeneratedAnnotation} is set to {@code false}. + * + * @see ConfigurationKeys#ADD_GENERATED_ANNOTATIONS + */ + public static final ConfigurationKey<Boolean> ADD_LOMBOK_GENERATED_ANNOTATIONS = new ConfigurationKey<Boolean>("lombok.addLombokGeneratedAnnotation", "Generate @lombok.Generated on all generated code (default: follow lombok.addGeneratedAnnotation).") {}; + + /** * lombok configuration: {@code lombok.extern.findbugs.addSuppressFBWarnings} = {@code true} | {@code false}. * * If {@code true}, lombok generates {@code edu.umd.cs.findbugs.annotations.SuppressFBWarnings} on all fields, methods, and types that are generated. @@ -283,7 +304,8 @@ public class ConfigurationKeys { * If set, <em>any</em> usage of {@code val} results in a warning / error. */ public static final ConfigurationKey<FlagUsageType> VAL_FLAG_USAGE = new ConfigurationKey<FlagUsageType>("lombok.val.flagUsage", "Emit a warning or error if 'val' is used.") {}; - + public static final ConfigurationKey<FlagUsageType> VAR_FLAG_USAGE = new ConfigurationKey<FlagUsageType>("lombok.var.flagUsage", "Emit a warning or error if 'var' is used.") {}; + // ##### Extern ##### // ----- Logging ----- @@ -337,6 +359,13 @@ public class ConfigurationKeys { public static final ConfigurationKey<FlagUsageType> LOG_XSLF4J_FLAG_USAGE = new ConfigurationKey<FlagUsageType>("lombok.log.xslf4j.flagUsage", "Emit a warning or error if @XSlf4j is used.") {}; /** + * lombok configuration: {@code lombok.log.jbosslog.flagUsage} = {@code WARNING} | {@code ERROR}. + * + * If set, <em>any</em> usage of {@code @JBossLog} results in a warning / error. + */ + public static final ConfigurationKey<FlagUsageType> LOG_JBOSSLOG_FLAG_USAGE = new ConfigurationKey<FlagUsageType>("lombok.log.jbosslog.flagUsage", "Emit a warning or error if @JBossLog is used.") {}; + + /** * lombok configuration: {@code lombok.log.fieldName} = <String: aJavaIdentifier> (Default: {@code log}). * * If set the various log annotations (which make a log field) will use the stated identifier instead of {@code log} as a name. diff --git a/src/core/lombok/Generated.java b/src/core/lombok/Generated.java index 18411b3d..b99a1b58 100644 --- a/src/core/lombok/Generated.java +++ b/src/core/lombok/Generated.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Project Lombok Authors. + * Copyright (C) 2015-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 @@ -27,7 +27,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Lombok will eventually automatically add this annotation to all generated methods, fields, and classes. + * Lombok will eventually automatically add this annotation to all generated constructors, methods, fields, and types. * * You can mark the presence of this annotation as 'ignore it' for all code style and bug finding tools. * <p> @@ -35,7 +35,7 @@ import java.lang.annotation.Target; * it up so that lombok jars in widespread use start having this, which will make it easier to actually apply it * later on. */ -@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE}) +@Target({ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE}) @Retention(RetentionPolicy.CLASS) public @interface Generated { } diff --git a/src/core/lombok/Lombok.java b/src/core/lombok/Lombok.java index 07fd083d..164c47a8 100644 --- a/src/core/lombok/Lombok.java +++ b/src/core/lombok/Lombok.java @@ -71,4 +71,16 @@ public class Lombok { public static <T> T preventNullAnalysis(T value) { return value; } + + /** + * Ensures that the {@code value} is not {@code null}. + * @param value the value to test for null + * @param message the message of the {@link NullPointerException} + * @return the value if it is not null + * @throws NullPointerException with the {@code message} if the value is null + */ + public static <T> T checkNotNull(T value, String message) { + if (value == null) throw new NullPointerException(message); + return value; + } } diff --git a/src/core/lombok/Value.java b/src/core/lombok/Value.java index 2cecea63..39154226 100644 --- a/src/core/lombok/Value.java +++ b/src/core/lombok/Value.java @@ -31,7 +31,7 @@ import java.lang.annotation.Target; * <p> * Equivalent to {@code @Getter @FieldDefaults(makeFinal=true, level=AccessLevel.PRIVATE) @AllArgsConstructor @ToString @EqualsAndHashCode}. * <p> - * Complete documentation is found at <a href="https://projectlombok.org/features/experimental/Value.html">the project lombok features page for @Value</a>. + * Complete documentation is found at <a href="https://projectlombok.org/features/Value.html">the project lombok features page for @Value</a>. * * @see lombok.Getter * @see lombok.experimental.FieldDefaults @@ -49,7 +49,7 @@ public @interface Value { * We suggest the name: "of", like so: * * <pre> - * public @Data(staticConstructor = "of") class Point { final int x, y; } + * public @Value(staticConstructor = "of") class Point { final int x, y; } * </pre> * * Default: No static constructor, instead the normal constructor is public. diff --git a/src/core/lombok/core/AST.java b/src/core/lombok/core/AST.java index e6efe058..1142018f 100644 --- a/src/core/lombok/core/AST.java +++ b/src/core/lombok/core/AST.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2013 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,7 +21,7 @@ */ package lombok.core; -import static lombok.Lombok.*; +import static lombok.Lombok.sneakyThrow; import java.lang.reflect.Array; import java.lang.reflect.Field; @@ -31,10 +31,11 @@ import java.lang.reflect.Type; import java.net.URI; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import lombok.core.configuration.ConfigurationKey; import lombok.core.debug.HistogramTracker; @@ -61,12 +62,18 @@ public abstract class AST<A extends AST<A, L, N>, L extends LombokNode<A, L, N>, Map<N, N> identityDetector = new IdentityHashMap<N, N>(); private Map<N, L> nodeMap = new IdentityHashMap<N, L>(); private boolean changed = false; + + // The supertypes which are considered AST Node children. Usually, the Statement, and the Expression, + // though some platforms (such as Eclipse) group these under one common supertype. + private final Collection<Class<? extends N>> statementTypes; + private static final HistogramTracker configTracker = System.getProperty("lombok.timeConfig") == null ? null : new HistogramTracker("lombok.config"); - protected AST(String fileName, String packageDeclaration, ImportList imports) { + protected AST(String fileName, String packageDeclaration, ImportList imports, Collection<Class<? extends N>> statementTypes) { this.fileName = fileName == null ? "(unknown).java" : fileName; this.packageDeclaration = packageDeclaration; this.imports = imports; + this.statementTypes = statementTypes; } /** @@ -209,11 +216,11 @@ public abstract class AST<A extends AST<A, L, N>, L extends LombokNode<A, L, N>, } } - private static Map<Class<?>, Collection<FieldAccess>> fieldsOfASTClasses = new HashMap<Class<?>, Collection<FieldAccess>>(); + private static final ConcurrentMap<Class<?>, Collection<FieldAccess>> fieldsOfASTClasses = new ConcurrentHashMap<Class<?>, Collection<FieldAccess>>(); /** Returns FieldAccess objects for the stated class. Each field that contains objects of the kind returned by * {@link #getStatementTypes()}, either directly or inside of an array or java.util.collection (or array-of-arrays, - * or collection-of-collections, etcetera), is returned. + * or collection-of-collections, et cetera), is returned. */ protected Collection<FieldAccess> fieldsOf(Class<?> c) { Collection<FieldAccess> fields = fieldsOfASTClasses.get(c); @@ -221,8 +228,8 @@ public abstract class AST<A extends AST<A, L, N>, L extends LombokNode<A, L, N>, fields = new ArrayList<FieldAccess>(); getFields(c, fields); - fieldsOfASTClasses.put(c, fields); - return fields; + fieldsOfASTClasses.putIfAbsent(c, fields); + return fieldsOfASTClasses.get(c); } private void getFields(Class<?> c, Collection<FieldAccess> fields) { @@ -261,13 +268,8 @@ public abstract class AST<A extends AST<A, L, N>, L extends LombokNode<A, L, N>, return Object.class; } - /** - * The supertypes which are considered AST Node children. Usually, the Statement, and the Expression, - * though some platforms (such as Eclipse) group these under one common supertype. */ - protected abstract Collection<Class<? extends N>> getStatementTypes(); - - protected boolean shouldDrill(Class<?> parentType, Class<?> childType, String fieldName) { - for (Class<?> statementType : getStatementTypes()) { + private boolean shouldDrill(Class<?> parentType, Class<?> childType, String fieldName) { + for (Class<?> statementType : statementTypes) { if (statementType.isAssignableFrom(childType)) return true; } diff --git a/src/core/lombok/core/AnnotationProcessor.java b/src/core/lombok/core/AnnotationProcessor.java index ba5fd4f7..5531ad8e 100644 --- a/src/core/lombok/core/AnnotationProcessor.java +++ b/src/core/lombok/core/AnnotationProcessor.java @@ -103,7 +103,6 @@ public class AnnotationProcessor extends AbstractProcessor { URL selfUrl = new File(ClassRootFinder.findClassRootOfClass(AnnotationProcessor.class)).toURI().toURL(); m.invoke(environmentClassLoader, selfUrl); } - return environmentClassLoader; } ClassLoader ourClassLoader = JavacDescriptor.class.getClassLoader(); diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java index 549db9e1..4fdb7216 100644 --- a/src/core/lombok/core/Version.java +++ b/src/core/lombok/core/Version.java @@ -30,9 +30,9 @@ public class Version { // ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries). // Note: In 'X.Y.Z', if Z is odd, its a snapshot build built from the repository, so many different 0.10.3 versions can exist, for example. // Official builds always end in an even number. (Since 0.10.2). - private static final String VERSION = "1.16.8"; -// private static final String RELEASE_NAME = "Edgy Guinea Pig"; - private static final String RELEASE_NAME = "Candid Duck"; + private static final String VERSION = "1.16.13"; + private static final String RELEASE_NAME = "Edgy Guinea Pig"; +// private static final String RELEASE_NAME = "Candid Duck"; private Version() { //Prevent instantiation diff --git a/src/core/lombok/core/configuration/AllowHelper.java b/src/core/lombok/core/configuration/AllowHelper.java new file mode 100644 index 00000000..3873b055 --- /dev/null +++ b/src/core/lombok/core/configuration/AllowHelper.java @@ -0,0 +1,39 @@ +/* + * 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.core.configuration; + +import java.util.Collection; +import java.util.Collections; + +import lombok.ConfigurationKeys; + +public final class AllowHelper { + private final static Collection<? extends ConfigurationKey<?>> ALLOWABLE = Collections.singleton(ConfigurationKeys.VAR_FLAG_USAGE); + + private AllowHelper() { + // Prevent instantiation + } + + public static boolean isAllowable(ConfigurationKey<?> key) { + return ALLOWABLE.contains(key); + } +} diff --git a/src/core/lombok/core/configuration/ConfigurationApp.java b/src/core/lombok/core/configuration/ConfigurationApp.java index e441b4de..efe57e38 100644 --- a/src/core/lombok/core/configuration/ConfigurationApp.java +++ b/src/core/lombok/core/configuration/ConfigurationApp.java @@ -198,7 +198,7 @@ public class ConfigurationApp extends LombokApp { if (paths.size() == 1) { if (!(argsPaths.size() == 1)) out.printf("Configuration for '%s'.%n%n", paths.iterator().next()); } else { - out.printf("Configuration for:%n", paths.iterator().next()); + out.printf("Configuration for:%n"); for (String path : paths) out.printf("- %s%n", path); out.println(); } diff --git a/src/core/lombok/core/configuration/ConfigurationParser.java b/src/core/lombok/core/configuration/ConfigurationParser.java index f0a9e142..e80793c1 100644 --- a/src/core/lombok/core/configuration/ConfigurationParser.java +++ b/src/core/lombok/core/configuration/ConfigurationParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 The Project Lombok Authors. + * Copyright (C) 2014-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 @@ -27,7 +27,7 @@ import java.util.regex.Pattern; public class ConfigurationParser { private static final Pattern LINE = Pattern.compile("(?:clear\\s+([^=]+))|(?:(\\S*?)\\s*([-+]?=)\\s*(.*?))"); - private static final Pattern NEWLINE_FINDER = Pattern.compile("^\\s*(.*?)\\s*$", Pattern.MULTILINE); + private static final Pattern NEWLINE_FINDER = Pattern.compile("^[\t ]*(.*?)[\t\r ]*$", Pattern.MULTILINE); private ConfigurationProblemReporter reporter; diff --git a/src/core/lombok/core/configuration/FlagUsageType.java b/src/core/lombok/core/configuration/FlagUsageType.java index b7053b7c..8717c22b 100644 --- a/src/core/lombok/core/configuration/FlagUsageType.java +++ b/src/core/lombok/core/configuration/FlagUsageType.java @@ -23,5 +23,5 @@ package lombok.core.configuration; /** Used for lombok configuration to flag usages of certain lombok feature. */ public enum FlagUsageType { - WARNING, ERROR; + WARNING, ERROR, ALLOW; } diff --git a/src/core/lombok/core/handlers/HandlerUtil.java b/src/core/lombok/core/handlers/HandlerUtil.java index a9a4be78..a05578d4 100644 --- a/src/core/lombok/core/handlers/HandlerUtil.java +++ b/src/core/lombok/core/handlers/HandlerUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2015 The Project Lombok Authors. + * Copyright (C) 2013-2017 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -43,6 +43,7 @@ import lombok.core.AST; import lombok.core.AnnotationValues; import lombok.core.JavaIdentifiers; import lombok.core.LombokNode; +import lombok.core.configuration.AllowHelper; import lombok.core.configuration.ConfigurationKey; import lombok.core.configuration.FlagUsageType; import lombok.experimental.Accessors; @@ -97,13 +98,23 @@ public class HandlerUtil { public static void handleFlagUsage(LombokNode<?, ?, ?> node, ConfigurationKey<FlagUsageType> key, String featureName) { FlagUsageType fut = node.getAst().readConfiguration(key); + if (fut == null && AllowHelper.isAllowable(key)) { + node.addError("Use of " + featureName + " is disabled by default. Please add '" + key.getKeyName() + " = " + FlagUsageType.ALLOW + "' to 'lombok.config' if you want to enable is."); + } + if (fut != null) { String msg = "Use of " + featureName + " is flagged according to lombok configuration."; if (fut == FlagUsageType.WARNING) node.addWarning(msg); - else node.addError(msg); + else if (fut == FlagUsageType.ERROR) node.addError(msg); } } + public static boolean shouldAddGenerated(LombokNode<?, ?, ?> node, ConfigurationKey<Boolean> key) { + Boolean add = node.getAst().readConfiguration(key); + if (add != null) return add; + return !Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_GENERATED_ANNOTATIONS)); + } + public static void handleExperimentalFlagUsage(LombokNode<?, ?, ?> node, ConfigurationKey<FlagUsageType> key, String featureName) { handleFlagUsage(node, key, featureName, ConfigurationKeys.EXPERIMENTAL_FLAG_USAGE, "any lombok.experimental feature"); } diff --git a/src/core/lombok/eclipse/EclipseAST.java b/src/core/lombok/eclipse/EclipseAST.java index 6741b33a..dc2c9843 100644 --- a/src/core/lombok/eclipse/EclipseAST.java +++ b/src/core/lombok/eclipse/EclipseAST.java @@ -62,7 +62,7 @@ public class EclipseAST extends AST<EclipseAST, EclipseNode, ASTNode> { * @param ast The compilation unit, which serves as the top level node in the tree to be built. */ public EclipseAST(CompilationUnitDeclaration ast) { - super(toFileName(ast), packageDeclaration(ast), new EclipseImportList(ast)); + super(toFileName(ast), packageDeclaration(ast), new EclipseImportList(ast), statementTypes()); this.compilationUnitDeclaration = ast; setTop(buildCompilationUnit(ast)); this.completeParse = isComplete(ast); @@ -477,9 +477,9 @@ public class EclipseAST extends AST<EclipseAST, EclipseNode, ASTNode> { return putInMap(new EclipseNode(this, statement, childNodes, Kind.STATEMENT)); } - /** For Eclipse, only Statement counts, as Expression is a subclass of it, even though this isn't + /* For Eclipse, only Statement counts, as Expression is a subclass of it, even though this isn't * entirely correct according to the JLS spec (only some expressions can be used as statements, not all of them). */ - @Override protected Collection<Class<? extends ASTNode>> getStatementTypes() { + private static Collection<Class<? extends ASTNode>> statementTypes() { return Collections.<Class<? extends ASTNode>>singleton(Statement.class); } diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 0ff5a7f6..f822e095 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 The Project Lombok Authors. + * Copyright (C) 2009-2017 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -1168,9 +1168,8 @@ public class EclipseHandlerUtil { if (params < minArgs || params > maxArgs) continue; } - if (def.annotations != null) for (Annotation anno : def.annotations) { - if (typeMatches(Tolerate.class, node, anno.type)) continue top; - } + + if (isTolerate(node, def)) continue top; return getGeneratedBy(def) == null ? MemberExistsResult.EXISTS_BY_USER : MemberExistsResult.EXISTS_BY_LOMBOK; } @@ -1181,6 +1180,13 @@ public class EclipseHandlerUtil { return MemberExistsResult.NOT_EXISTS; } + public static boolean isTolerate(EclipseNode node, AbstractMethodDeclaration def) { + if (def.annotations != null) for (Annotation anno : def.annotations) { + if (typeMatches(Tolerate.class, node, anno.type)) return true; + } + return false; + } + /** * Checks if there is a (non-default) constructor. In case of multiple constructors (overloading), only * the first constructor decides if EXISTS_BY_USER or EXISTS_BY_LOMBOK is returned. @@ -1194,13 +1200,11 @@ public class EclipseHandlerUtil { if (node != null && node.get() instanceof TypeDeclaration) { TypeDeclaration typeDecl = (TypeDeclaration)node.get(); - if (typeDecl.methods != null) top: for (AbstractMethodDeclaration def : typeDecl.methods) { + if (typeDecl.methods != null) for (AbstractMethodDeclaration def : typeDecl.methods) { if (def instanceof ConstructorDeclaration) { if ((def.bits & ASTNode.IsDefaultConstructor) != 0) continue; - if (def.annotations != null) for (Annotation anno : def.annotations) { - if (typeMatches(Tolerate.class, node, anno.type)) continue top; - } + if (isTolerate(node, def)) continue; return getGeneratedBy(def) == null ? MemberExistsResult.EXISTS_BY_USER : MemberExistsResult.EXISTS_BY_LOMBOK; } @@ -1325,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) { @@ -1339,24 +1344,29 @@ public class EclipseHandlerUtil { } public static Annotation[] addGenerated(EclipseNode node, ASTNode source, Annotation[] originalAnnotationArray) { - if (Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.ADD_GENERATED_ANNOTATIONS))) return originalAnnotationArray; - return addAnnotation(source, originalAnnotationArray, JAVAX_ANNOTATION_GENERATED, new StringLiteral(LOMBOK, 0, 0, 0)); + Annotation[] result = originalAnnotationArray; + if (HandlerUtil.shouldAddGenerated(node, ConfigurationKeys.ADD_JAVAX_GENERATED_ANNOTATIONS)) { + result = addAnnotation(source, result, JAVAX_ANNOTATION_GENERATED, new StringLiteral(LOMBOK, 0, 0, 0)); + } + if (HandlerUtil.shouldAddGenerated(node, ConfigurationKeys.ADD_LOMBOK_GENERATED_ANNOTATIONS)) { + result = addAnnotation(source, result, LOMBOK_GENERATED, null); + } + return result; } private static Annotation[] addAnnotation(ASTNode source, Annotation[] originalAnnotationArray, char[][] annotationTypeFqn, ASTNode arg) { char[] simpleName = annotationTypeFqn[annotationTypeFqn.length - 1]; if (originalAnnotationArray != null) for (Annotation ann : originalAnnotationArray) { - char[] lastToken = null; - if (ann.type instanceof QualifiedTypeReference) { char[][] t = ((QualifiedTypeReference) ann.type).tokens; - lastToken = t[t.length - 1]; - } else if (ann.type instanceof SingleTypeReference) { - lastToken = ((SingleTypeReference) ann.type).token; + if (Arrays.deepEquals(t, annotationTypeFqn)) return originalAnnotationArray; } - if (lastToken != null && Arrays.equals(simpleName, lastToken)) return originalAnnotationArray; + if (ann.type instanceof SingleTypeReference) { + char[] lastToken = ((SingleTypeReference) ann.type).token; + if (Arrays.equals(lastToken, simpleName)) return originalAnnotationArray; + } } int pS = source.sourceStart, pE = source.sourceEnd; diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index 4e0c4218..afa03538 100644 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -652,7 +652,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> { for (int i = 0; i < len; i++) { if (!(existing[i] instanceof MethodDeclaration)) continue; char[] existingName = existing[i].selector; - if (Arrays.equals(name, existingName)) return; + if (Arrays.equals(name, existingName) && !isTolerate(fieldNode, existing[i])) return; } String setterName = fluent ? fieldNode.getName() : HandlerUtil.buildAccessorName("set", fieldNode.getName()); diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java index 85d1d4ed..a3b0585d 100644 --- a/src/core/lombok/eclipse/handlers/HandleConstructor.java +++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java @@ -48,6 +48,7 @@ import org.eclipse.jdt.internal.compiler.ast.AllocationExpression; import org.eclipse.jdt.internal.compiler.ast.Annotation; import org.eclipse.jdt.internal.compiler.ast.Argument; import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer; +import org.eclipse.jdt.internal.compiler.ast.ArrayTypeReference; import org.eclipse.jdt.internal.compiler.ast.Assignment; import org.eclipse.jdt.internal.compiler.ast.CharLiteral; import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; @@ -381,6 +382,8 @@ public class HandleConstructor { } private static Expression getDefaultExpr(TypeReference type, int s, int e) { + boolean array = type instanceof ArrayTypeReference; + if (array) return new NullLiteral(s, e); char[] lastToken = type.getLastToken(); if (Arrays.equals(TypeConstants.BOOLEAN, lastToken)) return new FalseLiteral(s, e); if (Arrays.equals(TypeConstants.CHAR, lastToken)) return new CharLiteral(new char[] {'\'', '\\', '0', '\''}, s, e); diff --git a/src/core/lombok/eclipse/handlers/HandleFieldDefaults.java b/src/core/lombok/eclipse/handlers/HandleFieldDefaults.java index 5ea5a210..702713fe 100644 --- a/src/core/lombok/eclipse/handlers/HandleFieldDefaults.java +++ b/src/core/lombok/eclipse/handlers/HandleFieldDefaults.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 The Project Lombok Authors. + * Copyright (C) 2012-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 @@ -97,14 +97,16 @@ public class HandleFieldDefaults extends EclipseASTAdapter { if (level != null && level != AccessLevel.NONE) { if ((field.modifiers & (ClassFileConstants.AccPublic | ClassFileConstants.AccPrivate | ClassFileConstants.AccProtected)) == 0) { if (!hasAnnotation(PackagePrivate.class, fieldNode)) { - field.modifiers |= EclipseHandlerUtil.toEclipseModifier(level); + if ((field.modifiers & ClassFileConstants.AccStatic) == 0) { + field.modifiers |= EclipseHandlerUtil.toEclipseModifier(level); + } } } } if (makeFinal && (field.modifiers & ClassFileConstants.AccFinal) == 0) { if (!hasAnnotation(NonFinal.class, fieldNode)) { - if ((field.modifiers & ClassFileConstants.AccStatic) == 0 || field.initialization != null) { + if ((field.modifiers & ClassFileConstants.AccStatic) == 0) { field.modifiers |= ClassFileConstants.AccFinal; } } diff --git a/src/core/lombok/eclipse/handlers/HandleGetter.java b/src/core/lombok/eclipse/handlers/HandleGetter.java index 14f2fb72..77d678f2 100644 --- a/src/core/lombok/eclipse/handlers/HandleGetter.java +++ b/src/core/lombok/eclipse/handlers/HandleGetter.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 @@ -183,6 +183,10 @@ public class HandleGetter extends EclipseAnnotationHandler<Getter> { errorNode.addError("'lazy' requires the field to be private and final."); return; } + if ((field.modifiers & ClassFileConstants.AccTransient) != 0) { + errorNode.addError("'lazy' is not supported on transient fields."); + return; + } if (field.initialization == null) { errorNode.addError("'lazy' requires field initialization."); return; diff --git a/src/core/lombok/eclipse/handlers/HandleLog.java b/src/core/lombok/eclipse/handlers/HandleLog.java index 830190a2..c49030d8 100644 --- a/src/core/lombok/eclipse/handlers/HandleLog.java +++ b/src/core/lombok/eclipse/handlers/HandleLog.java @@ -229,6 +229,17 @@ public class HandleLog { } } + /** + * Handles the {@link lombok.extern.jbosslog.JBossLog} annotation for Eclipse. + */ + @ProviderFor(EclipseAnnotationHandler.class) + public static class HandleJBossLog extends EclipseAnnotationHandler<lombok.extern.jbosslog.JBossLog> { + @Override public void handle(AnnotationValues<lombok.extern.jbosslog.JBossLog> annotation, Annotation source, EclipseNode annotationNode) { + handleFlagUsage(annotationNode, ConfigurationKeys.LOG_JBOSSLOG_FLAG_USAGE, "@JBossLog", ConfigurationKeys.LOG_ANY_FLAG_USAGE, "any @Log"); + processAnnotation(LoggingFramework.JBOSSLOG, annotation, source, annotationNode, annotation.getInstance().topic()); + } + } + enum LoggingFramework { // private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(TargetType.class); COMMONS("org.apache.commons.logging.Log", "org.apache.commons.logging.LogFactory", "getLog", "@CommonsLog"), @@ -264,7 +275,9 @@ public class HandleLog { // private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(TargetType.class); XSLF4J("org.slf4j.ext.XLogger", "org.slf4j.ext.XLoggerFactory", "getXLogger", "@XSlf4j"), - + + // private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(TargetType.class); + JBOSSLOG("org.jboss.logging.Logger", "org.jboss.logging.Logger", "getLogger", "@JBossLog"), ; private final String loggerTypeName; diff --git a/src/core/lombok/eclipse/handlers/HandleVal.java b/src/core/lombok/eclipse/handlers/HandleVal.java index d4ae417c..d8901067 100644 --- a/src/core/lombok/eclipse/handlers/HandleVal.java +++ b/src/core/lombok/eclipse/handlers/HandleVal.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 The Project Lombok Authors. + * Copyright (C) 2010-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,7 +21,8 @@ */ package lombok.eclipse.handlers; -import static lombok.core.handlers.HandlerUtil.*; +import static lombok.core.handlers.HandlerUtil.handleFlagUsage; +import static lombok.eclipse.handlers.EclipseHandlerUtil.typeMatches; import lombok.ConfigurationKeys; import lombok.val; import lombok.core.HandlerPriority; @@ -29,11 +30,14 @@ import lombok.eclipse.DeferUntilPostDiet; import lombok.eclipse.EclipseASTAdapter; import lombok.eclipse.EclipseASTVisitor; import lombok.eclipse.EclipseNode; +import lombok.experimental.var; import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer; import org.eclipse.jdt.internal.compiler.ast.ForStatement; import org.eclipse.jdt.internal.compiler.ast.ForeachStatement; import org.eclipse.jdt.internal.compiler.ast.LocalDeclaration; +import org.eclipse.jdt.internal.compiler.ast.NullLiteral; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; import org.mangosdk.spi.ProviderFor; /* @@ -44,8 +48,13 @@ import org.mangosdk.spi.ProviderFor; @HandlerPriority(65536) // 2^16; resolution needs to work, so if the RHS expression is i.e. a call to a generated getter, we have to run after that getter has been generated. public class HandleVal extends EclipseASTAdapter { @Override public void visitLocal(EclipseNode localNode, LocalDeclaration local) { - if (!EclipseHandlerUtil.typeMatches(val.class, localNode, local.type)) return; - handleFlagUsage(localNode, ConfigurationKeys.VAL_FLAG_USAGE, "val"); + TypeReference type = local.type; + boolean isVal = typeMatches(val.class, localNode, type); + boolean isVar = typeMatches(var.class, localNode, type); + if (!(isVal || isVar)) return; + + if (isVal) handleFlagUsage(localNode, ConfigurationKeys.VAL_FLAG_USAGE, "val"); + if (isVar) handleFlagUsage(localNode, ConfigurationKeys.VAR_FLAG_USAGE, "var"); boolean variableOfForEach = false; @@ -54,23 +63,30 @@ public class HandleVal extends EclipseASTAdapter { variableOfForEach = fs.elementVariable == local; } + String annotation = isVal ? "val" : "var"; if (local.initialization == null && !variableOfForEach) { - localNode.addError("'val' on a local variable requires an initializer expression"); + localNode.addError("'" + annotation + "' on a local variable requires an initializer expression"); return; } if (local.initialization instanceof ArrayInitializer) { - localNode.addError("'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... })"); + localNode.addError("'" + annotation + "' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... })"); return; } - if (localNode.directUp().get() instanceof ForStatement) { + if (isVal && localNode.directUp().get() instanceof ForStatement) { localNode.addError("'val' is not allowed in old-style for loops"); return; } if (local.initialization != null && local.initialization.getClass().getName().equals("org.eclipse.jdt.internal.compiler.ast.LambdaExpression")) { - localNode.addError("'val' is not allowed with lambda expressions."); + localNode.addError("'" + annotation + "' is not allowed with lambda expressions."); + return; + } + + if(isVar && local.initialization instanceof NullLiteral) { + localNode.addError("variable initializer is 'null'"); + return; } } } diff --git a/src/core/lombok/experimental/FieldDefaults.java b/src/core/lombok/experimental/FieldDefaults.java index dbc4993b..384abda5 100644 --- a/src/core/lombok/experimental/FieldDefaults.java +++ b/src/core/lombok/experimental/FieldDefaults.java @@ -33,9 +33,9 @@ import lombok.AccessLevel; * <p> * Complete documentation is found at <a href="https://projectlombok.org/features/experimental/FieldDefaults.html">the project lombok features page for @FieldDefaults</a>. * <p> - * If {@code makeFinal} is {@code true}, then each field that is not annotated with {@code @NonFinal} will have the {@code final} modifier added. + * If {@code makeFinal} is {@code true}, then each (instance) field that is not annotated with {@code @NonFinal} will have the {@code final} modifier added. * <p> - * If {@code level} is set, then each field that is package private (i.e. no access modifier) and does not have the {@code @PackagePrivate} annotation will + * If {@code level} is set, then each (instance) field that is package private (i.e. no access modifier) and does not have the {@code @PackagePrivate} annotation will * have the appropriate access level modifier added. */ @Target(ElementType.TYPE) diff --git a/src/core/lombok/experimental/NonFinal.java b/src/core/lombok/experimental/NonFinal.java index 0c31dd2a..12a45d22 100644 --- a/src/core/lombok/experimental/NonFinal.java +++ b/src/core/lombok/experimental/NonFinal.java @@ -28,7 +28,7 @@ import java.lang.annotation.Target; /** * Used to indicate the explicit intention for the annotated entity to <em>not</em> be {@code final}. - * Currently used by {@code FieldDefaults} to avoid having it make a field final. + * Currently used by {@code FieldDefaults} and {@code Value} to avoid having it make a field final. */ @Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE, ElementType.ANNOTATION_TYPE, ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.SOURCE) diff --git a/src/core/lombok/experimental/PackagePrivate.java b/src/core/lombok/experimental/PackagePrivate.java index bfe5638b..42002818 100644 --- a/src/core/lombok/experimental/PackagePrivate.java +++ b/src/core/lombok/experimental/PackagePrivate.java @@ -28,7 +28,7 @@ import java.lang.annotation.Target; /** * Used to indicate the explicit intention for the annotated entity to have the <em>package private</em> access level. - * Currently used by {@code FieldDefaults} to avoid having it make a field one of {@code public}, {@code protected}, or {@code private}. + * Currently used by {@code FieldDefaults} and {@code Value} to avoid having it make a field one of {@code public}, {@code protected}, or {@code private}. */ @Target({ElementType.TYPE, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.SOURCE) diff --git a/src/core/lombok/experimental/var.java b/src/core/lombok/experimental/var.java new file mode 100644 index 00000000..d8de8b19 --- /dev/null +++ b/src/core/lombok/experimental/var.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2010-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.experimental; + +/** + * like val but not final + */ +public @interface var { +} diff --git a/src/core/lombok/extern/apachecommons/CommonsLog.java b/src/core/lombok/extern/apachecommons/CommonsLog.java index 6e64d2d8..777f4b35 100644 --- a/src/core/lombok/extern/apachecommons/CommonsLog.java +++ b/src/core/lombok/extern/apachecommons/CommonsLog.java @@ -55,6 +55,7 @@ import java.lang.annotation.Target; * @see lombok.extern.log4j.Log4j2 @Log4j2 * @see lombok.extern.slf4j.Slf4j @Slf4j * @see lombok.extern.slf4j.XSlf4j @XSlf4j + * @see lombok.extern.jbosslog.JBossLog @JBossLog */ @Retention(RetentionPolicy.SOURCE) @Target(ElementType.TYPE) diff --git a/src/core/lombok/extern/java/Log.java b/src/core/lombok/extern/java/Log.java index d2cf8c17..d5515283 100644 --- a/src/core/lombok/extern/java/Log.java +++ b/src/core/lombok/extern/java/Log.java @@ -54,6 +54,7 @@ import java.lang.annotation.Target; * @see lombok.extern.log4j.Log4j2 @Log4j2 * @see lombok.extern.slf4j.Slf4j @Slf4j * @see lombok.extern.slf4j.XSlf4j @XSlf4j + * @see lombok.extern.jbosslog.JBossLog @JBossLog */ @Retention(RetentionPolicy.SOURCE) @Target(ElementType.TYPE) diff --git a/src/core/lombok/extern/jbosslog/JBossLog.java b/src/core/lombok/extern/jbosslog/JBossLog.java new file mode 100644 index 00000000..2735290c --- /dev/null +++ b/src/core/lombok/extern/jbosslog/JBossLog.java @@ -0,0 +1,67 @@ +/* + * 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.extern.jbosslog; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Causes lombok to generate a logger field. + * <p> + * Complete documentation is found at <a href="https://projectlombok.org/features/Log.html">the project lombok features page for lombok log annotations</a>. + * <p> + * Example: + * <pre> + * @JBossLog + * public class LogExample { + * } + * </pre> + * + * will generate: + * + * <pre> + * public class LogExample { + * private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LogExample.class); + * } + * </pre> + * + * This annotation is valid for classes and enumerations.<br /> + * @see org.jboss.logging.Logger org.jboss.logging.Logger + * @see org.jboss.logging.Logger#getLogger(java.lang.Class) org.jboss.logging.Logger.getLogger(Class target) + * @see lombok.extern.apachecommons.CommonsLog @CommonsLog + * @see lombok.extern.java.Log @Log + * @see lombok.extern.log4j.Log4j @Log4j + * @see lombok.extern.log4j.Log4j2 @Log4j2 + * @see lombok.extern.slf4j.XSlf4j @XSlf4j + * @see lombok.extern.jbosslog.JBossLog @JBossLog + * */ +@Retention(RetentionPolicy.SOURCE) +@Target(ElementType.TYPE) +public @interface JBossLog { + + /** + * Sets the category of the constructed Logger. By default, it will use the type where the annotation is placed. + */ + String topic() default ""; +} diff --git a/src/core/lombok/extern/log4j/Log4j.java b/src/core/lombok/extern/log4j/Log4j.java index 31fedbe7..6c6ef1da 100644 --- a/src/core/lombok/extern/log4j/Log4j.java +++ b/src/core/lombok/extern/log4j/Log4j.java @@ -55,6 +55,7 @@ import java.lang.annotation.Target; * @see lombok.extern.java.Log @Log * @see lombok.extern.slf4j.Slf4j @Slf4j * @see lombok.extern.slf4j.XSlf4j @XSlf4j + * @see lombok.extern.jbosslog.JBossLog @JBossLog */ @Retention(RetentionPolicy.SOURCE) @Target(ElementType.TYPE) diff --git a/src/core/lombok/extern/log4j/Log4j2.java b/src/core/lombok/extern/log4j/Log4j2.java index 96d793f7..a1b2e0e7 100644 --- a/src/core/lombok/extern/log4j/Log4j2.java +++ b/src/core/lombok/extern/log4j/Log4j2.java @@ -55,6 +55,7 @@ import java.lang.annotation.Target; * @see lombok.extern.java.Log @Log * @see lombok.extern.slf4j.Slf4j @Slf4j * @see lombok.extern.slf4j.XSlf4j @XSlf4j + * @see lombok.extern.jbosslog.JBossLog @JBossLog */ @Retention(RetentionPolicy.SOURCE) @Target(ElementType.TYPE) diff --git a/src/core/lombok/extern/slf4j/Slf4j.java b/src/core/lombok/extern/slf4j/Slf4j.java index 571ebd58..efa6105f 100644 --- a/src/core/lombok/extern/slf4j/Slf4j.java +++ b/src/core/lombok/extern/slf4j/Slf4j.java @@ -54,7 +54,8 @@ import java.lang.annotation.Target; * @see lombok.extern.log4j.Log4j @Log4j * @see lombok.extern.log4j.Log4j2 @Log4j2 * @see lombok.extern.slf4j.XSlf4j @XSlf4j - * */ + * @see lombok.extern.jbosslog.JBossLog @JBossLog + */ @Retention(RetentionPolicy.SOURCE) @Target(ElementType.TYPE) public @interface Slf4j { diff --git a/src/core/lombok/extern/slf4j/XSlf4j.java b/src/core/lombok/extern/slf4j/XSlf4j.java index 369728c4..ce23ab9e 100644 --- a/src/core/lombok/extern/slf4j/XSlf4j.java +++ b/src/core/lombok/extern/slf4j/XSlf4j.java @@ -54,6 +54,7 @@ import java.lang.annotation.Target; * @see lombok.extern.log4j.Log4j @Log4j * @see lombok.extern.log4j.Log4j2 @Log4j2 * @see lombok.extern.slf4j.Slf4j @Slf4j + * @see lombok.extern.jbosslog.JBossLog @JBossLog */ @Retention(RetentionPolicy.SOURCE) @Target(ElementType.TYPE) diff --git a/src/core/lombok/javac/JavacAST.java b/src/core/lombok/javac/JavacAST.java index da61361d..106a29ae 100644 --- a/src/core/lombok/javac/JavacAST.java +++ b/src/core/lombok/javac/JavacAST.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 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 @@ -28,6 +28,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import javax.annotation.processing.Messager; import javax.tools.Diagnostic; @@ -79,7 +81,7 @@ public class JavacAST extends AST<JavacAST, JavacNode, JCTree> { * @param top The compilation unit, which serves as the top level node in the tree to be built. */ public JavacAST(Messager messager, Context context, JCCompilationUnit top) { - super(sourceName(top), PackageName.getPackageName(top), new JavacImportList(top)); + super(sourceName(top), PackageName.getPackageName(top), new JavacImportList(top), statementTypes()); setTop(buildCompilationUnit(top)); this.context = context; this.messager = messager; @@ -315,7 +317,6 @@ public class JavacAST extends AST<JavacAST, JavacNode, JCTree> { // @Foo int x, y; is handled in javac by putting the same annotation node on 2 JCVariableDecls. return null; } - return putInMap(new JavacNode(this, annotation, null, Kind.ANNOTATION)); } @@ -333,12 +334,40 @@ public class JavacAST extends AST<JavacAST, JavacNode, JCTree> { if (statement instanceof JCClassDecl) return buildType((JCClassDecl)statement); if (statement instanceof JCVariableDecl) return buildLocalVar((JCVariableDecl)statement, Kind.LOCAL); if (statement instanceof JCTry) return buildTry((JCTry) statement); - + if (statement.getClass().getSimpleName().equals("JCLambda")) return buildLambda(statement); if (setAndGetAsHandled(statement)) return null; return drill(statement); } + private JavacNode buildLambda(JCTree jcTree) { + return buildStatementOrExpression(getBody(jcTree)); + } + + private JCTree getBody(JCTree jcTree) { + try { + return (JCTree) getBodyMethod(jcTree.getClass()).invoke(jcTree); + } catch (Exception e) { + throw Javac.sneakyThrow(e); + } + } + + private final static ConcurrentMap<Class<?>, Method> getBodyMethods = new ConcurrentHashMap<Class<?>, Method>(); + + private Method getBodyMethod(Class<?> c) { + Method m = getBodyMethods.get(c); + if (m != null) { + return m; + } + try { + m = c.getMethod("getBody"); + } catch (NoSuchMethodException e) { + throw Javac.sneakyThrow(e); + } + getBodyMethods.putIfAbsent(c, m); + return getBodyMethods.get(c); + } + private JavacNode drill(JCTree statement) { try { List<JavacNode> childNodes = new ArrayList<JavacNode>(); @@ -354,9 +383,8 @@ public class JavacAST extends AST<JavacAST, JavacNode, JCTree> { } } - /** For javac, both JCExpression and JCStatement are considered as valid children types. */ - @Override - protected Collection<Class<? extends JCTree>> getStatementTypes() { + /* For javac, both JCExpression and JCStatement are considered as valid children types. */ + private static Collection<Class<? extends JCTree>> statementTypes() { Collection<Class<? extends JCTree>> collection = new ArrayList<Class<? extends JCTree>>(3); collection.add(JCStatement.class); collection.add(JCExpression.class); diff --git a/src/core/lombok/javac/apt/LombokProcessor.java b/src/core/lombok/javac/apt/LombokProcessor.java index 128545c7..6547c143 100644 --- a/src/core/lombok/javac/apt/LombokProcessor.java +++ b/src/core/lombok/javac/apt/LombokProcessor.java @@ -273,14 +273,12 @@ public class LombokProcessor extends AbstractProcessor { if (newLevels.isEmpty()) return false; newLevels.retainAll(priorityLevelsRequiringResolutionReset); - if (newLevels.isEmpty()) { - // None of the new levels need resolution, so just keep going. - continue; - } else { + if (!newLevels.isEmpty()){ // Force a new round to reset resolution. The next round will cause this method (process) to be called again. forceNewRound((JavacFiler) processingEnv.getFiler()); return false; } + // None of the new levels need resolution, so just keep going. } } @@ -310,6 +308,6 @@ public class LombokProcessor extends AbstractProcessor { * We just return the latest version of whatever JDK we run on. Stupid? Yeah, but it's either that or warnings on all versions but 1. */ @Override public SourceVersion getSupportedSourceVersion() { - return SourceVersion.values()[SourceVersion.values().length - 1]; + return SourceVersion.latest(); } } diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java index b83e3d5f..9c3c9d03 100644 --- a/src/core/lombok/javac/handlers/HandleBuilder.java +++ b/src/core/lombok/javac/handlers/HandleBuilder.java @@ -608,8 +608,9 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> { for (JavacNode child : builderType.down()) { if (child.getKind() != Kind.METHOD) continue; - Name existingName = ((JCMethodDecl) child.get()).name; - if (existingName.equals(fieldName)) return; + JCMethodDecl methodDecl = (JCMethodDecl) child.get(); + Name existingName = methodDecl.name; + if (existingName.equals(fieldName) && !isTolerate(fieldNode, methodDecl)) return; } String setterName = fluent ? fieldNode.getName() : HandlerUtil.buildAccessorName("set", fieldNode.getName()); diff --git a/src/core/lombok/javac/handlers/HandleDelegate.java b/src/core/lombok/javac/handlers/HandleDelegate.java index 680e7745..49bef769 100644 --- a/src/core/lombok/javac/handlers/HandleDelegate.java +++ b/src/core/lombok/javac/handlers/HandleDelegate.java @@ -312,7 +312,7 @@ public class HandleDelegate extends JavacAnnotationHandler<Delegate> { for (TypeMirror param : sig.type.getTypeVariables()) { Name name = ((TypeVar) param).tsym.name; - ListBuffer<JCExpression> bounds = types.getBounds((TypeVar) param).isEmpty() ? null : new ListBuffer<JCExpression>(); + ListBuffer<JCExpression> bounds = new ListBuffer<JCExpression>(); for (Type type : types.getBounds((TypeVar) param)) { bounds.append(JavacResolution.typeToJCTree(type, annotation.getAst(), true)); } diff --git a/src/core/lombok/javac/handlers/HandleFieldDefaults.java b/src/core/lombok/javac/handlers/HandleFieldDefaults.java index 12c22059..52f6c39c 100644 --- a/src/core/lombok/javac/handlers/HandleFieldDefaults.java +++ b/src/core/lombok/javac/handlers/HandleFieldDefaults.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 The Project Lombok Authors. + * Copyright (C) 2012-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 @@ -84,14 +84,16 @@ public class HandleFieldDefaults extends JavacASTAdapter { if (level != null && level != AccessLevel.NONE) { if ((field.mods.flags & (Flags.PUBLIC | Flags.PRIVATE | Flags.PROTECTED)) == 0) { if (!hasAnnotationAndDeleteIfNeccessary(PackagePrivate.class, fieldNode)) { - field.mods.flags |= toJavacModifier(level); + if ((field.mods.flags & Flags.STATIC) == 0) { + field.mods.flags |= toJavacModifier(level); + } } } } if (makeFinal && (field.mods.flags & Flags.FINAL) == 0) { if (!hasAnnotationAndDeleteIfNeccessary(NonFinal.class, fieldNode)) { - if ((field.mods.flags & Flags.STATIC) == 0 || field.init != null) { + if ((field.mods.flags & Flags.STATIC) == 0) { field.mods.flags |= Flags.FINAL; } } diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index a330dbc1..0a2fe362 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.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 @@ -182,6 +182,10 @@ public class HandleGetter extends JavacAnnotationHandler<Getter> { source.addError("'lazy' requires the field to be private and final."); return; } + if ((fieldDecl.mods.flags & Flags.TRANSIENT) != 0) { + source.addError("'lazy' is not supported on transient fields."); + return; + } if (fieldDecl.init == null) { source.addError("'lazy' requires field initialization."); return; diff --git a/src/core/lombok/javac/handlers/HandleLog.java b/src/core/lombok/javac/handlers/HandleLog.java index 06b7c7ef..d0d709e3 100644 --- a/src/core/lombok/javac/handlers/HandleLog.java +++ b/src/core/lombok/javac/handlers/HandleLog.java @@ -175,6 +175,17 @@ public class HandleLog { } } + /** + * Handles the {@link lombok.extern.jbosslog.JBossLog} annotation for javac. + */ + @ProviderFor(JavacAnnotationHandler.class) + public static class HandleJBossLog extends JavacAnnotationHandler<lombok.extern.jbosslog.JBossLog> { + @Override public void handle(AnnotationValues<lombok.extern.jbosslog.JBossLog> annotation, JCAnnotation ast, JavacNode annotationNode) { + handleFlagUsage(annotationNode, ConfigurationKeys.LOG_JBOSSLOG_FLAG_USAGE, "@JBossLog", ConfigurationKeys.LOG_ANY_FLAG_USAGE, "any @Log"); + processAnnotation(LoggingFramework.JBOSSLOG, annotation, annotationNode, annotation.getInstance().topic()); + } + } + enum LoggingFramework { // private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(TargetType.class); COMMONS(lombok.extern.apachecommons.CommonsLog.class, "org.apache.commons.logging.Log", "org.apache.commons.logging.LogFactory.getLog"), @@ -200,6 +211,8 @@ public class HandleLog { // private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(TargetType.class); XSLF4J(lombok.extern.slf4j.XSlf4j.class, "org.slf4j.ext.XLogger", "org.slf4j.ext.XLoggerFactory.getXLogger"), + // private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(TargetType.class); + JBOSSLOG(lombok.extern.jbosslog.JBossLog.class, "org.jboss.logging.Logger", "org.jboss.logging.Logger.getLogger") ; private final Class<? extends Annotation> annotationClass; diff --git a/src/core/lombok/javac/handlers/HandleVal.java b/src/core/lombok/javac/handlers/HandleVal.java index 337ab2d7..2976eabe 100644 --- a/src/core/lombok/javac/handlers/HandleVal.java +++ b/src/core/lombok/javac/handlers/HandleVal.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 The Project Lombok Authors. + * Copyright (C) 2010-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,11 +21,12 @@ */ package lombok.javac.handlers; -import static lombok.core.handlers.HandlerUtil.*; +import static lombok.core.handlers.HandlerUtil.handleFlagUsage; import static lombok.javac.handlers.JavacHandlerUtil.*; import lombok.ConfigurationKeys; import lombok.val; import lombok.core.HandlerPriority; +import lombok.experimental.var; import lombok.javac.JavacASTAdapter; import lombok.javac.JavacASTVisitor; import lombok.javac.JavacNode; @@ -42,6 +43,7 @@ import com.sun.tools.javac.tree.JCTree.JCAnnotation; import com.sun.tools.javac.tree.JCTree.JCEnhancedForLoop; import com.sun.tools.javac.tree.JCTree.JCExpression; import com.sun.tools.javac.tree.JCTree.JCForLoop; +import com.sun.tools.javac.tree.JCTree.JCLiteral; import com.sun.tools.javac.tree.JCTree.JCNewArray; import com.sun.tools.javac.tree.JCTree.JCVariableDecl; import com.sun.tools.javac.util.List; @@ -50,21 +52,31 @@ import com.sun.tools.javac.util.List; @HandlerPriority(65536) // 2^16; resolution needs to work, so if the RHS expression is i.e. a call to a generated getter, we have to run after that getter has been generated. @ResolutionResetNeeded public class HandleVal extends JavacASTAdapter { - @Override public void visitLocal(JavacNode localNode, JCVariableDecl local) { + + private static boolean eq(String typeTreeToString, String key) { + return (typeTreeToString.equals(key) || typeTreeToString.equals("lombok." + key)); + } + + @Override + public void visitLocal(JavacNode localNode, JCVariableDecl local) { JCTree typeTree = local.vartype; if (typeTree == null) return; String typeTreeToString = typeTree.toString(); - if (!typeTreeToString.equals("val") && !typeTreeToString.equals("lombok.val")) return; - if (!typeMatches(val.class, localNode, typeTree)) return; - - handleFlagUsage(localNode, ConfigurationKeys.VAL_FLAG_USAGE, "val"); - + + if (!(eq(typeTreeToString, "val") || eq(typeTreeToString, "var"))) return; + boolean isVal = typeMatches(val.class, localNode, typeTree); + boolean isVar = typeMatches(var.class, localNode, typeTree); + if (!(isVal || isVar)) return; + + if (isVal) handleFlagUsage(localNode, ConfigurationKeys.VAL_FLAG_USAGE, "val"); + if (isVar) handleFlagUsage(localNode, ConfigurationKeys.VAR_FLAG_USAGE, "var"); + JCTree parentRaw = localNode.directUp().get(); - if (parentRaw instanceof JCForLoop) { + if (isVal && parentRaw instanceof JCForLoop) { localNode.addError("'val' is not allowed in old-style for loops"); return; } - + JCExpression rhsOfEnhancedForLoop = null; if (local.init == null) { if (parentRaw instanceof JCEnhancedForLoop) { @@ -72,21 +84,26 @@ public class HandleVal extends JavacASTAdapter { if (efl.var == local) rhsOfEnhancedForLoop = efl.expr; } } - + + final String annotation = typeTreeToString; if (rhsOfEnhancedForLoop == null && local.init == null) { - localNode.addError("'val' on a local variable requires an initializer expression"); + localNode.addError("'" + annotation + "' on a local variable requires an initializer expression"); return; + } - + if (local.init instanceof JCNewArray && ((JCNewArray)local.init).elemtype == null) { - localNode.addError("'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... })"); + localNode.addError("'" + annotation + "' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... })"); return; } - - if (localNode.shouldDeleteLombokAnnotations()) JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, "lombok.val"); - - local.mods.flags |= Flags.FINAL; - + + if (localNode.shouldDeleteLombokAnnotations()) { + JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, val.class.getName()); + JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, var.class.getName()); + } + + if (isVal) local.mods.flags |= Flags.FINAL; + if (!localNode.shouldDeleteLombokAnnotations()) { JCAnnotation valAnnotation = recursiveSetGeneratedBy(localNode.getTreeMaker().Annotation(local.vartype, List.<JCExpression>nil()), typeTree, localNode.getContext()); local.mods.annotations = local.mods.annotations == null ? List.of(valAnnotation) : local.mods.annotations.append(valAnnotation); @@ -102,6 +119,9 @@ public class HandleVal extends JavacASTAdapter { try { if (rhsOfEnhancedForLoop == null) { if (local.init.type == null) { + if (isVar && local.init instanceof JCLiteral && ((JCLiteral) local.init).value == null) { + localNode.addError("variable initializer is 'null'"); + } JavacResolution resolver = new JavacResolution(localNode.getContext()); try { type = ((JCExpression) resolver.resolveMethodMember(localNode).get(local.init)).type; @@ -149,7 +169,7 @@ public class HandleVal extends JavacASTAdapter { } localNode.getAst().setChanged(); } catch (JavacResolution.TypeNotConvertibleException e) { - localNode.addError("Cannot use 'val' here because initializer expression does not have a representable type: " + e.getMessage()); + localNode.addError("Cannot use '" + annotation + "' here because initializer expression does not have a representable type: " + e.getMessage()); local.vartype = JavacResolution.createJavaLangObject(localNode.getAst()); } } catch (RuntimeException e) { diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index fdc8a262..1ea3fa92 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.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 @@ -605,10 +605,7 @@ public class JavacHandlerUtil { if (params < minArgs || params > maxArgs) continue; } - List<JCAnnotation> annotations = md.getModifiers().getAnnotations(); - if (annotations != null) for (JCAnnotation anno : annotations) { - if (typeMatches(Tolerate.class, node, anno.getAnnotationType())) continue top; - } + if (isTolerate(node, md)) continue top; return getGeneratedBy(def) == null ? MemberExistsResult.EXISTS_BY_USER : MemberExistsResult.EXISTS_BY_LOMBOK; } @@ -619,6 +616,14 @@ public class JavacHandlerUtil { return MemberExistsResult.NOT_EXISTS; } + public static boolean isTolerate(JavacNode node, JCTree.JCMethodDecl md) { + List<JCAnnotation> annotations = md.getModifiers().getAnnotations(); + if (annotations != null) for (JCTree.JCAnnotation anno : annotations) { + if (typeMatches(Tolerate.class, node, anno.getAnnotationType())) return true; + } + return false; + } + /** * Checks if there is a (non-default) constructor. In case of multiple constructors (overloading), only * the first constructor decides if EXISTS_BY_USER or EXISTS_BY_LOMBOK is returned. @@ -629,15 +634,12 @@ public class JavacHandlerUtil { node = upToTypeNode(node); if (node != null && node.get() instanceof JCClassDecl) { - top: for (JCTree def : ((JCClassDecl)node.get()).defs) { + for (JCTree def : ((JCClassDecl)node.get()).defs) { if (def instanceof JCMethodDecl) { JCMethodDecl md = (JCMethodDecl) def; if (md.name.contentEquals("<init>")) { if ((md.mods.flags & Flags.GENERATEDCONSTR) != 0) continue; - List<JCAnnotation> annotations = md.getModifiers().getAnnotations(); - if (annotations != null) for (JCAnnotation anno : annotations) { - if (typeMatches(Tolerate.class, node, anno.getAnnotationType())) continue top; - } + if (isTolerate(node, md)) continue; return getGeneratedBy(def) == null ? MemberExistsResult.EXISTS_BY_USER : MemberExistsResult.EXISTS_BY_LOMBOK; } } @@ -997,9 +999,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) { @@ -1013,12 +1018,16 @@ public class JavacHandlerUtil { for (JCAnnotation ann : mods.annotations) { JCTree annType = ann.getAnnotationType(); - Name lastPart = null; - if (annType instanceof JCIdent) lastPart = ((JCIdent) annType).name; - else if (annType instanceof JCFieldAccess) lastPart = ((JCFieldAccess) annType).name; + if (annType instanceof JCIdent) { + Name lastPart = ((JCIdent) annType).name; + if (lastPart.contentEquals(simpleName)) return; + } - if (lastPart != null && lastPart.contentEquals(simpleName)) return; + if (annType instanceof JCFieldAccess) { + if (annType.toString().equals(annotationTypeFqn)) return; + } } + JavacTreeMaker maker = node.getTreeMaker(); JCExpression annType = isJavaLangBased ? genJavaLangTypeRef(node, simpleName) : chainDotsString(node, annotationTypeFqn); annType.pos = pos; diff --git a/src/delombok/lombok/delombok/FormatPreferences.java b/src/delombok/lombok/delombok/FormatPreferences.java index 5ba3b8cd..3861685d 100644 --- a/src/delombok/lombok/delombok/FormatPreferences.java +++ b/src/delombok/lombok/delombok/FormatPreferences.java @@ -44,7 +44,7 @@ public final class FormatPreferences { keys.put("finalParams", "Either 'generate' or 'skip'. generate means: All lombok-generated methods set all parameters to final. Default: 'generate'"); keys.put("constructorProperties", "Either 'generate' or 'skip'. generate means: All lombok-generated constructors with 1 or more arguments get an @ConstructorProperties annotation. Default: 'generate'"); keys.put("suppressWarnings", "Either 'generate' or 'skip'. generate means: All lombok-generated methods, types, and fields get a @SuppressWarnings annotation. Default: 'generate'"); - keys.put("generated", "Either 'generate' or 'skip'. generate means: All lombok-generated methods, types, and fields get a @Generated(\"lombok\") annotation. Default: 'generate'"); + keys.put("generated", "Either 'generate' or 'skip'. generate means: All lombok-generated methods, types, and fields get a @javax.annotation.Generated(\"lombok\") annotation. Default: 'generate'"); keys.put("danceAroundIdeChecks", "Either 'generate' or 'skip'. generate means: Lombok will intentionally obfuscate some generated code to avoid IDE warnings. Default: 'generate'"); keys.put("generateDelombokComment", "Either 'generate' or 'skip'. generate means: Any file modified by delombok will have a comment stating this at the top. Default: 'generate'"); keys.put("javaLangAsFQN", "Either 'generate' or 'skip'. generate means: Any generated reference to java.lang classes are prefixed with `java.lang.`. Default: 'generate'"); diff --git a/src/delombok/lombok/delombok/PrettyPrinter.java b/src/delombok/lombok/delombok/PrettyPrinter.java index 73d6ee90..b5064a33 100644 --- a/src/delombok/lombok/delombok/PrettyPrinter.java +++ b/src/delombok/lombok/delombok/PrettyPrinter.java @@ -1,3 +1,24 @@ +/* + * 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.delombok; import static com.sun.tools.javac.code.Flags.*; @@ -1054,6 +1075,7 @@ public class PrettyPrinter extends JCTree.Visitor { @Override public void visitForLoop(JCForLoop tree) { aPrint("for ("); if (tree.init.nonEmpty()) { + // ForInit is either a StatementExpressionList or a LocalVariableDeclaration if (tree.init.head instanceof JCVariableDecl) { boolean first = true; int dims = 0; @@ -1075,7 +1097,12 @@ public class PrettyPrinter extends JCTree.Visitor { first = false; } } else { - print(tree.init, ", "); + boolean first = true; + for (JCStatement exprStatement : tree.init) { + if (!first) print(", "); + first = false; + print(((JCExpressionStatement) exprStatement).expr); + } } } print("; "); diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index 336204a2..77f615b5 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -24,6 +24,8 @@ package lombok.eclipse.agent; import static lombok.patcher.scripts.ScriptBuilder.*; import java.lang.instrument.Instrumentation; +import java.net.URLClassLoader; +import java.security.ProtectionDomain; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -31,6 +33,7 @@ import java.util.List; import org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup; import lombok.core.AgentLauncher; +import lombok.patcher.Filter; import lombok.patcher.Hook; import lombok.patcher.MethodTarget; import lombok.patcher.ScriptManager; @@ -76,6 +79,15 @@ public class EclipsePatcher implements AgentLauncher.AgentLaunchable { private static void registerPatchScripts(Instrumentation instrumentation, boolean reloadExistingClasses, boolean ecjOnly, Class<?> launchingContext) { ScriptManager sm = new ScriptManager(); sm.registerTransformer(instrumentation); + sm.setFilter(new Filter() { + @Override public boolean shouldTransform(ClassLoader loader, String className, Class<?> classBeingDefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) { + if (!(loader instanceof URLClassLoader)) return true; + ClassLoader parent = loader.getParent(); + if (parent == null) return true; + return !parent.getClass().getName().startsWith("org.eclipse.jdt.apt.core.internal.AnnotationProcessorFactoryLoader"); + } + }); + final boolean forceBaseResourceNames = !"".equals(System.getProperty("shadow.override.lombok", "")); sm.setTransplantMapper(new TransplantMapper() { public String mapResourceName(int classFileFormatVersion, String resourceName) { diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java b/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java index b1f5a43a..02760e35 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java @@ -699,7 +699,10 @@ public class PatchDelegate { } private static void addAllMethodBindings0(List<BindingTuple> list, TypeBinding binding, Set<String> banList, char[] fieldName, ASTNode responsible) throws DelegateRecursion { - if (binding instanceof SourceTypeBinding) ((SourceTypeBinding) binding).scope.environment().globalOptions.storeAnnotations = true; + if (binding instanceof SourceTypeBinding) { + ClassScope scope = ((SourceTypeBinding) binding).scope; + if (scope != null) scope.environment().globalOptions.storeAnnotations = true; + } if (binding == null) return; TypeBinding inner; @@ -721,42 +724,44 @@ public class PatchDelegate { } } - if (binding instanceof ReferenceBinding) { - ReferenceBinding rb = (ReferenceBinding) binding; - MethodBinding[] availableMethods = rb.availableMethods(); - FieldBinding[] availableFields = rb.availableFields(); - failIfContainsAnnotation(binding, availableMethods); - failIfContainsAnnotation(binding, availableFields); - - MethodBinding[] parameterizedSigs = availableMethods; - MethodBinding[] baseSigs = parameterizedSigs; - if (binding instanceof ParameterizedTypeBinding) { - baseSigs = ((ParameterizedTypeBinding)binding).genericType().availableMethods(); - if (baseSigs.length != parameterizedSigs.length) { - // The last known state of eclipse source says this can't happen, so we rely on it, - // but if this invariant is broken, better to go with 'arg0' naming instead of crashing. - baseSigs = parameterizedSigs; - } - } - for (int i = 0; i < parameterizedSigs.length; i++) { - MethodBinding mb = parameterizedSigs[i]; - String sig = printSig(mb); - if (mb.isStatic()) continue; - if (mb.isBridge()) continue; - if (mb.isConstructor()) continue; - if (mb.isDefaultAbstract()) continue; - if (!mb.isPublic()) continue; - if (mb.isSynthetic()) continue; - if (!banList.add(sig)) continue; // If add returns false, it was already in there. - BindingTuple pair = new BindingTuple(mb, baseSigs[i], fieldName, responsible); - list.add(pair); - } - addAllMethodBindings0(list, rb.superclass(), banList, fieldName, responsible); - ReferenceBinding[] interfaces = rb.superInterfaces(); - if (interfaces != null) { - for (ReferenceBinding iface : interfaces) addAllMethodBindings0(list, iface, banList, fieldName, responsible); + if (!(binding instanceof ReferenceBinding)) { + return; + } + + ReferenceBinding rb = (ReferenceBinding) binding; + MethodBinding[] availableMethods = rb.availableMethods(); + FieldBinding[] availableFields = rb.availableFields(); + failIfContainsAnnotation(binding, availableMethods); + failIfContainsAnnotation(binding, availableFields); + + MethodBinding[] parameterizedSigs = availableMethods; + MethodBinding[] baseSigs = parameterizedSigs; + if (binding instanceof ParameterizedTypeBinding) { + baseSigs = ((ParameterizedTypeBinding)binding).genericType().availableMethods(); + if (baseSigs.length != parameterizedSigs.length) { + // The last known state of eclipse source says this can't happen, so we rely on it, + // but if this invariant is broken, better to go with 'arg0' naming instead of crashing. + baseSigs = parameterizedSigs; } } + for (int i = 0; i < parameterizedSigs.length; i++) { + MethodBinding mb = parameterizedSigs[i]; + String sig = printSig(mb); + if (mb.isStatic()) continue; + if (mb.isBridge()) continue; + if (mb.isConstructor()) continue; + if (mb.isDefaultAbstract()) continue; + if (!mb.isPublic()) continue; + if (mb.isSynthetic()) continue; + if (!banList.add(sig)) continue; // If add returns false, it was already in there. + BindingTuple pair = new BindingTuple(mb, baseSigs[i], fieldName, responsible); + list.add(pair); + } + addAllMethodBindings0(list, rb.superclass(), banList, fieldName, responsible); + ReferenceBinding[] interfaces = rb.superInterfaces(); + if (interfaces != null) { + for (ReferenceBinding iface : interfaces) addAllMethodBindings0(list, iface, banList, fieldName, responsible); + } } private static final char[] STRING_LOMBOK = new char[] {'l', 'o', 'm', 'b', 'o', 'k'}; diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java index 2b8dfbaa..e4dd7b26 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java @@ -21,11 +21,6 @@ */ package lombok.eclipse.agent; -import static lombok.eclipse.handlers.EclipseHandlerUtil.*; -import static lombok.eclipse.Eclipse.*; - -import java.lang.reflect.Field; - import org.eclipse.jdt.internal.compiler.ast.Annotation; import org.eclipse.jdt.internal.compiler.ast.Expression; import org.eclipse.jdt.internal.compiler.ast.ForeachStatement; @@ -43,6 +38,11 @@ import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.eclipse.jdt.internal.compiler.lookup.TypeConstants; import org.eclipse.jdt.internal.compiler.lookup.TypeIds; +import java.lang.reflect.Field; + +import static lombok.eclipse.Eclipse.poss; +import static lombok.eclipse.handlers.EclipseHandlerUtil.makeType; + public class PatchVal { // This is half of the work for 'val' support - the other half is in PatchValEclipse. This half is enough for ecj. @@ -84,31 +84,44 @@ public class PatchVal { return true; } - public static boolean couldBeVal(TypeReference ref) { + public static boolean couldBe(String key, TypeReference ref) { + String[] keyParts = key.split("\\."); if (ref instanceof SingleTypeReference) { char[] token = ((SingleTypeReference)ref).token; - return matches("val", token); + return matches(keyParts[keyParts.length - 1], token); } if (ref instanceof QualifiedTypeReference) { char[][] tokens = ((QualifiedTypeReference)ref).tokens; - if (tokens == null || tokens.length != 2) return false; - return matches("lombok", tokens[0]) && matches("val", tokens[1]); + if (keyParts.length != tokens.length) return false; + for(int i = 0; i < tokens.length; ++i) { + String part = keyParts[i]; + char[] token = tokens[i]; + if (!matches(part, token)) return false; + } + return true; } return false; } - - private static boolean isVal(TypeReference ref, BlockScope scope) { - if (!couldBeVal(ref)) return false; - + + private static boolean is(TypeReference ref, BlockScope scope, String key) { + if (!couldBe(key, ref)) return false; + TypeBinding resolvedType = ref.resolvedType; if (resolvedType == null) resolvedType = ref.resolveType(scope, false); if (resolvedType == null) return false; char[] pkg = resolvedType.qualifiedPackageName(); char[] nm = resolvedType.qualifiedSourceName(); - return matches("lombok", pkg) && matches("val", nm); + int pkgFullLength = pkg.length > 0 ? pkg.length + 1: 0; + char[] fullName = new char[pkgFullLength + nm.length]; + if(pkg.length > 0) { + System.arraycopy(pkg, 0, fullName, 0, pkg.length); + fullName[pkg.length] = '.'; + } + System.arraycopy(nm, 0, fullName, pkgFullLength, nm.length); + return matches(key, fullName); } public static final class Reflection { @@ -132,13 +145,17 @@ public class PatchVal { if (local == null || !LocalDeclaration.class.equals(local.getClass())) return false; boolean decomponent = false; - if (!isVal(local.type, scope)) return false; + boolean val = isVal(local, scope); + boolean var = isVar(local, scope); + if (!(val || var)) return false; StackTraceElement[] st = new Throwable().getStackTrace(); for (int i = 0; i < st.length - 2 && i < 10; i++) { if (st[i].getClassName().equals("lombok.launch.PatchFixesHider$Val")) { - if (st[i + 1].getClassName().equals("org.eclipse.jdt.internal.compiler.ast.LocalDeclaration") && - st[i + 2].getClassName().equals("org.eclipse.jdt.internal.compiler.ast.ForStatement")) return false; + boolean valInForStatement = val && + st[i + 1].getClassName().equals("org.eclipse.jdt.internal.compiler.ast.LocalDeclaration") && + st[i + 2].getClassName().equals("org.eclipse.jdt.internal.compiler.ast.ForStatement"); + if (valInForStatement) return false; break; } } @@ -187,23 +204,33 @@ public class PatchVal { } } - local.modifiers |= ClassFileConstants.AccFinal; + if(val) local.modifiers |= ClassFileConstants.AccFinal; local.annotations = addValAnnotation(local.annotations, local.type, scope); local.type = replacement != null ? replacement : new QualifiedTypeReference(TypeConstants.JAVA_LANG_OBJECT, poss(local.type, 3)); return false; } + private static boolean isVar(LocalDeclaration local, BlockScope scope) { + return is(local.type, scope, "lombok.experimental.var"); + } + + private static boolean isVal(LocalDeclaration local, BlockScope scope) { + return is(local.type, scope, "lombok.val"); + } + public static boolean handleValForForEach(ForeachStatement forEach, BlockScope scope) { if (forEach.elementVariable == null) return false; - if (!isVal(forEach.elementVariable.type, scope)) return false; + boolean val = isVal(forEach.elementVariable, scope); + boolean var = isVar(forEach.elementVariable, scope); + if (!(val || var)) return false; TypeBinding component = getForEachComponentType(forEach.collection, scope); if (component == null) return false; TypeReference replacement = makeType(component, forEach.elementVariable.type, false); - forEach.elementVariable.modifiers |= ClassFileConstants.AccFinal; + if (val) forEach.elementVariable.modifiers |= ClassFileConstants.AccFinal; forEach.elementVariable.annotations = addValAnnotation(forEach.elementVariable.annotations, forEach.elementVariable.type, scope); forEach.elementVariable.type = replacement != null ? replacement : new QualifiedTypeReference(TypeConstants.JAVA_LANG_OBJECT, poss(forEach.elementVariable.type, 3)); diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java b/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java index 7d5f36f4..505eb767 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java @@ -47,6 +47,7 @@ import org.eclipse.jdt.internal.compiler.ast.Annotation; import org.eclipse.jdt.internal.compiler.ast.ForeachStatement; import org.eclipse.jdt.internal.compiler.ast.LocalDeclaration; import org.eclipse.jdt.internal.compiler.ast.SingleTypeReference; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; import org.eclipse.jdt.internal.compiler.parser.Parser; @@ -65,7 +66,9 @@ public class PatchValEclipse { ForeachStatement foreachDecl = (ForeachStatement) astStack[astPtr]; ASTNode init = foreachDecl.collection; if (init == null) return; - if (foreachDecl.elementVariable == null || !PatchVal.couldBeVal(foreachDecl.elementVariable.type)) return; + boolean val = couldBeVal(foreachDecl.elementVariable.type); + boolean var = couldBeVar(foreachDecl.elementVariable.type); + if (foreachDecl.elementVariable == null || !(val || var)) return; try { if (Reflection.iterableCopyField != null) Reflection.iterableCopyField.set(foreachDecl.elementVariable, init); @@ -88,7 +91,9 @@ public class PatchValEclipse { if (!(variableDecl instanceof LocalDeclaration)) return; ASTNode init = variableDecl.initialization; if (init == null) return; - if (!PatchVal.couldBeVal(variableDecl.type)) return; + boolean val = couldBeVal(variableDecl.type); + boolean var = couldBeVar(variableDecl.type); + if (!(val || var)) return; try { if (Reflection.initCopyField != null) Reflection.initCopyField.set(variableDecl, init); @@ -97,6 +102,10 @@ public class PatchValEclipse { } } + private static boolean couldBeVar(TypeReference type) { + return PatchVal.couldBe("lombok.experimental.var", type); + } + public static void addFinalAndValAnnotationToSingleVariableDeclaration(Object converter, SingleVariableDeclaration out, LocalDeclaration in) { @SuppressWarnings("unchecked") List<IExtendedModifier> modifiers = out.modifiers(); addFinalAndValAnnotationToModifierList(converter, modifiers, out.getAST(), in); @@ -115,7 +124,7 @@ public class PatchValEclipse { Annotation valAnnotation = null; for (Annotation ann : in.annotations) { - if (PatchVal.couldBeVal(ann.type)) { + if (couldBeVal(ann.type)) { found = true; valAnnotation = ann; break; @@ -167,6 +176,10 @@ public class PatchValEclipse { } } + private static boolean couldBeVal(TypeReference type) { + return PatchVal.couldBe("lombok.val", type); + } + public static Modifier createModifier(AST ast, ModifierKeyword keyword, int start, int end) { Modifier modifier = null; try { diff --git a/src/installer/lombok/installer/IdeLocation.java b/src/installer/lombok/installer/IdeLocation.java index 4e3a7e41..c3853867 100644 --- a/src/installer/lombok/installer/IdeLocation.java +++ b/src/installer/lombok/installer/IdeLocation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,7 +25,6 @@ import java.io.File; import java.io.IOException; import java.net.URL; -import lombok.installer.eclipse.EclipseFinder; import lombok.patcher.ClassRootFinder; /** @@ -46,7 +45,7 @@ public abstract class IdeLocation { * a jar that wasn't accessed via the file-system, or if its started via e.g. unpacking the jar. */ public static File findOurJar() { - return new File(ClassRootFinder.findClassRootOfClass(IdeFinder.class)); + return new File(ClassRootFinder.findClassRootOfClass(OsUtils.class)); } @Override public String toString() { @@ -70,7 +69,7 @@ public abstract class IdeLocation { private static final String LEGAL_PATH_CHARS_WINDOWS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_/:\\ "; public static String escapePath(String path) { StringBuilder out = new StringBuilder(); - String legalChars = IdeFinder.getOS() == EclipseFinder.OS.UNIX ? LEGAL_PATH_CHARS : LEGAL_PATH_CHARS_WINDOWS; + String legalChars = OsUtils.getOS() == OsUtils.OS.UNIX ? LEGAL_PATH_CHARS : LEGAL_PATH_CHARS_WINDOWS; for (char c : path.toCharArray()) { if (legalChars.indexOf(c) == -1) out.append('\\'); out.append(c); diff --git a/src/installer/lombok/installer/IdeLocationProvider.java b/src/installer/lombok/installer/IdeLocationProvider.java index 933a5989..c4b64141 100644 --- a/src/installer/lombok/installer/IdeLocationProvider.java +++ b/src/installer/lombok/installer/IdeLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,20 +21,30 @@ */ package lombok.installer; +import java.util.List; import java.util.regex.Pattern; -import lombok.installer.IdeFinder.OS; - public interface IdeLocationProvider { /** * @throws CorruptedIdeLocationException * Only throw this exception if the location seems like a proper installation except there's something wrong with it. * Do not throw it (just return {@code null}) if there's nothing there or it looks absolutely nothing like your IDE. */ - public abstract IdeLocation create(String path) throws CorruptedIdeLocationException; + IdeLocation create(String path) throws CorruptedIdeLocationException; + + /** + * Return the usual name of the IDE executable or other obvious marker of an IDE installation on the current platform. + */ + Pattern getLocationSelectors(); /** - * Return the usual name of the IDE executable or other obvious marker of an IDE installation on the provided platform. + * Look for installations of your IDE in the usual places. + * + * @param locations Add to this list any valid locations that you found. + * @param problems + * Add to this list any locations that look like installations, + * but have problems that prevent you from installing/uninstalling from them. DONT add to this list + * any common locations that have no installation at all - only add near misses. */ - public abstract Pattern getLocationSelectors(OS os); + void findIdes(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems); } diff --git a/src/installer/lombok/installer/Installer.java b/src/installer/lombok/installer/Installer.java index 7ae01d7a..94cc1a45 100644 --- a/src/installer/lombok/installer/Installer.java +++ b/src/installer/lombok/installer/Installer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -38,7 +38,7 @@ import lombok.Lombok; import lombok.core.LombokApp; import lombok.core.SpiLoadUtil; import lombok.core.Version; -import lombok.installer.IdeFinder.OS; +import lombok.installer.OsUtils.OS; import lombok.patcher.ClassRootFinder; import org.mangosdk.spi.ProviderFor; @@ -72,10 +72,9 @@ public class Installer { } static List<Pattern> getIdeExecutableNames() { - OS os = IdeFinder.getOS(); List<Pattern> list = new ArrayList<Pattern>(); for (IdeLocationProvider provider : locationProviders) { - Pattern p = provider.getLocationSelectors(os); + Pattern p = provider.getLocationSelectors(); if (p != null) list.add(p); } return list; @@ -91,12 +90,8 @@ public class Installer { } static void autoDiscover(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems) { - try { - for (IdeFinder finder : SpiLoadUtil.findServices(IdeFinder.class)) { - finder.findIdes(locations, problems); - } - } catch (IOException e) { - throw Lombok.sneakyThrow(e); + for (IdeLocationProvider provider : locationProviders) { + provider.findIdes(locations, problems); } } @@ -160,7 +155,7 @@ public class Installer { } private static int guiInstaller() { - if (IdeFinder.getOS() == OS.MAC_OS_X) { + if (OsUtils.getOS() == OS.MAC_OS_X) { System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Lombok Installer"); System.setProperty("com.apple.macos.use-file-dialog-packages", "true"); } diff --git a/src/installer/lombok/installer/InstallerGUI.java b/src/installer/lombok/installer/InstallerGUI.java index 6b8a58ab..ebdf2035 100644 --- a/src/installer/lombok/installer/InstallerGUI.java +++ b/src/installer/lombok/installer/InstallerGUI.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -67,7 +67,7 @@ import javax.swing.SwingUtilities; import javax.swing.filechooser.FileFilter; import lombok.core.Version; -import lombok.installer.IdeFinder.OS; +import lombok.installer.OsUtils.OS; /** * The lombok GUI installer. @@ -313,7 +313,7 @@ public class InstallerGUI { final List<Pattern> exeNames = Installer.getIdeExecutableNames(); String file = null; - if (IdeFinder.getOS() == OS.MAC_OS_X) { + if (OsUtils.getOS() == OS.MAC_OS_X) { FileDialog chooser = new FileDialog(appWindow); chooser.setMode(FileDialog.LOAD); @@ -740,7 +740,7 @@ public class InstallerGUI { } catch (Exception e) { Runtime rt = Runtime.getRuntime(); try { - switch (IdeFinder.getOS()) { + switch (OsUtils.getOS()) { case WINDOWS: String[] cmd = new String[4]; cmd[0] = "cmd.exe"; @@ -781,7 +781,7 @@ public class InstallerGUI { */ public void show() { appWindow.setVisible(true); - if (IdeFinder.getOS() == OS.MAC_OS_X) { + if (OsUtils.getOS() == OS.MAC_OS_X) { try { AppleNativeLook.go(); } catch (Throwable ignore) { diff --git a/src/installer/lombok/installer/IdeFinder.java b/src/installer/lombok/installer/OsUtils.java index f68a0e4c..2da7de09 100644 --- a/src/installer/lombok/installer/IdeFinder.java +++ b/src/installer/lombok/installer/OsUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -34,9 +34,13 @@ import lombok.core.Version; /** * Implement and provide this class to add auto-finding a certain brand of IDEs to the lombok installer. */ -public abstract class IdeFinder { +public final class OsUtils { private static final AtomicBoolean windowsDriveInfoLibLoaded = new AtomicBoolean(false); + private OsUtils() { + // Prevent instantiation + } + private static void loadWindowsDriveInfoLib() throws IOException { if (!windowsDriveInfoLibLoaded.compareAndSet(false, true)) return; @@ -63,7 +67,7 @@ public abstract class IdeFinder { } private static boolean unpackDLL(String dllName, File target) throws IOException { - InputStream in = IdeFinder.class.getResourceAsStream(dllName); + InputStream in = OsUtils.class.getResourceAsStream(dllName); try { try { FileOutputStream out = new FileOutputStream(target); @@ -130,15 +134,4 @@ public abstract class IdeFinder { return OS.UNIX; } - - /** - * Look for installations of your IDE in the usual places. - * - * @param locations Add to this list any valid locations that you found. - * @param problems - * Add to this list any locations that look like installations, - * but have problems that prevent you from installing/uninstalling from them. DONT add to this list - * any common locations that have no installation at all - only add near misses. - */ - public abstract void findIdes(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems); } diff --git a/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java b/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java index 29716a1f..fa2ce958 100644 --- a/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java +++ b/src/installer/lombok/installer/eclipse/EclipseLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,145 +21,24 @@ */ package lombok.installer.eclipse; -import static lombok.installer.IdeLocation.canonical; +import java.util.Collections; -import java.io.File; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; - -import lombok.installer.IdeLocation; import lombok.installer.IdeLocationProvider; -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder.OS; import org.mangosdk.spi.ProviderFor; @ProviderFor(IdeLocationProvider.class) -public class EclipseLocationProvider implements IdeLocationProvider { - @Override public IdeLocation create(String path) throws CorruptedIdeLocationException { - return create0(path); - } - - protected List<String> getEclipseExecutableNames() { - return Arrays.asList("eclipse.app", "eclipse.exe", "eclipse"); - } - - protected String getIniName() { - return "eclipse.ini"; - } - - protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException { - return new EclipseLocation(name, ini); - } - - protected String getMacAppName() { - return "Eclipse.app"; - } - - protected String getUnixAppName() { - return "eclipse"; - } - - /** - * Create a new EclipseLocation by pointing at either the directory contains the Eclipse executable, or the executable itself, - * or an eclipse.ini file. - * - * @throws NotAnIdeLocationException - * If this isn't an Eclipse executable or a directory with an - * Eclipse executable. - */ - protected IdeLocation create0(String path) throws CorruptedIdeLocationException { - if (path == null) throw new NullPointerException("path"); - File p = new File(path); - - if (!p.exists()) return null; - if (p.isDirectory()) { - for (String possibleExeName : getEclipseExecutableNames()) { - File f = new File(p, possibleExeName); - if (f.exists()) return findEclipseIniFromExe(f, 0); - } - - File f = new File(p, getIniName()); - if (f.exists()) return new EclipseLocation(canonical(p), f); - } - - if (p.isFile()) { - if (p.getName().equalsIgnoreCase(getIniName())) { - return new EclipseLocation(canonical(p.getParentFile()), p); - } - } - - if (getEclipseExecutableNames().contains(p.getName().toLowerCase())) { - return findEclipseIniFromExe(p, 0); - } - - return null; - } - - private IdeLocation findEclipseIniFromExe(File exePath, int loopCounter) throws CorruptedIdeLocationException { - /* Try looking for eclipse.ini as sibling to the executable */ { - File ini = new File(exePath.getParentFile(), getIniName()); - if (ini.isFile()) return makeLocation(canonical(exePath), ini); - } - - /* Try looking for Eclipse.app/Contents/MacOS/eclipse.ini as sibling to executable; this works on Mac OS X. */ { - File ini = new File(exePath.getParentFile(), getMacAppName() + "/Contents/MacOS/" + getIniName()); - if (ini.isFile()) return makeLocation(canonical(exePath), ini); - } - - /* Starting with Eclipse Mars (with the oomph installer), the structure has changed, and it's now at Eclipse.app/Contents/Eclipse/eclipse.ini*/ { - File ini = new File(exePath.getParentFile(), getMacAppName() + "/Contents/Eclipse/" + getIniName()); - if (ini.isFile()) return makeLocation(canonical(exePath), ini); - } - - /* If executable is a soft link, follow it and retry. */ { - if (loopCounter < 50) { - try { - String oPath = exePath.getAbsolutePath(); - String nPath = exePath.getCanonicalPath(); - if (!oPath.equals(nPath)) try { - IdeLocation loc = findEclipseIniFromExe(new File(nPath), loopCounter + 1); - if (loc != null) return loc; - } catch (CorruptedIdeLocationException ignore) { - // Unlinking didn't help find an eclipse, so continue. - } - } catch (IOException ignore) { /* okay, that didn't work, assume it isn't a soft link then. */ } - } - } - - /* If executable is a linux LSB-style path, then look in the usual places that package managers like apt-get use.*/ { - String path = exePath.getAbsolutePath(); - try { - path = exePath.getCanonicalPath(); - } catch (IOException ignore) { /* We'll stick with getAbsolutePath()'s result then. */ } - - if (path.equals("/usr/bin/" + getUnixAppName()) || path.equals("/bin/" + getUnixAppName()) || path.equals("/usr/local/bin/" + getUnixAppName())) { - File ini = new File("/usr/lib/" + getUnixAppName() + "/" + getIniName()); - if (ini.isFile()) return makeLocation(path, ini); - ini = new File("/usr/local/lib/" + getUnixAppName() + "/" + getIniName()); - if (ini.isFile()) return makeLocation(path, ini); - ini = new File("/usr/local/etc/" + getUnixAppName() + "/" + getIniName()); - if (ini.isFile()) return makeLocation(path, ini); - ini = new File("/etc/" + getIniName()); - if (ini.isFile()) return makeLocation(path, ini); - } - } - - /* If we get this far, we lose. */ - return null; - } - - @Override public Pattern getLocationSelectors(OS os) { - switch (os) { - case MAC_OS_X: - return Pattern.compile("^(eclipse|eclipse\\.ini|eclipse\\.app)$", Pattern.CASE_INSENSITIVE); - case WINDOWS: - return Pattern.compile("^(eclipse\\.exe|eclipse\\.ini)$", Pattern.CASE_INSENSITIVE); - default: - case UNIX: - return Pattern.compile("^(eclipse|eclipse\\.ini)$", Pattern.CASE_INSENSITIVE); - } +public class EclipseLocationProvider extends EclipseProductLocationProvider { + + private static final EclipseProductDescriptor ECLIPSE = new StandardProductDescriptor( + "Eclipse", + "eclipse", + "eclipse", + EclipseLocationProvider.class.getResource("eclipse.png"), + Collections.<String>emptySet() + ); + + public EclipseLocationProvider() { + super(ECLIPSE); } } diff --git a/src/installer/lombok/installer/eclipse/STSLocation.java b/src/installer/lombok/installer/eclipse/EclipseProductDescriptor.java index 40ade40a..8f736a57 100644 --- a/src/installer/lombok/installer/eclipse/STSLocation.java +++ b/src/installer/lombok/installer/eclipse/EclipseProductDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 The Project Lombok Authors. + * Copyright (C) 2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,25 +21,21 @@ */ package lombok.installer.eclipse; -import java.io.File; import java.net.URL; +import java.util.List; +import java.util.regex.Pattern; -import lombok.installer.CorruptedIdeLocationException; - -public class STSLocation extends EclipseLocation { - public STSLocation(String nameOfLocation, File pathToEclipseIni) throws CorruptedIdeLocationException { - super(nameOfLocation, pathToEclipseIni); - } - - @Override public URL getIdeIcon() { - return STSLocation.class.getResource("STS.png"); - } - - @Override protected String getIniFileName() { - return "STS.ini"; - } - - @Override protected String getTypeName() { - return "STS"; - } -} +public interface EclipseProductDescriptor { + String getProductName(); + String getWindowsExecutableName(); + String getUnixAppName(); + String getMacAppName(); + String getDirectoryName(); + List<String> getExecutableNames(); + List<String> getSourceDirsOnWindows(); + List<String> getSourceDirsOnMac(); + List<String> getSourceDirsOnUnix(); + String getIniFileName(); + Pattern getLocationSelectors(); + URL getIdeIcon(); +}
\ No newline at end of file diff --git a/src/installer/lombok/installer/eclipse/EclipseLocation.java b/src/installer/lombok/installer/eclipse/EclipseProductLocation.java index 6c63c48d..886e3e85 100644 --- a/src/installer/lombok/installer/eclipse/EclipseLocation.java +++ b/src/installer/lombok/installer/eclipse/EclipseProductLocation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -35,7 +35,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder; +import lombok.installer.OsUtils; import lombok.installer.IdeLocation; import lombok.installer.InstallException; import lombok.installer.Installer; @@ -46,23 +46,18 @@ import lombok.installer.UninstallException; * An instance can figure out if an Eclipse installation has been lombok-ified, and can * install and uninstall lombok from the Eclipse installation. */ -public class EclipseLocation extends IdeLocation { +public final class EclipseProductLocation extends IdeLocation { + + private static final String OS_NEWLINE = OsUtils.getOS().getLineEnding(); + + private final EclipseProductDescriptor descriptor; private final String name; private final File eclipseIniPath; private final String pathToLombokJarPrefix; - private volatile boolean hasLombok; - - private static final String OS_NEWLINE = IdeFinder.getOS().getLineEnding(); - - protected String getTypeName() { - return "eclipse"; - } - - protected String getIniFileName() { - return "eclipse.ini"; - } + private final boolean hasLombok; - EclipseLocation(String nameOfLocation, File pathToEclipseIni) throws CorruptedIdeLocationException { + EclipseProductLocation(EclipseProductDescriptor descriptor, String nameOfLocation, File pathToEclipseIni) throws CorruptedIdeLocationException { + this.descriptor = descriptor; this.name = nameOfLocation; this.eclipseIniPath = pathToEclipseIni; File p1 = pathToEclipseIni.getParentFile(); @@ -78,8 +73,8 @@ public class EclipseLocation extends IdeLocation { this.hasLombok = checkForLombok(eclipseIniPath); } catch (IOException e) { throw new CorruptedIdeLocationException( - "I can't read the configuration file of the " + getTypeName() + " installed at " + name + "\n" + - "You may need to run this installer with root privileges if you want to modify that " + getTypeName() + ".", getTypeName(), e); + "I can't read the configuration file of the " + descriptor.getProductName() + " installed at " + name + "\n" + + "You may need to run this installer with root privileges if you want to modify that " + descriptor.getProductName() + ".", descriptor.getProductName(), e); } } @@ -88,8 +83,8 @@ public class EclipseLocation extends IdeLocation { } @Override public boolean equals(Object o) { - if (!(o instanceof EclipseLocation)) return false; - return ((EclipseLocation)o).eclipseIniPath.equals(eclipseIniPath); + if (!(o instanceof EclipseProductLocation)) return false; + return ((EclipseProductLocation)o).eclipseIniPath.equals(eclipseIniPath); } /** @@ -108,13 +103,13 @@ public class EclipseLocation extends IdeLocation { return hasLombok; } - private final Pattern JAVA_AGENT_LINE_MATCHER = Pattern.compile( + private static final Pattern JAVA_AGENT_LINE_MATCHER = Pattern.compile( "^\\-javaagent\\:.*lombok.*\\.jar$", Pattern.CASE_INSENSITIVE); - private final Pattern BOOTCLASSPATH_LINE_MATCHER = Pattern.compile( + private static final Pattern BOOTCLASSPATH_LINE_MATCHER = Pattern.compile( "^\\-Xbootclasspath\\/a\\:(.*lombok.*\\.jar.*)$", Pattern.CASE_INSENSITIVE); - private boolean checkForLombok(File iniFile) throws IOException { + private static boolean checkForLombok(File iniFile) throws IOException { if (!iniFile.exists()) return false; FileInputStream fis = new FileInputStream(iniFile); try { @@ -206,7 +201,7 @@ public class EclipseLocation extends IdeLocation { File lombokJar = new File(dir, "lombok.jar"); if (lombokJar.exists()) { if (!lombokJar.delete()) { - if (IdeFinder.getOS() == IdeFinder.OS.WINDOWS && Installer.isSelf(lombokJar.getAbsolutePath())) { + if (OsUtils.getOS() == OsUtils.OS.WINDOWS && Installer.isSelf(lombokJar.getAbsolutePath())) { lombokJarsForWhichCantDeleteSelf.add(lombokJar); } else { throw new UninstallException( @@ -228,14 +223,14 @@ public class EclipseLocation extends IdeLocation { throw new UninstallException(true, String.format( "lombok.jar cannot delete itself on windows.\nHowever, lombok has been uncoupled from your %s.\n" + "You can safely delete this jar file. You can find it at:\n%s", - getTypeName(), lombokJarsForWhichCantDeleteSelf.get(0).getAbsolutePath()), null); + descriptor.getProductName(), lombokJarsForWhichCantDeleteSelf.get(0).getAbsolutePath()), null); } } private static String generateWriteErrorMessage() { String osSpecificError; - switch (IdeFinder.getOS()) { + switch (OsUtils.getOS()) { default: case MAC_OS_X: case UNIX: @@ -265,7 +260,7 @@ public class EclipseLocation extends IdeLocation { // If someone knows how to fix this, please do so, as this current hack solution (putting the absolute path // to the jar files in your eclipse.ini) means you can't move your eclipse around on linux without lombok // breaking it. NB: rerunning lombok.jar installer and hitting 'update' will fix it if you do that. - boolean fullPathRequired = IdeFinder.getOS() == EclipseFinder.OS.UNIX || System.getProperty("lombok.installer.fullpath") != null; + boolean fullPathRequired = OsUtils.getOS() == OsUtils.OS.UNIX || System.getProperty("lombok.installer.fullpath") != null; boolean installSucceeded = false; StringBuilder newContents = new StringBuilder(); @@ -303,7 +298,7 @@ public class EclipseLocation extends IdeLocation { "I can't read my own jar file. I think you've found a bug in this installer!\nI suggest you restart it " + "and use the 'what do I do' link, to manually install lombok. Also, tell us about this at:\n" + "http://groups.google.com/group/project-lombok - Thanks!", e); - throw new InstallException("I can't write to your " + getTypeName() + " directory at " + name + generateWriteErrorMessage(), e); + throw new InstallException("I can't write to your " + descriptor.getProductName() + " directory at " + name + generateWriteErrorMessage(), e); } } @@ -369,14 +364,14 @@ public class EclipseLocation extends IdeLocation { } if (!installSucceeded) { - throw new InstallException("I can't find the " + getIniFileName() + " file. Is this a real " + getTypeName() + " installation?", null); + throw new InstallException("I can't find the " + descriptor.getIniFileName() + " file. Is this a real " + descriptor.getProductName() + " installation?", null); } - return "If you start " + getTypeName() + " with a custom -vm parameter, you'll need to add:<br>" + + return "If you start " + descriptor.getProductName() + " with a custom -vm parameter, you'll need to add:<br>" + "<code>-vmargs -javaagent:lombok.jar</code><br>as parameter as well."; } @Override public URL getIdeIcon() { - return EclipseLocation.class.getResource("eclipse.png"); + return descriptor.getIdeIcon(); } } diff --git a/src/installer/lombok/installer/eclipse/EclipseFinder.java b/src/installer/lombok/installer/eclipse/EclipseProductLocationProvider.java index 8a1a689a..3710d7d9 100644 --- a/src/installer/lombok/installer/eclipse/EclipseFinder.java +++ b/src/installer/lombok/installer/eclipse/EclipseProductLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,109 +22,130 @@ package lombok.installer.eclipse; import static java.util.Arrays.asList; +import static lombok.installer.IdeLocation.canonical; import java.io.File; +import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.regex.Pattern; -import lombok.installer.IdeFinder; -import lombok.installer.IdeLocation; import lombok.installer.CorruptedIdeLocationException; +import lombok.installer.OsUtils; +import lombok.installer.IdeLocation; +import lombok.installer.IdeLocationProvider; -import org.mangosdk.spi.ProviderFor; +public class EclipseProductLocationProvider implements IdeLocationProvider { + private final EclipseProductDescriptor descriptor; -@ProviderFor(IdeFinder.class) -public class EclipseFinder extends IdeFinder { - /** should be lowercase! */ - protected String getDirName() { - return "eclipse"; - } - - protected String getWindowsExecutableName() { - return "eclipse.exe"; - } - - protected String getUnixExecutableName() { - return "eclipse"; - } - - protected String getMacExecutableName() { - return "Eclipse.app"; + EclipseProductLocationProvider(EclipseProductDescriptor descriptor) { + this.descriptor = descriptor; } - protected IdeLocation createLocation(String guess) throws CorruptedIdeLocationException { - return new EclipseLocationProvider().create0(guess); - } - - protected List<String> getSourceDirsOnWindows() { - return Arrays.asList("\\", "\\Program Files", "\\Program Files (x86)", System.getProperty("user.home", ".")); + @Override public final IdeLocation create(String path) throws CorruptedIdeLocationException { + return create0(path); } /** - * Returns a list of paths of Eclipse installations. + * Create a new EclipseLocation by pointing at either the directory contains the Eclipse executable, or the executable itself, + * or an eclipse.ini file. * - * The search process works by scanning for each 'source dir' for either an eclipse installation or a folder containing the text returned - * by getDirName(). If such a folder is found, this process is applied recursively. On windows, this process is run on each drive letter - * which represents a physical hard disk. If the native windows API call to determine these drive letters fails, only 'C:' is checked. + * @throws NotAnIdeLocationException + * If this isn't an Eclipse executable or a directory with an + * Eclipse executable. */ - private List<String> getSourceDirsOnWindowsWithDriveLetters() { - List<String> driveLetters = asList("C"); - try { - driveLetters = getDrivesOnWindows(); - } catch (Throwable ignore) { - ignore.printStackTrace(); + private IdeLocation create0(String path) throws CorruptedIdeLocationException { + if (path == null) throw new NullPointerException("path"); + String iniName = descriptor.getIniFileName(); + File p = new File(path); + + if (!p.exists()) return null; + if (p.isDirectory()) { + for (String possibleExeName : descriptor.getExecutableNames()) { + File f = new File(p, possibleExeName); + if (f.exists()) return findEclipseIniFromExe(f, 0); + } + + File f = new File(p, iniName); + if (f.exists()) return makeLocation(canonical(p), f); } - List<String> sourceDirs = new ArrayList<String>(); - for (String letter : driveLetters) { - for (String possibleSource : getSourceDirsOnWindows()) { - if (!isDriveSpecificOnWindows(possibleSource)) { - sourceDirs.add(letter + ":" + possibleSource); - } + + if (p.isFile()) { + if (p.getName().equalsIgnoreCase(iniName)) { + return makeLocation(canonical(p.getParentFile()), p); } } - for (String possibleSource : getSourceDirsOnWindows()) { - if (isDriveSpecificOnWindows(possibleSource)) sourceDirs.add(possibleSource); + + if (descriptor.getExecutableNames().contains(p.getName().toLowerCase())) { + return findEclipseIniFromExe(p, 0); } - return sourceDirs; + return null; } - public boolean isDriveSpecificOnWindows(String path) { - return path.length() > 1 && path.charAt(1) == ':'; - } - - protected List<String> getSourceDirsOnMac() { - return Arrays.asList("/Applications", System.getProperty("user.home", ".")); - } - - protected List<String> getSourceDirsOnUnix() { - return Arrays.asList(System.getProperty("user.home", ".")); - } - - private List<File> transformToFiles(List<String> fileNames) { - List<File> files = new ArrayList<File>(); - for (String fileName : fileNames) { - files.add(new File(fileName)); + private IdeLocation findEclipseIniFromExe(File exePath, int loopCounter) throws CorruptedIdeLocationException { + String iniName = descriptor.getIniFileName(); + /* Try looking for eclipse.ini as sibling to the executable */ { + File ini = new File(exePath.getParentFile(), iniName); + if (ini.isFile()) return makeLocation(canonical(exePath), ini); } - return files; + + String macAppName = descriptor.getMacAppName(); + /* Try looking for Eclipse.app/Contents/MacOS/eclipse.ini as sibling to executable; this works on Mac OS X. */ { + File ini = new File(exePath.getParentFile(), macAppName + "/Contents/MacOS/" + iniName); + if (ini.isFile()) return makeLocation(canonical(exePath), ini); + } + + /* Starting with Eclipse Mars (with the oomph installer), the structure has changed, and it's now at Eclipse.app/Contents/Eclipse/eclipse.ini*/ { + File ini = new File(exePath.getParentFile(), macAppName + "/Contents/Eclipse/" + iniName); + if (ini.isFile()) return makeLocation(canonical(exePath), ini); + } + + /* If executable is a soft link, follow it and retry. */ { + if (loopCounter < 50) { + try { + String oPath = exePath.getAbsolutePath(); + String nPath = exePath.getCanonicalPath(); + if (!oPath.equals(nPath)) try { + IdeLocation loc = findEclipseIniFromExe(new File(nPath), loopCounter + 1); + if (loc != null) return loc; + } catch (CorruptedIdeLocationException ignore) { + // Unlinking didn't help find an eclipse, so continue. + } + } catch (IOException ignore) { /* okay, that didn't work, assume it isn't a soft link then. */ } + } + } + + /* If executable is a linux LSB-style path, then look in the usual places that package managers like apt-get use.*/ { + String path = exePath.getAbsolutePath(); + try { + path = exePath.getCanonicalPath(); + } catch (IOException ignore) { /* We'll stick with getAbsolutePath()'s result then. */ } + + String unixAppName = descriptor.getUnixAppName(); + if (path.equals("/usr/bin/" + unixAppName) || path.equals("/bin/" + unixAppName) || path.equals("/usr/local/bin/" + unixAppName)) { + File ini = new File("/usr/lib/" + unixAppName + "/" + iniName); + if (ini.isFile()) return makeLocation(path, ini); + ini = new File("/usr/local/lib/" + unixAppName + "/" + iniName); + if (ini.isFile()) return makeLocation(path, ini); + ini = new File("/usr/local/etc/" + unixAppName + "/" + iniName); + if (ini.isFile()) return makeLocation(path, ini); + ini = new File("/etc/" + iniName); + if (ini.isFile()) return makeLocation(path, ini); + } + } + + /* If we get this far, we lose. */ + return null; } - private List<File> getFlatSourceLocationsOnUnix() { - List<File> dirs = new ArrayList<File>(); - dirs.add(new File("/usr/bin/")); - dirs.add(new File("/usr/local/bin/")); - dirs.add(new File(System.getProperty("user.home", "."), "bin/")); - return dirs; + private IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException { + return new EclipseProductLocation(descriptor, name, ini); } - private List<File> getNestedSourceLocationOnUnix() { - List<File> dirs = new ArrayList<File>(); - dirs.add(new File("/usr/local/share")); - dirs.add(new File("/usr/local")); - dirs.add(new File("/usr/share")); - return dirs; + @Override public Pattern getLocationSelectors() { + return descriptor.getLocationSelectors(); } /** @@ -141,7 +162,7 @@ public class EclipseFinder extends IdeFinder { */ @Override public void findIdes(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems) { - switch (getOS()) { + switch (OsUtils.getOS()) { case WINDOWS: new WindowsFinder().findEclipse(locations, problems); break; @@ -155,17 +176,74 @@ public class EclipseFinder extends IdeFinder { } } + private List<File> transformToFiles(List<String> fileNames) { + List<File> files = new ArrayList<File>(); + for (String fileName : fileNames) { + files.add(new File(fileName)); + } + return files; + } + + private List<File> getFlatSourceLocationsOnUnix() { + List<File> dirs = new ArrayList<File>(); + dirs.add(new File("/usr/bin/")); + dirs.add(new File("/usr/local/bin/")); + dirs.add(new File(System.getProperty("user.home", "."), "bin/")); + return dirs; + } + + private List<File> getNestedSourceLocationOnUnix() { + List<File> dirs = new ArrayList<File>(); + dirs.add(new File("/usr/local/share")); + dirs.add(new File("/usr/local")); + dirs.add(new File("/usr/share")); + return dirs; + } + private class UnixFinder extends DirectoryFinder { UnixFinder() { super(getNestedSourceLocationOnUnix(), getFlatSourceLocationsOnUnix()); } @Override protected String findEclipseOnPlatform(File dir) { - File possible = new File(dir, getUnixExecutableName()); + File possible = new File(dir, descriptor.getUnixAppName()); return (possible.exists()) ? possible.getAbsolutePath() : null; } } + /** + * Returns a list of paths of Eclipse installations. + * + * The search process works by scanning for each 'source dir' for either an eclipse installation or a folder containing the text returned + * by getDirName(). If such a folder is found, this process is applied recursively. On windows, this process is run on each drive letter + * which represents a physical hard disk. If the native windows API call to determine these drive letters fails, only 'C:' is checked. + */ + private List<String> getSourceDirsOnWindowsWithDriveLetters() { + List<String> driveLetters = asList("C"); + try { + driveLetters = OsUtils.getDrivesOnWindows(); + } catch (Throwable ignore) { + ignore.printStackTrace(); + } + List<String> sourceDirs = new ArrayList<String>(); + for (String letter : driveLetters) { + for (String possibleSource : descriptor.getSourceDirsOnWindows()) { + if (!isDriveSpecificOnWindows(possibleSource)) { + sourceDirs.add(letter + ":" + possibleSource); + } + } + } + for (String possibleSource : descriptor.getSourceDirsOnWindows()) { + if (isDriveSpecificOnWindows(possibleSource)) sourceDirs.add(possibleSource); + } + + return sourceDirs; + } + + private boolean isDriveSpecificOnWindows(String path) { + return path.length() > 1 && path.charAt(1) == ':'; + } + private class WindowsFinder extends DirectoryFinder { WindowsFinder() { super(transformToFiles(getSourceDirsOnWindowsWithDriveLetters()), Collections.<File>emptyList()); @@ -174,20 +252,20 @@ public class EclipseFinder extends IdeFinder { /** Checks if the provided directory contains 'eclipse.exe', and if so, returns the directory, otherwise null. */ @Override protected String findEclipseOnPlatform(File dir) { - File possible = new File(dir, getWindowsExecutableName()); + File possible = new File(dir, descriptor.getWindowsExecutableName()); return (possible.isFile()) ? dir.getAbsolutePath() : null; } } private class MacFinder extends DirectoryFinder { MacFinder() { - super(transformToFiles(getSourceDirsOnMac()), Collections.<File>emptyList()); + super(transformToFiles(descriptor.getSourceDirsOnMac()), Collections.<File>emptyList()); } protected String findEclipseOnPlatform(File dir) { - if (dir.getName().toLowerCase().equals(getMacExecutableName().toLowerCase())) return dir.getParent(); - if (dir.getName().toLowerCase().contains(getDirName())) { - if (new File(dir, getMacExecutableName()).exists()) return dir.toString(); + if (dir.getName().toLowerCase().equals(descriptor.getMacAppName().toLowerCase())) return dir.getParent(); + if (dir.getName().toLowerCase().contains(descriptor.getDirectoryName())) { + if (new File(dir, descriptor.getMacAppName()).exists()) return dir.toString(); } return null; } @@ -202,14 +280,14 @@ public class EclipseFinder extends IdeFinder { this.flatSourceDirs = flatSourceDirs; } - public void findEclipse(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems) { + void findEclipse(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems) { for (File dir : nestedSourceDirs) recurseDirectory(locations, problems, dir); for (File dir : flatSourceDirs) findEclipse(locations, problems, dir); } - protected abstract String findEclipseOnPlatform(File dir); + abstract String findEclipseOnPlatform(File dir); - protected void recurseDirectory(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems, File dir) { + void recurseDirectory(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems, File dir) { recurseDirectory0(locations, problems, dir, 0); } @@ -223,19 +301,19 @@ public class EclipseFinder extends IdeFinder { for (File dir : listFiles) { if (!dir.isDirectory()) continue; try { - if (dir.getName().toLowerCase().contains(getDirName())) { + if (dir.getName().toLowerCase().contains(descriptor.getDirectoryName())) { findEclipse(locations, problems, dir); if (loopCounter < 50) recurseDirectory0(locations, problems, dir, loopCounter + 1); } } catch (Exception ignore) {} } } - + private void findEclipse(List<IdeLocation> locations, List<CorruptedIdeLocationException> problems, File dir) { String eclipseLocation = findEclipseOnPlatform(dir); if (eclipseLocation != null) { try { - IdeLocation newLocation = createLocation(eclipseLocation); + IdeLocation newLocation = create(eclipseLocation); if (newLocation != null) locations.add(newLocation); } catch (CorruptedIdeLocationException e) { problems.add(e); diff --git a/src/installer/lombok/installer/eclipse/JbdsFinder.java b/src/installer/lombok/installer/eclipse/JbdsFinder.java deleted file mode 100644 index 2dfaacba..00000000 --- a/src/installer/lombok/installer/eclipse/JbdsFinder.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2013 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.installer.eclipse; - -import java.util.Arrays; -import java.util.List; - -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder; -import lombok.installer.IdeLocation; - -import org.mangosdk.spi.ProviderFor; - -/** - * JBDS (JBoss Developer Studio) is an eclipse variant. - * Other than different executable names, it's the same as eclipse, as far as lombok support goes. - */ -@ProviderFor(IdeFinder.class) -public class JbdsFinder extends EclipseFinder { - @Override protected IdeLocation createLocation(String guess) throws CorruptedIdeLocationException { - return new JbdsLocationProvider().create0(guess); - } - - @Override protected String getDirName() { - return "studio"; - } - - @Override protected String getMacExecutableName() { - return "jbdevstudio.app"; - } - - @Override protected String getUnixExecutableName() { - return "jbdevstudio"; - } - - @Override protected String getWindowsExecutableName() { - return "jbdevstudio.exe"; - } - - @Override protected List<String> getSourceDirsOnWindows() { - return Arrays.asList("\\", "\\Program Files", "\\Program Files (x86)", System.getProperty("user.home", ".")); - } - - @Override protected List<String> getSourceDirsOnMac() { - return Arrays.asList("/Applications", System.getProperty("user.home", ".")); - } - - @Override protected List<String> getSourceDirsOnUnix() { - return Arrays.asList(System.getProperty("user.home", ".")); - } -} diff --git a/src/installer/lombok/installer/eclipse/JbdsLocationProvider.java b/src/installer/lombok/installer/eclipse/JbdsLocationProvider.java index e6df0e43..635f304a 100644 --- a/src/installer/lombok/installer/eclipse/JbdsLocationProvider.java +++ b/src/installer/lombok/installer/eclipse/JbdsLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 The Project Lombok Authors. + * Copyright (C) 2013-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,49 +21,24 @@ */ package lombok.installer.eclipse; -import java.io.File; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; +import java.util.Collections; -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeLocation; import lombok.installer.IdeLocationProvider; -import lombok.installer.IdeFinder.OS; import org.mangosdk.spi.ProviderFor; @ProviderFor(IdeLocationProvider.class) -public class JbdsLocationProvider extends EclipseLocationProvider { - @Override protected List<String> getEclipseExecutableNames() { - return Arrays.asList("jbdevstudio.app", "jbdevstudio.exe", "jbdevstudioc.exe", "jbdevstudio"); - } - - @Override protected String getIniName() { - return "jbdevstudio.ini"; - } - - @Override protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException { - return new JbdsLocation(name, ini); - } - - @Override protected String getMacAppName() { - return "jbdevstudio.app"; - } +public class JbdsLocationProvider extends EclipseProductLocationProvider { - @Override protected String getUnixAppName() { - return "jbdevstudio"; - } + private static final EclipseProductDescriptor JBDS = new StandardProductDescriptor( + "JBoss Developer Studio", + "jbdevstudio", + "studio", + JbdsLocationProvider.class.getResource("jbds.png"), + Collections.<String>emptySet() + ); - @Override public Pattern getLocationSelectors(OS os) { - switch (os) { - case MAC_OS_X: - return Pattern.compile("^(jbdevstudio|jbdevstudio\\.ini|jbdevstudio\\.app)$", Pattern.CASE_INSENSITIVE); - case WINDOWS: - return Pattern.compile("^(jbdevstudioc?\\.exe|jbdevstudio\\.ini)$", Pattern.CASE_INSENSITIVE); - default: - case UNIX: - return Pattern.compile("^(jbdevstudio|jbdevstudio\\.ini)$", Pattern.CASE_INSENSITIVE); - } + public JbdsLocationProvider() { + super(JBDS); } } diff --git a/src/installer/lombok/installer/eclipse/JbdsLocation.java b/src/installer/lombok/installer/eclipse/MyEclipseLocationProvider.java index 81fb5261..298cabd6 100644 --- a/src/installer/lombok/installer/eclipse/JbdsLocation.java +++ b/src/installer/lombok/installer/eclipse/MyEclipseLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 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,24 @@ */ package lombok.installer.eclipse; -import java.io.File; -import java.net.URL; +import java.util.Collections; -import lombok.installer.CorruptedIdeLocationException; +import lombok.installer.IdeLocationProvider; -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"); - } +import org.mangosdk.spi.ProviderFor; + +@ProviderFor(IdeLocationProvider.class) +public class MyEclipseLocationProvider extends EclipseProductLocationProvider { - @Override protected String getIniFileName() { - return "jbdevstudio.ini"; - } + private static final EclipseProductDescriptor MY_ECLIPSE = new StandardProductDescriptor( + "MyEclipse", + "myeclipse", + "myeclipse", + MyEclipseLocationProvider.class.getResource("myeclipse.png"), + Collections.<String>emptySet() + ); - @Override protected String getTypeName() { - return "JBoss Developer Studio"; + public MyEclipseLocationProvider() { + super(MY_ECLIPSE); } } diff --git a/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java b/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java new file mode 100644 index 00000000..5e1d303d --- /dev/null +++ b/src/installer/lombok/installer/eclipse/RhdsLocationProvider.java @@ -0,0 +1,44 @@ +/* + * 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 + * 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.Collections; + +import lombok.installer.IdeLocationProvider; + +import org.mangosdk.spi.ProviderFor; + +@ProviderFor(IdeLocationProvider.class) +public class RhdsLocationProvider extends EclipseProductLocationProvider { + + private static final EclipseProductDescriptor RHDS = new StandardProductDescriptor( + "Red Hat JBoss Developer Studio", + "devstudio", + "studio", + RhdsLocationProvider.class.getResource("rhds.png"), + Collections.<String>emptySet() + ); + + public RhdsLocationProvider() { + super(RHDS); + } +} diff --git a/src/installer/lombok/installer/eclipse/STSFinder.java b/src/installer/lombok/installer/eclipse/STSFinder.java deleted file mode 100644 index 82bc9b80..00000000 --- a/src/installer/lombok/installer/eclipse/STSFinder.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2009 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.installer.eclipse; - -import java.util.Arrays; -import java.util.List; - -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeFinder; -import lombok.installer.IdeLocation; - -import org.mangosdk.spi.ProviderFor; - -/** - * STS (Springsource Tool Suite) is an eclipse variant. - * Other than different executable names, it's the same as eclipse, as far as lombok support goes. - */ -@ProviderFor(IdeFinder.class) -public class STSFinder extends EclipseFinder { - @Override protected IdeLocation createLocation(String guess) throws CorruptedIdeLocationException { - return new STSLocationProvider().create0(guess); - } - - @Override protected String getDirName() { - return "sts"; - } - - @Override protected String getMacExecutableName() { - return "STS.app"; - } - - @Override protected String getUnixExecutableName() { - return "STS"; - } - - @Override protected String getWindowsExecutableName() { - return "STS.exe"; - } - - @Override protected List<String> getSourceDirsOnWindows() { - return Arrays.asList("\\", "\\springsource", "\\Program Files", "\\Program Files (x86)", "\\Program Files\\springsource", "\\Program Files (x86)\\springsource", System.getProperty("user.home", "."), System.getProperty("user.home", ".") + "\\springsource"); - } - - @Override protected List<String> getSourceDirsOnMac() { - return Arrays.asList("/Applications", "/Applications/springsource", System.getProperty("user.home", "."), System.getProperty("user.home", ".") + "/springsource"); - } - - @Override protected List<String> getSourceDirsOnUnix() { - return Arrays.asList(System.getProperty("user.home", "."), System.getProperty("user.home", ".") + "/springsource"); - } -} diff --git a/src/installer/lombok/installer/eclipse/STSLocationProvider.java b/src/installer/lombok/installer/eclipse/STSLocationProvider.java index 7d129838..d2efb956 100644 --- a/src/installer/lombok/installer/eclipse/STSLocationProvider.java +++ b/src/installer/lombok/installer/eclipse/STSLocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 The Project Lombok Authors. + * Copyright (C) 2009-2016 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,49 +21,23 @@ */ package lombok.installer.eclipse; -import java.io.File; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; +import java.util.Collections; -import lombok.installer.CorruptedIdeLocationException; -import lombok.installer.IdeLocation; import lombok.installer.IdeLocationProvider; -import lombok.installer.IdeFinder.OS; import org.mangosdk.spi.ProviderFor; @ProviderFor(IdeLocationProvider.class) -public class STSLocationProvider extends EclipseLocationProvider { - @Override protected List<String> getEclipseExecutableNames() { - return Arrays.asList("sts.app", "sts.exe", "stsc.exe", "sts"); - } - - @Override protected String getIniName() { - return "STS.ini"; - } - - @Override protected IdeLocation makeLocation(String name, File ini) throws CorruptedIdeLocationException { - return new STSLocation(name, ini); - } - - @Override protected String getMacAppName() { - return "STS.app"; - } +public class STSLocationProvider extends EclipseProductLocationProvider { - @Override protected String getUnixAppName() { - return "STS"; - } + private static final EclipseProductDescriptor STS = new StandardProductDescriptor("STS", + "STS", + "sts", + STSLocationProvider.class.getResource("STS.png"), + Collections.singleton("springsource") + ); - @Override public Pattern getLocationSelectors(OS os) { - switch (os) { - case MAC_OS_X: - return Pattern.compile("^(sts|sts\\.ini|sts\\.app)$", Pattern.CASE_INSENSITIVE); - case WINDOWS: - return Pattern.compile("^(stsc?\\.exe|sts\\.ini)$", Pattern.CASE_INSENSITIVE); - default: - case UNIX: - return Pattern.compile("^(sts|sts\\.ini)$", Pattern.CASE_INSENSITIVE); - } + public STSLocationProvider() { + super(STS); } } diff --git a/src/installer/lombok/installer/eclipse/StandardProductDescriptor.java b/src/installer/lombok/installer/eclipse/StandardProductDescriptor.java new file mode 100644 index 00000000..47e103aa --- /dev/null +++ b/src/installer/lombok/installer/eclipse/StandardProductDescriptor.java @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2016 The Project Lombok Authors. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok.installer.eclipse; + +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.regex.Pattern; + +import lombok.installer.OsUtils; + +public class StandardProductDescriptor implements EclipseProductDescriptor { + + private static final String USER_HOME = System.getProperty("user.home", "."); + private static final String[] WINDOWS_ROOTS = {"\\", "\\Program Files", "\\Program Files (x86)", USER_HOME}; + private static final String[] MAC_ROOTS = {"/Applications", USER_HOME}; + private static final String[] UNIX_ROOTS = {USER_HOME}; + + private final String productName; + private final String windowsName; + private final String unixName; + private final String macAppName; + private final List<String> executableNames; + private final List<String> sourceDirsOnWindows; + private final List<String> sourceDirsOnMac; + private final List<String> sourceDirsOnUnix; + private final String iniFileName; + private final Pattern locationSelectors; + private final String directoryName; + private final URL ideIcon; + + public StandardProductDescriptor(String productName, String baseName, String directoryName, URL ideIcon, Collection<String> alternativeDirectoryNames) { + this.productName = productName; + this.windowsName = baseName + ".exe"; + this.unixName = baseName; + this.macAppName = baseName + ".app"; + this.executableNames = executableNames(baseName); + this.sourceDirsOnWindows = generateAlternatives(WINDOWS_ROOTS, "\\", alternativeDirectoryNames); + this.sourceDirsOnMac = generateAlternatives(MAC_ROOTS, "/", alternativeDirectoryNames); + this.sourceDirsOnUnix = generateAlternatives(UNIX_ROOTS, "/", alternativeDirectoryNames); + this.iniFileName = baseName + ".ini"; + this.locationSelectors = getLocationSelectors(baseName); + this.directoryName = directoryName.toLowerCase(); + this.ideIcon = ideIcon; + } + + @Override public String getProductName() { + return productName; + } + + @Override public String getWindowsExecutableName() { + return windowsName; + } + + @Override public String getUnixAppName() { + return unixName; + } + + @Override public String getMacAppName() { + return macAppName; + } + + @Override public String getDirectoryName() { + return directoryName; + } + + @Override public List<String> getExecutableNames() { + return executableNames; + } + + @Override public List<String> getSourceDirsOnWindows() { + return sourceDirsOnWindows; + } + + @Override public List<String> getSourceDirsOnMac() { + return sourceDirsOnMac; + } + + @Override public List<String> getSourceDirsOnUnix() { + return sourceDirsOnUnix; + } + + @Override public String getIniFileName() { + return iniFileName; + } + + @Override public Pattern getLocationSelectors() { + return locationSelectors; + } + + @Override public URL getIdeIcon() { + return ideIcon; + } + + private static Pattern getLocationSelectors(String baseName) { + return Pattern.compile(String.format(platformPattern(), baseName.toLowerCase()), Pattern.CASE_INSENSITIVE); + } + + private static String platformPattern() { + switch (OsUtils.getOS()) { + case MAC_OS_X: + return "^(%s|%<s\\.ini|%<s\\.app)$"; + case WINDOWS: + return "^(%sc?\\.exe|%<s\\.ini)$"; + default: + case UNIX: + return "^(%s|%<s\\.ini)$"; + } + } + + private static List<String> executableNames(String baseName) { + String base = baseName.toLowerCase(); + return Collections.unmodifiableList(Arrays.asList(base, base + ".app", base + ".exe", base + "c.exe")); + } + + private static List<String> generateAlternatives(String[] roots, String pathSeparator, Collection<String> alternatives) { + List<String> result = new ArrayList<String>(); + for (String root : roots) { + result.add(concat(root, pathSeparator, "")); + for (String alternative : alternatives) { + result.add(concat(root, pathSeparator, alternative)); + } + } + return Collections.unmodifiableList(result); + } + + private static String concat(String base, String pathSeparator, String alternative) { + if (alternative.isEmpty()) { + return base; + } + if (base.endsWith(pathSeparator)) { + return base + alternative.replaceAll("[\\/]", "\\" + pathSeparator); + } + return base + pathSeparator + alternative.replaceAll("[\\/]", "\\" + pathSeparator); + } +} diff --git a/src/installer/lombok/installer/eclipse/myeclipse.png b/src/installer/lombok/installer/eclipse/myeclipse.png Binary files differnew file mode 100644 index 00000000..49c4fab3 --- /dev/null +++ b/src/installer/lombok/installer/eclipse/myeclipse.png diff --git a/src/installer/lombok/installer/eclipse/rhds.png b/src/installer/lombok/installer/eclipse/rhds.png Binary files differnew file mode 100644 index 00000000..ca7738e6 --- /dev/null +++ b/src/installer/lombok/installer/eclipse/rhds.png diff --git a/src/launch/lombok/launch/AnnotationProcessor.java b/src/launch/lombok/launch/AnnotationProcessor.java index 35c26b7c..93fba196 100644 --- a/src/launch/lombok/launch/AnnotationProcessor.java +++ b/src/launch/lombok/launch/AnnotationProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 The Project Lombok Authors. + * Copyright (C) 2014-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 @@ -27,6 +27,7 @@ import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Completion; import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; import javax.lang.model.SourceVersion; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; @@ -74,4 +75,15 @@ class AnnotationProcessorHider { } } } + + @SupportedAnnotationTypes("lombok.*") + public static class ClaimingProcessor extends AbstractProcessor { + @Override public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { + return true; + } + + @Override public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latest(); + } + } } diff --git a/test/configuration/resource/configurationRoot/out.txt b/test/configuration/resource/configurationRoot/out.txt index de219694..8100fadb 100644 --- a/test/configuration/resource/configurationRoot/out.txt +++ b/test/configuration/resource/configurationRoot/out.txt @@ -6,7 +6,7 @@ lombok.accessors.flagUsage = ERROR # <'lombok.accessors.flagUsage' not mentioned> # # BASE/d1/d11/lombok.config: -# 3: lombok.accessors.flagUsage = ERROR +# 4: lombok.accessors.flagUsage = ERROR # Generate setters that return 'this' instead of 'void' (default: false). lombok.accessors.chain = false @@ -14,7 +14,7 @@ lombok.accessors.chain = false # <'lombok.accessors.chain' not mentioned> # # BASE/d1/d11/lombok.config: -# 2: lombok.accessors.chain = false +# 3: lombok.accessors.chain = false # Strip this field prefix, like 'f' or 'm_', from the names of generated getters and setters. lombok.accessors.prefix += f @@ -22,7 +22,7 @@ lombok.accessors.prefix += f # <'lombok.accessors.prefix' not mentioned> # # BASE/d1/d11/lombok.config: -# 4: lombok.accessors.prefix += f +# 5: lombok.accessors.prefix += f # Use this name for the generated logger fields (default: 'log'). clear lombok.log.fieldName @@ -38,7 +38,7 @@ lombok.accessors.flagUsage = ERROR # <'lombok.accessors.flagUsage' not mentioned> # # BASE/d1/d11/lombok.config: -# 3: lombok.accessors.flagUsage = ERROR +# 4: lombok.accessors.flagUsage = ERROR # # BASE/d1/d11/d111/lombok.config: # <'lombok.accessors.flagUsage' not mentioned> @@ -49,7 +49,7 @@ clear lombok.accessors.chain # <'lombok.accessors.chain' not mentioned> # # BASE/d1/d11/lombok.config: -# 2: lombok.accessors.chain = false +# 3: lombok.accessors.chain = false # # BASE/d1/d11/d111/lombok.config: # 1: clear lombok.accessors.chain @@ -61,7 +61,7 @@ lombok.accessors.prefix += m_ # <'lombok.accessors.prefix' not mentioned> # # BASE/d1/d11/lombok.config: -# 4: lombok.accessors.prefix += f +# 5: lombok.accessors.prefix += f # # BASE/d1/d11/d111/lombok.config: # 2: lombok.accessors.prefix += m_ @@ -81,7 +81,7 @@ lombok.accessors.chain = true # <'lombok.accessors.chain' not mentioned> # # BASE/d1/d12/lombok.config: -# 2: lombok.accessors.chain = true +# 3: lombok.accessors.chain = true # Strip this field prefix, like 'f' or 'm_', from the names of generated getters and setters. clear lombok.accessors.prefix diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java index f564d0dc..d044a39f 100644 --- a/test/core/src/lombok/AbstractRunTests.java +++ b/test/core/src/lombok/AbstractRunTests.java @@ -57,10 +57,16 @@ public abstract class AbstractRunTests { public final FileTester createTester(final DirectoryRunner.TestParams params, final File file) throws IOException { ConfigurationKeysLoader.LoaderLoader.loadAllConfigurationKeys(); - final LombokTestSource sourceDirectives = LombokTestSource.readDirectives(file); - if (sourceDirectives.isIgnore()) return null; - if (!sourceDirectives.versionWithinLimit(params.getVersion())) return null; - if (!sourceDirectives.versionWithinLimit(getClasspathVersion())) return null; + AssertionError directiveFailure = null; + LombokTestSource sourceDirectives = null; + try { + sourceDirectives = LombokTestSource.readDirectives(file); + if (sourceDirectives.isIgnore()) return null; + if (!sourceDirectives.versionWithinLimit(params.getVersion())) return null; + if (!sourceDirectives.versionWithinLimit(getClasspathVersion())) return null; + } catch (AssertionError ae) { + directiveFailure = ae; + } String fileName = file.getName(); final LombokTestSource expected = LombokTestSource.read(params.getAfterDirectory(), params.getMessagesDirectory(), fileName); @@ -68,23 +74,26 @@ public abstract class AbstractRunTests { if (expected.isIgnore()) return null; if (!expected.versionWithinLimit(params.getVersion())) return null; + final LombokTestSource sourceDirectives_ = sourceDirectives; + final AssertionError directiveFailure_ = directiveFailure; return new FileTester() { @Override public void runTest() throws Throwable { + if (directiveFailure_ != null) throw directiveFailure_; LinkedHashSet<CompilerMessage> messages = new LinkedHashSet<CompilerMessage>(); StringWriter writer = new StringWriter(); LombokConfiguration.overrideConfigurationResolverFactory(new ConfigurationResolverFactory() { @Override public ConfigurationResolver createResolver(AST<?, ?, ?> ast) { - return sourceDirectives.getConfiguration(); + return sourceDirectives_.getConfiguration(); } }); - boolean changed = transformCode(messages, writer, file, sourceDirectives.getSpecifiedEncoding(), sourceDirectives.getFormatPreferences()); - boolean forceUnchanged = sourceDirectives.forceUnchanged() || sourceDirectives.isSkipCompareContent(); + boolean changed = transformCode(messages, writer, file, sourceDirectives_.getSpecifiedEncoding(), sourceDirectives_.getFormatPreferences()); + boolean forceUnchanged = sourceDirectives_.forceUnchanged() || sourceDirectives_.isSkipCompareContent(); if (params.expectChanges() && !forceUnchanged && !changed) messages.add(new CompilerMessage(-1, -1, true, "not flagged modified")); if (!params.expectChanges() && changed) messages.add(new CompilerMessage(-1, -1, true, "unexpected modification")); - compare(file.getName(), expected, writer.toString(), messages, params.printErrors(), sourceDirectives.isSkipCompareContent() || expected.isSkipCompareContent()); + compare(file.getName(), expected, writer.toString(), messages, params.printErrors(), sourceDirectives_.isSkipCompareContent() || expected.isSkipCompareContent()); } }; } diff --git a/test/core/src/lombok/LombokTestSource.java b/test/core/src/lombok/LombokTestSource.java index cd7cd166..16f9f49f 100644 --- a/test/core/src/lombok/LombokTestSource.java +++ b/test/core/src/lombok/LombokTestSource.java @@ -130,7 +130,7 @@ public class LombokTestSource { private static final Pattern IGNORE_PATTERN = Pattern.compile("^\\s*ignore\\s*(?:[-:].*)?$", Pattern.CASE_INSENSITIVE); private static final Pattern UNCHANGED_PATTERN = Pattern.compile("^\\s*unchanged\\s*(?:[-:].*)?$", Pattern.CASE_INSENSITIVE); - private static final Pattern SKIP_COMPARE_CONTENT_PATTERN = Pattern.compile("^\\s*skip[- ]?compare[- ]?content\\s*(?:[-:].*)?$", Pattern.CASE_INSENSITIVE); + private static final Pattern SKIP_COMPARE_CONTENT_PATTERN = Pattern.compile("^\\s*skip[- ]?compare[- ]?contents?\\s*(?:[-:].*)?$", Pattern.CASE_INSENSITIVE); private LombokTestSource(File file, String content, List<CompilerMessageMatcher> messages, List<String> directives) { this.file = file; diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java index 75200223..3f2698bb 100644 --- a/test/core/src/lombok/RunTestsViaEcj.java +++ b/test/core/src/lombok/RunTestsViaEcj.java @@ -144,6 +144,7 @@ public class RunTestsViaEcj extends AbstractRunTests { classpath.add("lib/test/org.slf4j-slf4j-ext.jar"); classpath.add("lib/test/log4j-log4j.jar"); classpath.add("lib/test/org.apache.logging.log4j-log4j-api.jar"); + classpath.add("lib/test/org.jboss.logging-jboss-logging.jar"); classpath.add("lib/test/com.google.guava-guava.jar"); classpath.add("lib/test/com.google.code.findbugs-findbugs.jar"); return new FileSystem(classpath.toArray(new String[0]), new String[] {file.getAbsolutePath()}, "UTF-8"); diff --git a/test/pretty/resource/after/ForLoop.java b/test/pretty/resource/after/ForLoop.java index 615f6e8a..f3b1bf4e 100644 --- a/test/pretty/resource/after/ForLoop.java +++ b/test/pretty/resource/after/ForLoop.java @@ -8,4 +8,11 @@ public class ForLoop { } // after loop } + + { + int i; + for (i = 0; i < 10; i++) { + System.out.println(i); + } + } } diff --git a/test/pretty/resource/before/ForLoop.java b/test/pretty/resource/before/ForLoop.java index 2bed7f9b..8a58cbf2 100644 --- a/test/pretty/resource/before/ForLoop.java +++ b/test/pretty/resource/before/ForLoop.java @@ -9,4 +9,11 @@ public class ForLoop { } // after loop } + + { + int i; + for (i = 0; i < 10; i++) { + System.out.println(i); + } + } } diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java index a04ea171..8dee33ad 100644 --- a/test/transform/resource/after-delombok/Accessors.java +++ b/test/transform/resource/after-delombok/Accessors.java @@ -2,11 +2,13 @@ class AccessorsFluent { private String fieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -17,16 +19,19 @@ class AccessorsFluentOnClass { private String otherFieldWithOverride = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String fieldName() { return this.fieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; @@ -36,6 +41,7 @@ class AccessorsChain { private boolean isRunning; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; @@ -46,6 +52,7 @@ class AccessorsPrefix { private String fActualField; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -55,11 +62,13 @@ class AccessorsPrefix2 { private String fActualField; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFieldName(final String fieldName) { this.fieldName = fieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setActualField(final String fActualField) { this.fActualField = fActualField; } @@ -72,12 +81,14 @@ class AccessorsPrefix3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "AccessorsPrefix3(fName=" + this.getName() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof AccessorsPrefix3)) return false; @@ -90,12 +101,14 @@ class AccessorsPrefix3 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof AccessorsPrefix3; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -108,6 +121,7 @@ class AccessorsFluentGenerics<T extends Number> { private String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AccessorsFluentGenerics<T> name(final String name) { this.name = name; return this; @@ -117,6 +131,7 @@ class AccessorsFluentNoChaining { private String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void name(final String name) { this.name = name; } @@ -125,6 +140,7 @@ class AccessorsFluentStatic<T extends Number> { private static String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static void name(final String name) { AccessorsFluentStatic.name = name; } diff --git a/test/transform/resource/after-delombok/AccessorsConfiguration.java b/test/transform/resource/after-delombok/AccessorsConfiguration.java index 84a686c8..f98b7939 100644 --- a/test/transform/resource/after-delombok/AccessorsConfiguration.java +++ b/test/transform/resource/after-delombok/AccessorsConfiguration.java @@ -2,11 +2,13 @@ class AccessorsConfiguration { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String fieldName() { return this.m_FieldName; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void fieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -15,6 +17,7 @@ class AccessorsConfiguration2 { private String m_FieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setM_FieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } @@ -23,6 +26,7 @@ class AccessorsConfiguration3 { private String fFieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AccessorsConfiguration3 setFieldName(final String fFieldName) { this.fFieldName = fFieldName; return this; diff --git a/test/transform/resource/after-delombok/BuilderChainAndFluent.java b/test/transform/resource/after-delombok/BuilderChainAndFluent.java index dd3a347a..7a1f487e 100644 --- a/test/transform/resource/after-delombok/BuilderChainAndFluent.java +++ b/test/transform/resource/after-delombok/BuilderChainAndFluent.java @@ -2,38 +2,46 @@ class BuilderChainAndFluent { private final int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderChainAndFluent(final int yes) { this.yes = yes; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderChainAndFluentBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderChainAndFluentBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setYes(final int yes) { this.yes = yes; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderChainAndFluent build() { return new BuilderChainAndFluent(yes); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderChainAndFluentBuilder builder() { return new BuilderChainAndFluentBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java index 76e0add1..15d4e25c 100644 --- a/test/transform/resource/after-delombok/BuilderComplex.java +++ b/test/transform/resource/after-delombok/BuilderComplex.java @@ -4,61 +4,74 @@ class BuilderComplex { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class VoidBuilder<T extends Number> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private T number; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int arg2; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String arg3; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private BuilderComplex selfRef; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated VoidBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public VoidBuilder<T> number(final T number) { this.number = number; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public VoidBuilder<T> arg2(final int arg2) { this.arg2 = arg2; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public VoidBuilder<T> arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public VoidBuilder<T> selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void execute() { BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderComplex.VoidBuilder(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T extends Number> VoidBuilder<T> builder() { return new VoidBuilder<T>(); } diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java index 61e237d0..668977ab 100644 --- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java +++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java @@ -5,61 +5,74 @@ class BuilderInstanceMethod<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public class StringBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int show; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private List<T> also; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int $andMe; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated StringBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StringBuilder show(final int show) { this.show = show; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StringBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StringBuilder also(final List<T> also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String build() { return BuilderInstanceMethod.this.create(show, yes, also, $andMe); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderInstanceMethod.StringBuilder(show=" + this.show + ", yes=" + this.yes + ", also=" + this.also + ", $andMe=" + this.$andMe + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StringBuilder builder() { return new StringBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java index a12ad047..ecf74aa3 100644 --- a/test/transform/resource/after-delombok/BuilderSimple.java +++ b/test/transform/resource/after-delombok/BuilderSimple.java @@ -6,49 +6,59 @@ class BuilderSimple<T> { private int $butNotMe; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSimple(final int yes, final List<T> also) { this.yes = yes; this.also = also; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSimpleBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int yes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private List<T> also; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSimpleBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSimpleBuilder<T> yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSimpleBuilder<T> also(final List<T> also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSimple<T> build() { return new BuilderSimple<T>(yes, also); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> BuilderSimpleBuilder<T> builder() { return new BuilderSimpleBuilder<T>(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java index 79ffbc8b..851fc3db 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java @@ -12,6 +12,7 @@ class BuilderSingularGuavaListsSets<T> { private ImmutableTable<? extends Number, ? extends Number, String> users; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) { this.cards = cards; this.frogs = frogs; @@ -21,28 +22,36 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularGuavaListsSetsBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder<T> cards; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder<Number> frogs; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableSortedSet.Builder<String> passes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> card(final T card) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); @@ -50,6 +59,7 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); @@ -57,12 +67,14 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> clearCards() { this.cards = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); @@ -70,6 +82,7 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); @@ -77,12 +90,14 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() { this.frogs = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); @@ -90,6 +105,7 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); @@ -97,12 +113,14 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() { this.rawSet = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); @@ -110,6 +128,7 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); @@ -117,12 +136,14 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> clearPasses() { this.passes = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> user(final Number rowKey, final Number columnKey, final String value) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.put(rowKey, columnKey, value); @@ -130,6 +151,7 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.putAll(users); @@ -137,12 +159,14 @@ class BuilderSingularGuavaListsSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSetsBuilder<T> clearUsers() { this.users = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaListsSets<T> build() { com.google.common.collect.ImmutableList<T> cards = this.cards == null ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build(); com.google.common.collect.ImmutableCollection<Number> frogs = this.frogs == null ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build(); @@ -154,12 +178,14 @@ class BuilderSingularGuavaListsSets<T> { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> BuilderSingularGuavaListsSetsBuilder<T> builder() { return new BuilderSingularGuavaListsSetsBuilder<T>(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java index 1ad8fa83..22a4a750 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java @@ -8,6 +8,7 @@ class BuilderSingularGuavaMaps<K, V> { private ImmutableBiMap rawMap; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) { this.battleaxes = battleaxes; this.vertices = vertices; @@ -15,22 +16,28 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularGuavaMapsBuilder<K, V> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularGuavaMapsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> battleaxe(final K key, final V value) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.put(key, value); @@ -38,6 +45,7 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.putAll(battleaxes); @@ -45,12 +53,14 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() { this.battleaxes = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> vertex(final Integer key, final V value) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.put(key, value); @@ -58,6 +68,7 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.putAll(vertices); @@ -65,12 +76,14 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> clearVertices() { this.vertices = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.lang.Object key, final java.lang.Object value) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.put(key, value); @@ -78,6 +91,7 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.putAll(rawMap); @@ -85,12 +99,14 @@ class BuilderSingularGuavaMaps<K, V> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() { this.rawMap = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularGuavaMaps<K, V> build() { com.google.common.collect.ImmutableMap<K, V> battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build(); com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build(); @@ -100,12 +116,14 @@ class BuilderSingularGuavaMaps<K, V> { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <K, V> BuilderSingularGuavaMapsBuilder<K, V> builder() { return new BuilderSingularGuavaMapsBuilder<K, V>(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java index 9b409404..03b6ced7 100644 --- a/test/transform/resource/after-delombok/BuilderSingularLists.java +++ b/test/transform/resource/after-delombok/BuilderSingularLists.java @@ -7,6 +7,7 @@ class BuilderSingularLists<T> { private List rawList; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) { this.children = children; this.scarves = scarves; @@ -14,22 +15,28 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularListsBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<T> children; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<Number> scarves; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<java.lang.Object> rawList; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> child(final T child) { if (this.children == null) this.children = new java.util.ArrayList<T>(); this.children.add(child); @@ -37,6 +44,7 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) { if (this.children == null) this.children = new java.util.ArrayList<T>(); this.children.addAll(children); @@ -44,12 +52,14 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> scarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>(); this.scarves.add(scarf); @@ -57,6 +67,7 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) { if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>(); this.scarves.addAll(scarves); @@ -64,12 +75,14 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>(); this.rawList.add(rawList); @@ -77,6 +90,7 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>(); this.rawList.addAll(rawList); @@ -84,12 +98,14 @@ class BuilderSingularLists<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularListsBuilder<T> clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularLists<T> build() { java.util.List<T> children; switch (this.children == null ? 0 : this.children.size()) { @@ -129,12 +145,14 @@ class BuilderSingularLists<T> { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> BuilderSingularListsBuilder<T> builder() { return new BuilderSingularListsBuilder<T>(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java index d5cd8f41..7e9e1680 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java @@ -5,6 +5,7 @@ class BuilderSingularNoAuto { private List<String> items; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) { this.things = things; this.widgets = widgets; @@ -12,22 +13,28 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularNoAutoBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<String> things; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<String> widgets; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<String> items; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularNoAutoBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder things(final String things) { if (this.things == null) this.things = new java.util.ArrayList<String>(); this.things.add(things); @@ -35,6 +42,7 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder things(final java.util.Collection<? extends String> things) { if (this.things == null) this.things = new java.util.ArrayList<String>(); this.things.addAll(things); @@ -42,12 +50,14 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder widget(final String widget) { if (this.widgets == null) this.widgets = new java.util.ArrayList<String>(); this.widgets.add(widget); @@ -55,6 +65,7 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder widgets(final java.util.Collection<? extends String> widgets) { if (this.widgets == null) this.widgets = new java.util.ArrayList<String>(); this.widgets.addAll(widgets); @@ -62,12 +73,14 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder items(final String items) { if (this.items == null) this.items = new java.util.ArrayList<String>(); this.items.add(items); @@ -75,6 +88,7 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder items(final java.util.Collection<? extends String> items) { if (this.items == null) this.items = new java.util.ArrayList<String>(); this.items.addAll(items); @@ -82,12 +96,14 @@ class BuilderSingularNoAuto { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAutoBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularNoAuto build() { java.util.List<String> things; switch (this.things == null ? 0 : this.things.size()) { @@ -127,12 +143,14 @@ class BuilderSingularNoAuto { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAutoBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java index 7ffa647b..e9228db6 100644 --- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java @@ -7,6 +7,7 @@ class BuilderSingularRedirectToGuava { private Collection<Class<?>> doohickeys; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) { this.dangerMice = dangerMice; this.things = things; @@ -14,22 +15,28 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularRedirectToGuavaBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableSet.Builder<String> dangerMice; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularRedirectToGuavaBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); @@ -37,6 +44,7 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable<? extends String> dangerMice) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.addAll(dangerMice); @@ -44,12 +52,14 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder thing(final Integer key, final Number value) { if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.put(key, value); @@ -57,6 +67,7 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map<? extends Integer, ? extends Number> things) { if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.putAll(things); @@ -64,12 +75,14 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder doohickey(final Class<?> doohickey) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); @@ -77,6 +90,7 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.addAll(doohickeys); @@ -84,12 +98,14 @@ class BuilderSingularRedirectToGuava { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularRedirectToGuava build() { java.util.Set<String> dangerMice = this.dangerMice == null ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build(); java.util.NavigableMap<Integer, Number> things = this.things == null ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build(); @@ -99,12 +115,14 @@ class BuilderSingularRedirectToGuava { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuavaBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java index c794726a..4c4e64e1 100644 --- a/test/transform/resource/after-delombok/BuilderSingularSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularSets.java @@ -8,6 +8,7 @@ class BuilderSingularSets<T> { private Set<String> stringSet; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) { this.dangerMice = dangerMice; this.octopodes = octopodes; @@ -16,25 +17,32 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularSetsBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<T> dangerMice; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<Number> octopodes; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<java.lang.Object> rawSet; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<String> stringSet; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularSetsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> dangerMouse(final T dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.add(dangerMouse); @@ -42,6 +50,7 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.addAll(dangerMice); @@ -49,12 +58,14 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> clearDangerMice() { if (this.dangerMice != null) this.dangerMice.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> octopus(final Number octopus) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.add(octopus); @@ -62,6 +73,7 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.addAll(octopodes); @@ -69,12 +81,14 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> clearOctopodes() { if (this.octopodes != null) this.octopodes.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.add(rawSet); @@ -82,6 +96,7 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> rawSet(final java.util.Collection<?> rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.addAll(rawSet); @@ -89,12 +104,14 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> clearRawSet() { if (this.rawSet != null) this.rawSet.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> stringSet(final String stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.add(stringSet); @@ -102,6 +119,7 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.addAll(stringSet); @@ -109,12 +127,14 @@ class BuilderSingularSets<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSetsBuilder<T> clearStringSet() { if (this.stringSet != null) this.stringSet.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularSets<T> build() { java.util.Set<T> dangerMice; switch (this.dangerMice == null ? 0 : this.dangerMice.size()) { @@ -163,12 +183,14 @@ class BuilderSingularSets<T> { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> BuilderSingularSetsBuilder<T> builder() { return new BuilderSingularSetsBuilder<T>(); } diff --git a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java index b8ffb7d3..37d05704 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java +++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java @@ -2,21 +2,26 @@ class BuilderSingularWithPrefixes { private java.util.List<String> _elems; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularWithPrefixes(final java.util.List<String> elems) { this._elems = elems; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderSingularWithPrefixesBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<String> elems; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderSingularWithPrefixesBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularWithPrefixesBuilder elem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.add(elem); @@ -24,6 +29,7 @@ class BuilderSingularWithPrefixes { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularWithPrefixesBuilder elems(final java.util.Collection<? extends String> elems) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.addAll(elems); @@ -31,12 +37,14 @@ class BuilderSingularWithPrefixes { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularWithPrefixesBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderSingularWithPrefixes build() { java.util.List<String> elems; switch (this.elems == null ? 0 : this.elems.size()) { @@ -54,12 +62,14 @@ class BuilderSingularWithPrefixes { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderSingularWithPrefixesBuilder builder() { return new BuilderSingularWithPrefixesBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderValueData.java b/test/transform/resource/after-delombok/BuilderValueData.java new file mode 100644 index 00000000..c8690f2a --- /dev/null +++ b/test/transform/resource/after-delombok/BuilderValueData.java @@ -0,0 +1,151 @@ +import java.util.List; +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; + final BuilderAndValue other = (BuilderAndValue) o; + if (this.getZero() != other.getZero()) return false; + return true; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = result * PRIME + this.getZero(); + return result; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public java.lang.String toString() { + return "BuilderAndValue(zero=" + this.getZero() + ")"; + } +} + +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; + final BuilderAndData other = (BuilderAndData) o; + if (!other.canEqual((java.lang.Object) this)) return false; + if (this.getZero() != other.getZero()) return false; + return true; + } + @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; + result = result * PRIME + this.getZero(); + return result; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public java.lang.String toString() { + return "BuilderAndData(zero=" + this.getZero() + ")"; + } +} diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java index df02c1f1..e5504c8c 100644 --- a/test/transform/resource/after-delombok/BuilderWithAccessors.java +++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java @@ -5,6 +5,7 @@ class BuilderWithAccessors { private int __bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { this.plower = plower; this.pUpper = upper; @@ -13,61 +14,74 @@ class BuilderWithAccessors { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderWithAccessorsBuilder { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int plower; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int upper; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private int _bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithAccessorsBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithAccessorsBuilder plower(final int plower) { this.plower = plower; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithAccessorsBuilder upper(final int upper) { this.upper = upper; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithAccessorsBuilder foo(final int foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithAccessorsBuilder _bar(final int _bar) { this._bar = _bar; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithAccessors build() { return new BuilderWithAccessors(plower, upper, foo, _bar); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static BuilderWithAccessorsBuilder builder() { return new BuilderWithAccessorsBuilder(); } diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java index fc1cdbb3..e6b09e6f 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java @@ -5,43 +5,51 @@ class BuilderWithExistingBuilderClass<T, K extends Number> { public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private boolean arg2; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String arg3; private Z arg1; public void arg2(boolean arg) { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithExistingBuilderClassBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) { this.arg1 = arg1; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithExistingBuilderClass build() { return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <Z extends Number> BuilderWithExistingBuilderClassBuilder<Z> builder() { return new BuilderWithExistingBuilderClassBuilder<Z>(); } diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java index 7dfb046a..052cdee8 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java +++ b/test/transform/resource/after-delombok/BuilderWithToBuilder.java @@ -9,6 +9,7 @@ class BuilderWithToBuilder<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithToBuilder(final String one, final String two, final T foo, final List<T> bars) { this.mOne = one; this.mTwo = two; @@ -17,43 +18,53 @@ class BuilderWithToBuilder<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class BuilderWithToBuilderBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String one; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String two; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private T foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private java.util.ArrayList<T> bars; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated BuilderWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> one(final String one) { this.one = one; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> two(final String two) { this.two = two; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> foo(final T foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> bar(final T bar) { if (this.bars == null) this.bars = new java.util.ArrayList<T>(); this.bars.add(bar); @@ -61,6 +72,7 @@ class BuilderWithToBuilder<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> bars(final java.util.Collection<? extends T> bars) { if (this.bars == null) this.bars = new java.util.ArrayList<T>(); this.bars.addAll(bars); @@ -68,12 +80,14 @@ class BuilderWithToBuilder<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> clearBars() { if (this.bars != null) this.bars.clear(); return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilder<T> build() { java.util.List<T> bars; switch (this.bars == null ? 0 : this.bars.size()) { @@ -91,17 +105,20 @@ class BuilderWithToBuilder<T> { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> BuilderWithToBuilderBuilder<T> builder() { return new BuilderWithToBuilderBuilder<T>(); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public BuilderWithToBuilderBuilder<T> toBuilder() { return new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars); } @@ -116,48 +133,58 @@ class ConstructorWithToBuilder<T> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class ConstructorWithToBuilderBuilder<T> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String mOne; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private T bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated ConstructorWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorWithToBuilderBuilder<T> mOne(final String mOne) { this.mOne = mOne; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorWithToBuilderBuilder<T> bar(final T bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorWithToBuilder<T> build() { return new ConstructorWithToBuilder<T>(mOne, bar); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T> ConstructorWithToBuilderBuilder<T> builder() { return new ConstructorWithToBuilderBuilder<T>(); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorWithToBuilderBuilder<T> toBuilder() { return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); } @@ -174,48 +201,58 @@ class StaticWithToBuilder<T, K> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static class StaticWithToBuilderBuilder<Z> { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String mOne; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private Z bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated StaticWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StaticWithToBuilderBuilder<Z> mOne(final String mOne) { this.mOne = mOne; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StaticWithToBuilderBuilder<Z> bar(final Z bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StaticWithToBuilder build() { return StaticWithToBuilder.<Z>test(mOne, bar); } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "StaticWithToBuilder.StaticWithToBuilderBuilder(mOne=" + this.mOne + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <Z> StaticWithToBuilderBuilder<Z> builder() { return new StaticWithToBuilderBuilder<Z>(); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public StaticWithToBuilderBuilder<T> toBuilder() { return new StaticWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); } diff --git a/test/transform/resource/after-delombok/BuilderWithTolerate.java b/test/transform/resource/after-delombok/BuilderWithTolerate.java new file mode 100644 index 00000000..decb05d3 --- /dev/null +++ b/test/transform/resource/after-delombok/BuilderWithTolerate.java @@ -0,0 +1,66 @@ + +import lombok.experimental.Tolerate; + +public class BuilderWithTolerate { + private final int value; + + public static void main(String[] args) { + BuilderWithTolerate.builder().value("42").build(); + } + + + public static class BuilderWithTolerateBuilder { + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + private int value; + + @Tolerate + public BuilderWithTolerateBuilder value(String s) { + return this.value(Integer.parseInt(s)); + } + + @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; + } + + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public BuilderWithTolerate build() { + return new BuilderWithTolerate(value); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public java.lang.String toString() { + return "BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value + ")"; + } + } + + @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(); + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java index 793ec097..5db0e37a 100644 --- a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java +++ b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java @@ -2,6 +2,7 @@ class GetFoo { private int foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/CommentsInterspersed.java b/test/transform/resource/after-delombok/CommentsInterspersed.java index a1da2c3d..33712fea 100644 --- a/test/transform/resource/after-delombok/CommentsInterspersed.java +++ b/test/transform/resource/after-delombok/CommentsInterspersed.java @@ -13,6 +13,7 @@ public class CommentsInterspersed { }-*/ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getTest() { return this.test; } diff --git a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java index ff5278ff..d8883be1 100644 --- a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java +++ b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java @@ -2,6 +2,7 @@ class ConflictingStaticConstructorNames { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ConflictingStaticConstructorNames)) return false; @@ -11,12 +12,14 @@ class ConflictingStaticConstructorNames { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof ConflictingStaticConstructorNames; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -24,11 +27,13 @@ class ConflictingStaticConstructorNames { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ConflictingStaticConstructorNames()"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConflictingStaticConstructorNames() { } }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/Constructors.java b/test/transform/resource/after-delombok/Constructors.java index c138a00c..e3bb85ab 100644 --- a/test/transform/resource/after-delombok/Constructors.java +++ b/test/transform/resource/after-delombok/Constructors.java @@ -4,6 +4,7 @@ class RequiredArgsConstructor1 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public RequiredArgsConstructor1(final int x) { this.x = x; } @@ -14,6 +15,7 @@ class RequiredArgsConstructorAccess { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected RequiredArgsConstructorAccess(final int x) { this.x = x; } @@ -23,11 +25,13 @@ class RequiredArgsConstructorStaticName { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private RequiredArgsConstructorStaticName(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static RequiredArgsConstructorStaticName staticname(final int x) { return new RequiredArgsConstructorStaticName(x); } @@ -39,6 +43,7 @@ class RequiredArgsConstructorWithAnnotations { @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public RequiredArgsConstructorWithAnnotations(final int x) { this.x = x; } @@ -49,6 +54,7 @@ class AllArgsConstructor1 { @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public AllArgsConstructor1(final int x, final String name) { this.x = x; this.name = name; @@ -59,6 +65,7 @@ class NoArgsConstructor1 { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public NoArgsConstructor1() { } } @@ -67,11 +74,13 @@ class RequiredArgsConstructorStaticNameGenerics<T extends Number> { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private RequiredArgsConstructorStaticNameGenerics(final T x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T extends Number> RequiredArgsConstructorStaticNameGenerics<T> of(final T x) { return new RequiredArgsConstructorStaticNameGenerics<T>(x); } @@ -81,11 +90,13 @@ class RequiredArgsConstructorStaticNameGenerics2<T extends Number> { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static <T extends Number> RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) { return new RequiredArgsConstructorStaticNameGenerics2<T>(x); } @@ -94,6 +105,7 @@ class AllArgsConstructorPackageAccess { final String x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated AllArgsConstructorPackageAccess(final String x) { this.x = x; } @@ -108,6 +120,7 @@ class NoArgsConstructor2 { byte z; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public NoArgsConstructor2() { this.x = 0; this.y = 0.0; diff --git a/test/transform/resource/after-delombok/ConstructorsConfiguration.java b/test/transform/resource/after-delombok/ConstructorsConfiguration.java index effc51b8..3c472c46 100644 --- a/test/transform/resource/after-delombok/ConstructorsConfiguration.java +++ b/test/transform/resource/after-delombok/ConstructorsConfiguration.java @@ -2,6 +2,7 @@ class ConstructorsConfiguration { int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorsConfiguration(final int x) { this.x = x; } @@ -11,6 +12,7 @@ class ConstructorsConfigurationExplicit { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorsConfigurationExplicit(final int x) { this.x = x; } diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java index 43c0ea66..b83c4cec 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java +++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java @@ -7,6 +7,7 @@ class ConstructorsWithAccessors { @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { this.plower = plower; this.pUpper = upper; diff --git a/test/transform/resource/after-delombok/DataConfiguration.java b/test/transform/resource/after-delombok/DataConfiguration.java index aadb35b6..c4accfcc 100644 --- a/test/transform/resource/after-delombok/DataConfiguration.java +++ b/test/transform/resource/after-delombok/DataConfiguration.java @@ -2,17 +2,20 @@ class DataConfiguration { final int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public DataConfiguration(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataConfiguration)) return false; @@ -23,12 +26,14 @@ class DataConfiguration { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataConfiguration; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -38,6 +43,7 @@ class DataConfiguration { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataConfiguration(x=" + this.getX() + ")"; } diff --git a/test/transform/resource/after-delombok/DataExtended.java b/test/transform/resource/after-delombok/DataExtended.java index 175738ad..27c0b44d 100644 --- a/test/transform/resource/after-delombok/DataExtended.java +++ b/test/transform/resource/after-delombok/DataExtended.java @@ -2,21 +2,25 @@ class DataExtended { int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public DataExtended() { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataExtended)) return false; @@ -27,12 +31,14 @@ class DataExtended { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataExtended; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -42,6 +48,7 @@ class DataExtended { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataExtended(x=" + this.x + ")"; } diff --git a/test/transform/resource/after-delombok/DataIgnore.java b/test/transform/resource/after-delombok/DataIgnore.java index d5a3d81e..761ce42b 100644 --- a/test/transform/resource/after-delombok/DataIgnore.java +++ b/test/transform/resource/after-delombok/DataIgnore.java @@ -4,17 +4,20 @@ class DataIgnore { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public DataIgnore(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataIgnore)) return false; @@ -25,12 +28,14 @@ class DataIgnore { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataIgnore; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -40,6 +45,7 @@ class DataIgnore { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataIgnore(x=" + this.getX() + ")"; } diff --git a/test/transform/resource/after-delombok/DataOnEnum.java b/test/transform/resource/after-delombok/DataOnEnum.java index b3cd7967..214bae0d 100644 --- a/test/transform/resource/after-delombok/DataOnEnum.java +++ b/test/transform/resource/after-delombok/DataOnEnum.java @@ -3,17 +3,20 @@ public enum DataOnEnum { private final String someField; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getSomeField() { return this.someField; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataOnEnum(someField=" + this.getSomeField() + ")"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private DataOnEnum(final String someField) { this.someField = someField; } diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java index 0e15ab4c..4ac77e5c 100644 --- a/test/transform/resource/after-delombok/DataOnLocalClass.java +++ b/test/transform/resource/after-delombok/DataOnLocalClass.java @@ -5,27 +5,32 @@ class DataOnLocalClass1 { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Local(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local)) return false; @@ -39,12 +44,14 @@ class DataOnLocalClass1 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -56,6 +63,7 @@ class DataOnLocalClass1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Local(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -71,6 +79,7 @@ class DataOnLocalClass2 { String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public InnerLocal(@lombok.NonNull final String name) { if (name == null) { throw new java.lang.NullPointerException("name"); @@ -80,11 +89,13 @@ class DataOnLocalClass2 { @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setName(@lombok.NonNull final String name) { if (name == null) { throw new java.lang.NullPointerException("name"); @@ -94,6 +105,7 @@ class DataOnLocalClass2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local.InnerLocal)) return false; @@ -106,12 +118,14 @@ class DataOnLocalClass2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local.InnerLocal; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -122,23 +136,27 @@ class DataOnLocalClass2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Local.InnerLocal(name=" + this.getName() + ")"; } } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Local(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Local)) return false; @@ -149,12 +167,14 @@ class DataOnLocalClass2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Local; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -164,6 +184,7 @@ class DataOnLocalClass2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Local(x=" + this.getX() + ")"; } diff --git a/test/transform/resource/after-delombok/DataPlain.java b/test/transform/resource/after-delombok/DataPlain.java index ccebc55e..994bdc1f 100644 --- a/test/transform/resource/after-delombok/DataPlain.java +++ b/test/transform/resource/after-delombok/DataPlain.java @@ -4,27 +4,32 @@ class Data1 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Data1(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data1)) return false; @@ -38,12 +43,14 @@ class Data1 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data1; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -55,6 +62,7 @@ class Data1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data1(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -65,27 +73,32 @@ class Data2 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Data2(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data2)) return false; @@ -99,12 +112,14 @@ class Data2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data2; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -116,6 +131,7 @@ class Data2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data2(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -126,27 +142,32 @@ final class Data3 { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Data3(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setName(final String name) { this.name = name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data3)) return false; @@ -160,6 +181,7 @@ final class Data3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -171,6 +193,7 @@ final class Data3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data3(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -181,23 +204,27 @@ final class Data4 extends java.util.Timer { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data4(x=" + this.getX() + ")"; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data4)) return false; @@ -209,12 +236,14 @@ final class Data4 extends java.util.Timer { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data4; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -226,11 +255,13 @@ final class Data4 extends java.util.Timer { class Data5 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Data5() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data5)) return false; @@ -240,12 +271,14 @@ class Data5 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Data5; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -253,6 +286,7 @@ class Data5 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data5()"; } @@ -260,11 +294,13 @@ class Data5 { final class Data6 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Data6() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Data6)) return false; @@ -273,6 +309,7 @@ final class Data6 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -280,6 +317,7 @@ final class Data6 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Data6()"; } diff --git a/test/transform/resource/after-delombok/DataWithGetter.java b/test/transform/resource/after-delombok/DataWithGetter.java index fb51e262..c93cc10c 100644 --- a/test/transform/resource/after-delombok/DataWithGetter.java +++ b/test/transform/resource/after-delombok/DataWithGetter.java @@ -5,22 +5,26 @@ class DataWithGetter { @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public DataWithGetter(final String z) { this.z = z; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setY(final int y) { this.y = y; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGetter)) return false; @@ -35,12 +39,14 @@ class DataWithGetter { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGetter; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -53,21 +59,25 @@ class DataWithGetter { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataWithGetter(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getY() { return this.y; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getZ() { return this.z; } diff --git a/test/transform/resource/after-delombok/DataWithGetterNone.java b/test/transform/resource/after-delombok/DataWithGetterNone.java index e332db02..dfd30639 100644 --- a/test/transform/resource/after-delombok/DataWithGetterNone.java +++ b/test/transform/resource/after-delombok/DataWithGetterNone.java @@ -5,22 +5,26 @@ class DataWithGetterNone { @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public DataWithGetterNone(final String z) { this.z = z; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setX(final int x) { this.x = x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setY(final int y) { this.y = y; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof DataWithGetterNone)) return false; @@ -35,12 +39,14 @@ class DataWithGetterNone { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof DataWithGetterNone; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -53,6 +59,7 @@ class DataWithGetterNone { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "DataWithGetterNone(x=" + this.x + ", y=" + this.y + ", z=" + this.z + ")"; } diff --git a/test/transform/resource/after-delombok/DelegateOnGetter.java b/test/transform/resource/after-delombok/DelegateOnGetter.java index 1d25dcc0..ae1ce320 100644 --- a/test/transform/resource/after-delombok/DelegateOnGetter.java +++ b/test/transform/resource/after-delombok/DelegateOnGetter.java @@ -6,6 +6,7 @@ class DelegateOnGetter { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Bar getBar() { java.lang.Object value = this.bar.get(); if (value == null) { @@ -28,11 +29,13 @@ class DelegateOnGetter { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setList(final java.util.ArrayList<java.lang.String> list) { this.getBar().setList(list); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getInt() { return this.getBar().getInt(); } diff --git a/test/transform/resource/after-delombok/DelegateOnGetterNone.java b/test/transform/resource/after-delombok/DelegateOnGetterNone.java index c4de4f88..ee0b1ab8 100644 --- a/test/transform/resource/after-delombok/DelegateOnGetterNone.java +++ b/test/transform/resource/after-delombok/DelegateOnGetterNone.java @@ -6,11 +6,13 @@ class DelegateOnGetterNone { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setList(final java.util.ArrayList<java.lang.String> list) { this.bar.setList(list); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getInt() { return this.bar.getInt(); } diff --git a/test/transform/resource/after-delombok/DelegateOnMethods.java b/test/transform/resource/after-delombok/DelegateOnMethods.java index 5082d961..db8621bc 100644 --- a/test/transform/resource/after-delombok/DelegateOnMethods.java +++ b/test/transform/resource/after-delombok/DelegateOnMethods.java @@ -8,6 +8,8 @@ abstract class DelegateOnMethods { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void bar(final java.util.ArrayList<java.lang.String> list) { this.getBar().bar(list); } diff --git a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java index 00a157f1..135b351d 100644 --- a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java +++ b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java @@ -26,6 +26,8 @@ class DelegatePlain { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void bar(final java.util.ArrayList<java.lang.String> list) { this.bar.bar(list); } @@ -33,6 +35,8 @@ class DelegatePlain { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void foo() { this.foo.foo(); } diff --git a/test/transform/resource/after-delombok/DelegateWithDeprecated.java b/test/transform/resource/after-delombok/DelegateWithDeprecated.java index 6a7651db..0f46f341 100644 --- a/test/transform/resource/after-delombok/DelegateWithDeprecated.java +++ b/test/transform/resource/after-delombok/DelegateWithDeprecated.java @@ -12,17 +12,20 @@ class DelegateWithDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void deprecatedAnnotation() { this.bar.deprecatedAnnotation(); } @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void deprecatedComment() { this.bar.deprecatedComment(); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void notDeprecated() { this.bar.notDeprecated(); } diff --git a/test/transform/resource/after-delombok/DelegateWithVarargs.java b/test/transform/resource/after-delombok/DelegateWithVarargs.java index 1d240524..91d7d466 100644 --- a/test/transform/resource/after-delombok/DelegateWithVarargs.java +++ b/test/transform/resource/after-delombok/DelegateWithVarargs.java @@ -8,21 +8,25 @@ class DelegateWithVarargs { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void justOneParameter(final int... varargs) { this.bar.justOneParameter(varargs); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void multipleParameters(final java.lang.String first, final int... varargs) { this.bar.multipleParameters(first, varargs); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void array(final int[] array) { this.bar.array(array); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void arrayVarargs(final int[]... arrayVarargs) { this.bar.arrayVarargs(arrayVarargs); } diff --git a/test/transform/resource/after-delombok/EncodingUsAscii.java b/test/transform/resource/after-delombok/EncodingUsAscii.java index 4d2b169f..0134f22d 100644 --- a/test/transform/resource/after-delombok/EncodingUsAscii.java +++ b/test/transform/resource/after-delombok/EncodingUsAscii.java @@ -4,6 +4,7 @@ class EncodingUsAscii { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "EncodingUsAscii(foo\u0e51\u0e51=" + this.foo\u0e51\u0e51 + ")"; } diff --git a/test/transform/resource/after-delombok/EncodingUtf8.java b/test/transform/resource/after-delombok/EncodingUtf8.java index b1a7dcd3..d57f1a0a 100644 --- a/test/transform/resource/after-delombok/EncodingUtf8.java +++ b/test/transform/resource/after-delombok/EncodingUtf8.java @@ -3,6 +3,7 @@ class EncodingUtf8 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "EncodingUtf8(foo๑๑=" + this.foo๑๑ + ")"; } diff --git a/test/transform/resource/after-delombok/EqualsAndHashCode.java b/test/transform/resource/after-delombok/EqualsAndHashCode.java index 7ade594a..858913b1 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCode.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCode.java @@ -7,6 +7,7 @@ class EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode)) return false; @@ -25,12 +26,14 @@ class EqualsAndHashCode { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -53,6 +56,7 @@ final class EqualsAndHashCode2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode2)) return false; @@ -67,6 +71,7 @@ final class EqualsAndHashCode2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -84,6 +89,7 @@ final class EqualsAndHashCode3 extends EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode3)) return false; @@ -93,12 +99,14 @@ final class EqualsAndHashCode3 extends EqualsAndHashCode { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode3; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -108,6 +116,7 @@ class EqualsAndHashCode4 extends EqualsAndHashCode { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCode4)) return false; @@ -118,12 +127,14 @@ class EqualsAndHashCode4 extends EqualsAndHashCode { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCode4; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java index 449a1b2e..97da983e 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys1.java @@ -2,6 +2,7 @@ class EqualsAndHashCodeConfigKeys1Parent { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys1Parent)) return false; @@ -11,12 +12,14 @@ class EqualsAndHashCodeConfigKeys1Parent { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys1Parent; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -27,6 +30,7 @@ class EqualsAndHashCodeConfigKeys1 extends EqualsAndHashCodeConfigKeys1Parent { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys1)) return false; @@ -37,12 +41,14 @@ class EqualsAndHashCodeConfigKeys1 extends EqualsAndHashCodeConfigKeys1Parent { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys1; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java index 43c271fa..e823b7d5 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeConfigKeys2.java @@ -2,6 +2,7 @@ class EqualsAndHashCodeConfigKeys2Parent { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys2Parent)) return false; @@ -11,12 +12,14 @@ class EqualsAndHashCodeConfigKeys2Parent { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys2Parent; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -27,6 +30,7 @@ class EqualsAndHashCodeConfigKeys2 extends EqualsAndHashCodeConfigKeys2Parent { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeConfigKeys2)) return false; @@ -38,12 +42,14 @@ class EqualsAndHashCodeConfigKeys2 extends EqualsAndHashCodeConfigKeys2Parent { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof EqualsAndHashCodeConfigKeys2; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java index 6978bf00..026a74ad 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java @@ -18,6 +18,7 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithExistingMethods3)) return false; @@ -30,6 +31,7 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java index 4cf00601..679ca99d 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java @@ -10,6 +10,7 @@ class EqualsAndHashCodeWithOnParam { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(@Nullable final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeWithOnParam)) return false; @@ -28,12 +29,14 @@ class EqualsAndHashCodeWithOnParam { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(@Nullable final java.lang.Object other) { return other instanceof EqualsAndHashCodeWithOnParam; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java index 2a75430f..471ee60c 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java +++ b/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java @@ -4,6 +4,7 @@ final class EqualsAndHashCodeOf { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeOf)) return false; @@ -14,6 +15,7 @@ final class EqualsAndHashCodeOf { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -27,6 +29,7 @@ final class EqualsAndHashCodeExclude { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof EqualsAndHashCodeExclude)) return false; @@ -37,6 +40,7 @@ final class EqualsAndHashCodeExclude { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; diff --git a/test/transform/resource/after-delombok/FieldDefaults.java b/test/transform/resource/after-delombok/FieldDefaults.java index 8a84f442..6f866a9a 100644 --- a/test/transform/resource/after-delombok/FieldDefaults.java +++ b/test/transform/resource/after-delombok/FieldDefaults.java @@ -1,4 +1,5 @@ class FieldDefaults1 { + static int STATIC = 3; final int x; int y; FieldDefaults1(int x) { @@ -6,6 +7,7 @@ class FieldDefaults1 { } } class FieldDefaults2 { + static int STATIC = 3; int x; private int y; }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java b/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java index ebe6e2ed..37626fb5 100644 --- a/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java +++ b/test/transform/resource/after-delombok/FieldDefaultsViaConfigAndRequiredArgsConstructor.java @@ -3,6 +3,7 @@ class FieldDefaultsViaConfigAndRequiredArgsConstructor { @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { this.x = x; } diff --git a/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java b/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java index 377145e4..5ebd47f1 100644 --- a/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java +++ b/test/transform/resource/after-delombok/GenerateSuppressFBWarnings.java @@ -3,6 +3,7 @@ class GenerateSuppressFBWarnings { @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") @javax.annotation.Generated("lombok") + @lombok.Generated public int getY() { return this.y; } diff --git a/test/transform/resource/after-delombok/GeneratedGlobalOff.java b/test/transform/resource/after-delombok/GeneratedGlobalOff.java new file mode 100644 index 00000000..6557b715 --- /dev/null +++ b/test/transform/resource/after-delombok/GeneratedGlobalOff.java @@ -0,0 +1,7 @@ +class GeneratedGlobalOff { + int x; + @java.lang.SuppressWarnings("all") + public int getX() { + return this.x; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/GeneratedGlobalOffJavaxOn.java b/test/transform/resource/after-delombok/GeneratedGlobalOffJavaxOn.java new file mode 100644 index 00000000..de034fe3 --- /dev/null +++ b/test/transform/resource/after-delombok/GeneratedGlobalOffJavaxOn.java @@ -0,0 +1,8 @@ +class GeneratedGlobalOffJavaxOn { + int x; + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + public int getX() { + return this.x; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/GeneratedGlobalOffLombokOn.java b/test/transform/resource/after-delombok/GeneratedGlobalOffLombokOn.java new file mode 100644 index 00000000..40cfa92e --- /dev/null +++ b/test/transform/resource/after-delombok/GeneratedGlobalOffLombokOn.java @@ -0,0 +1,8 @@ +class GeneratedGlobalOffLombokOn { + int x; + @java.lang.SuppressWarnings("all") + @lombok.Generated + public int getX() { + return this.x; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/GeneratedJavaxOff.java b/test/transform/resource/after-delombok/GeneratedJavaxOff.java new file mode 100644 index 00000000..d061ccba --- /dev/null +++ b/test/transform/resource/after-delombok/GeneratedJavaxOff.java @@ -0,0 +1,8 @@ +class GeneratedJavaxOff { + int x; + @java.lang.SuppressWarnings("all") + @lombok.Generated + public int getX() { + return this.x; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/GeneratedLombokOff.java b/test/transform/resource/after-delombok/GeneratedLombokOff.java new file mode 100644 index 00000000..59d146a4 --- /dev/null +++ b/test/transform/resource/after-delombok/GeneratedLombokOff.java @@ -0,0 +1,8 @@ +class GeneratedLombokOff { + int x; + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + public int getX() { + return this.x; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/GetterAccessLevel.java b/test/transform/resource/after-delombok/GetterAccessLevel.java index 217c77a9..2cb70954 100644 --- a/test/transform/resource/after-delombok/GetterAccessLevel.java +++ b/test/transform/resource/after-delombok/GetterAccessLevel.java @@ -12,46 +12,55 @@ class GetterAccessLevel { String value; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private boolean isPrivate() { return this.isPrivate; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated boolean isPackage() { return this.isPackage; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean isProtected() { return this.isProtected; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private String getPrivateString() { return this.privateString; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated String getPackageString() { return this.packageString; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected String getProtectedString() { return this.protectedString; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getPublicString() { return this.publicString; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getValue() { return this.value; } diff --git a/test/transform/resource/after-delombok/GetterAlreadyExists.java b/test/transform/resource/after-delombok/GetterAlreadyExists.java index a45df1a9..556ea4a8 100644 --- a/test/transform/resource/after-delombok/GetterAlreadyExists.java +++ b/test/transform/resource/after-delombok/GetterAlreadyExists.java @@ -5,6 +5,7 @@ class Getter1 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isFoo() { return this.foo; } @@ -28,6 +29,7 @@ class Getter4 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -39,6 +41,7 @@ class Getter5 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -56,6 +59,7 @@ class Getter7 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -67,6 +71,7 @@ class Getter8 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -84,6 +89,7 @@ class Getter10 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isFoo() { return this.foo; } @@ -107,6 +113,7 @@ class Getter13 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -118,6 +125,7 @@ class Getter14 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -135,6 +143,7 @@ class Getter16 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } @@ -146,6 +155,7 @@ class Getter17 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterBoolean.java b/test/transform/resource/after-delombok/GetterBoolean.java index 49b52483..567ea94d 100644 --- a/test/transform/resource/after-delombok/GetterBoolean.java +++ b/test/transform/resource/after-delombok/GetterBoolean.java @@ -4,16 +4,19 @@ class Getter { boolean hasBaz; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isFoo() { return this.foo; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isBar() { return this.isBar; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isHasBaz() { return this.hasBaz; } @@ -25,6 +28,7 @@ class MoreGetter { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterDeprecated.java b/test/transform/resource/after-delombok/GetterDeprecated.java index d9d09e6c..09938d56 100644 --- a/test/transform/resource/after-delombok/GetterDeprecated.java +++ b/test/transform/resource/after-delombok/GetterDeprecated.java @@ -8,6 +8,7 @@ class GetterDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getAnnotation() { return this.annotation; } @@ -17,6 +18,7 @@ class GetterDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getJavadoc() { return this.javadoc; } diff --git a/test/transform/resource/after-delombok/GetterEnum.java b/test/transform/resource/after-delombok/GetterEnum.java index 841325c0..a74a012a 100644 --- a/test/transform/resource/after-delombok/GetterEnum.java +++ b/test/transform/resource/after-delombok/GetterEnum.java @@ -4,17 +4,20 @@ enum GetterEnum { private final String name; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private GetterEnum(final int id, final String name) { this.id = id; this.name = name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getId() { return this.id; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } diff --git a/test/transform/resource/after-delombok/GetterLazy.java b/test/transform/resource/after-delombok/GetterLazy.java index 2ea3cbf2..a36175fe 100644 --- a/test/transform/resource/after-delombok/GetterLazy.java +++ b/test/transform/resource/after-delombok/GetterLazy.java @@ -4,6 +4,7 @@ class GetterLazy { private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> fieldName = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>(); @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueType getFieldName() { java.lang.Object value = this.fieldName.get(); if (value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyBoolean.java b/test/transform/resource/after-delombok/GetterLazyBoolean.java index 41349447..bb439e65 100644 --- a/test/transform/resource/after-delombok/GetterLazyBoolean.java +++ b/test/transform/resource/after-delombok/GetterLazyBoolean.java @@ -7,6 +7,7 @@ class GetterLazyBoolean { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterLazyBoolean)) return false; @@ -17,12 +18,14 @@ class GetterLazyBoolean { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterLazyBoolean; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -32,11 +35,13 @@ class GetterLazyBoolean { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "GetterLazyBoolean(booleanValue=" + this.isBooleanValue() + ")"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isBooleanValue() { java.lang.Object value = this.booleanValue.get(); if (value == null) { @@ -53,6 +58,7 @@ class GetterLazyBoolean { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isOtherBooleanValue() { java.lang.Object value = this.otherBooleanValue.get(); if (value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyEahcToString.java b/test/transform/resource/after-delombok/GetterLazyEahcToString.java index 973eb6f1..7995663f 100644 --- a/test/transform/resource/after-delombok/GetterLazyEahcToString.java +++ b/test/transform/resource/after-delombok/GetterLazyEahcToString.java @@ -6,6 +6,7 @@ class GetterLazyEahcToString { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterLazyEahcToString)) return false; @@ -23,6 +24,8 @@ class GetterLazyEahcToString { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterLazyEahcToString; } @@ -30,6 +33,7 @@ class GetterLazyEahcToString { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -43,6 +47,7 @@ class GetterLazyEahcToString { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "GetterLazyEahcToString(value=" + this.getValue() + ", value2=" + this.value2 + ")"; } @@ -50,6 +55,8 @@ class GetterLazyEahcToString { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public String getValue() { java.lang.Object value = this.value.get(); if (value == null) { @@ -67,6 +74,7 @@ class GetterLazyEahcToString { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getValue2() { return this.value2; } diff --git a/test/transform/resource/after-delombok/GetterLazyInvalid.java b/test/transform/resource/after-delombok/GetterLazyInvalid.java index 311b7e4a..2b20c3d4 100644 --- a/test/transform/resource/after-delombok/GetterLazyInvalid.java +++ b/test/transform/resource/after-delombok/GetterLazyInvalid.java @@ -14,6 +14,7 @@ class GetterLazyInvalidClass { private final String fieldName = ""; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getFieldName() { return this.fieldName; } diff --git a/test/transform/resource/after-delombok/GetterLazyNative.java b/test/transform/resource/after-delombok/GetterLazyNative.java index 0d88558d..cd0e0303 100644 --- a/test/transform/resource/after-delombok/GetterLazyNative.java +++ b/test/transform/resource/after-delombok/GetterLazyNative.java @@ -10,6 +10,7 @@ class GetterLazyNative { private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> intArrayField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>(); @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isBooleanField() { java.lang.Object value = this.booleanField.get(); if (value == null) { @@ -26,6 +27,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public byte getByteField() { java.lang.Object value = this.byteField.get(); if (value == null) { @@ -42,6 +44,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public short getShortField() { java.lang.Object value = this.shortField.get(); if (value == null) { @@ -58,6 +61,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getIntField() { java.lang.Object value = this.intField.get(); if (value == null) { @@ -74,6 +78,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public long getLongField() { java.lang.Object value = this.longField.get(); if (value == null) { @@ -90,6 +95,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public float getFloatField() { java.lang.Object value = this.floatField.get(); if (value == null) { @@ -106,6 +112,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public double getDoubleField() { java.lang.Object value = this.doubleField.get(); if (value == null) { @@ -122,6 +129,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public char getCharField() { java.lang.Object value = this.charField.get(); if (value == null) { @@ -138,6 +146,7 @@ class GetterLazyNative { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int[] getIntArrayField() { java.lang.Object value = this.intArrayField.get(); if (value == null) { diff --git a/test/transform/resource/after-delombok/GetterLazyTransient.java b/test/transform/resource/after-delombok/GetterLazyTransient.java new file mode 100644 index 00000000..a3327a6e --- /dev/null +++ b/test/transform/resource/after-delombok/GetterLazyTransient.java @@ -0,0 +1,28 @@ +class GetterLazyTransient { + private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> nonTransientField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>(); + private final transient int transientField = 2; + 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) { + synchronized (this.nonTransientField) { + value = this.nonTransientField.get(); + if (value == null) { + final int actualValue = 1; + value = actualValue; + this.nonTransientField.set(value); + } + } + } + return (java.lang.Integer) value; + } + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public int getNonLazyTransientField() { + return this.nonLazyTransientField; + } +} diff --git a/test/transform/resource/after-delombok/GetterNone.java b/test/transform/resource/after-delombok/GetterNone.java index 743ff468..a24b04fa 100644 --- a/test/transform/resource/after-delombok/GetterNone.java +++ b/test/transform/resource/after-delombok/GetterNone.java @@ -3,6 +3,7 @@ class GetterNone { int foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/GetterOnClass.java b/test/transform/resource/after-delombok/GetterOnClass.java index a509f5cb..a9d1280c 100644 --- a/test/transform/resource/after-delombok/GetterOnClass.java +++ b/test/transform/resource/after-delombok/GetterOnClass.java @@ -3,6 +3,7 @@ class GetterOnClass1 { boolean isPublic; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @@ -13,11 +14,13 @@ class GetterOnClass2 { boolean isPackage; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean isProtected() { return this.isProtected; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated boolean isPackage() { return this.isPackage; } @@ -27,6 +30,7 @@ class GetterOnClass3 { boolean isPackage; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated boolean isPackage() { return this.isPackage; } @@ -36,6 +40,7 @@ class GetterOnClass4 { boolean isPrivate; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private boolean isPrivate() { return this.isPrivate; } @@ -45,6 +50,7 @@ class GetterOnClass5 { boolean isPublic; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean isPublic() { return this.isPublic; } @@ -55,12 +61,14 @@ class GetterOnClass6 { String nonNull; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getCouldBeNull() { return this.couldBeNull; } @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getNonNull() { return this.nonNull; } diff --git a/test/transform/resource/after-delombok/GetterOnMethod.java b/test/transform/resource/after-delombok/GetterOnMethod.java index 37ae83a4..8496e984 100644 --- a/test/transform/resource/after-delombok/GetterOnMethod.java +++ b/test/transform/resource/after-delombok/GetterOnMethod.java @@ -7,6 +7,7 @@ class GetterOnMethod { @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getI() { return this.i; } @@ -14,6 +15,7 @@ class GetterOnMethod { @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getJ() { return this.j; } @@ -21,6 +23,7 @@ class GetterOnMethod { @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getK() { return this.k; } diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors.java b/test/transform/resource/after-delombok/GetterOnMethodErrors.java index 094f989a..55949391 100644 --- a/test/transform/resource/after-delombok/GetterOnMethodErrors.java +++ b/test/transform/resource/after-delombok/GetterOnMethodErrors.java @@ -4,6 +4,7 @@ class GetterOnMethodErrors { private int test; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getTest() { return this.test; } diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java index 3114d23d..2ef4ac8e 100644 --- a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java +++ b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java @@ -11,38 +11,45 @@ class GetterOnMethodErrors2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getBad1() { return this.bad1; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getBad2() { return this.bad2; } @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getBad3() { return this.bad3; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getBad4() { return this.bad4; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getGood1() { return this.good1; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getGood2() { return this.good2; } @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getGood3() { return this.good3; } @@ -50,6 +57,7 @@ class GetterOnMethodErrors2 { @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getGood4() { return this.good4; } diff --git a/test/transform/resource/after-delombok/GetterOnStatic.java b/test/transform/resource/after-delombok/GetterOnStatic.java index 34c2dba1..d7ddca69 100644 --- a/test/transform/resource/after-delombok/GetterOnStatic.java +++ b/test/transform/resource/after-delombok/GetterOnStatic.java @@ -3,11 +3,13 @@ class Getter { static int bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static boolean isFoo() { return Getter.foo; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static int getBar() { return Getter.bar; } diff --git a/test/transform/resource/after-delombok/GetterPlain.java b/test/transform/resource/after-delombok/GetterPlain.java index 1cdfef8f..d489d63e 100644 --- a/test/transform/resource/after-delombok/GetterPlain.java +++ b/test/transform/resource/after-delombok/GetterPlain.java @@ -3,11 +3,13 @@ class GetterPlain { int foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getI() { return this.i; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getFoo() { return this.foo; } diff --git a/test/transform/resource/after-delombok/GetterSetterJavadoc.java b/test/transform/resource/after-delombok/GetterSetterJavadoc.java index f156de92..21b339e8 100644 --- a/test/transform/resource/after-delombok/GetterSetterJavadoc.java +++ b/test/transform/resource/after-delombok/GetterSetterJavadoc.java @@ -5,6 +5,7 @@ class GetterSetterJavadoc1 { private int fieldName; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public GetterSetterJavadoc1() { } /** @@ -14,6 +15,7 @@ class GetterSetterJavadoc1 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -24,12 +26,14 @@ class GetterSetterJavadoc1 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof GetterSetterJavadoc1)) return false; @@ -40,12 +44,14 @@ class GetterSetterJavadoc1 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof GetterSetterJavadoc1; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -55,6 +61,7 @@ class GetterSetterJavadoc1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "GetterSetterJavadoc1(fieldName=" + this.getFieldName() + ")"; } @@ -71,6 +78,7 @@ class GetterSetterJavadoc2 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -81,6 +89,7 @@ class GetterSetterJavadoc2 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @@ -96,6 +105,7 @@ class GetterSetterJavadoc3 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getFieldName() { return this.fieldName; } @@ -105,6 +115,7 @@ class GetterSetterJavadoc3 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFieldName(final int fieldName) { this.fieldName = fieldName; } @@ -121,6 +132,7 @@ class GetterSetterJavadoc4 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int fieldName() { return this.fieldName; } @@ -132,6 +144,7 @@ class GetterSetterJavadoc4 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public GetterSetterJavadoc4 fieldName(final int fieldName) { this.fieldName = fieldName; return this; @@ -148,6 +161,7 @@ class GetterSetterJavadoc5 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int fieldName() { return this.fieldName; } @@ -158,6 +172,7 @@ class GetterSetterJavadoc5 { */ @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public GetterSetterJavadoc5 fieldName(final int fieldName) { this.fieldName = fieldName; return this; diff --git a/test/transform/resource/after-delombok/GetterWithDollar.java b/test/transform/resource/after-delombok/GetterWithDollar.java index 21e5fac8..5ee3774f 100644 --- a/test/transform/resource/after-delombok/GetterWithDollar.java +++ b/test/transform/resource/after-delombok/GetterWithDollar.java @@ -2,6 +2,7 @@ class GetterWithDollar1 { int $i; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int get$i() { return this.$i; } @@ -11,11 +12,13 @@ class GetterWithDollar2 { int i; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int get$i() { return this.$i; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getI() { return this.i; } diff --git a/test/transform/resource/after-delombok/InjectField.java b/test/transform/resource/after-delombok/InjectField.java index 8215f8d0..5adc5074 100644 --- a/test/transform/resource/after-delombok/InjectField.java +++ b/test/transform/resource/after-delombok/InjectField.java @@ -6,12 +6,16 @@ enum InjectField1 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName()); @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.lang.Object $LOCK = new java.lang.Object[0]; private static final String LOG_MESSAGE = "static initializer"; @@ -40,9 +44,11 @@ enum InjectField1 { class InjectField2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName()); @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; private static final String LOG_MESSAGE = "static initializer"; @@ -61,6 +67,7 @@ class InjectField2 { class InjectField3 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName()); static { log.log(Level.FINE, "static initializer"); diff --git a/test/transform/resource/after-delombok/LoggerCommons.java b/test/transform/resource/after-delombok/LoggerCommons.java index 85ad75b7..613c8c99 100644 --- a/test/transform/resource/after-delombok/LoggerCommons.java +++ b/test/transform/resource/after-delombok/LoggerCommons.java @@ -1,15 +1,18 @@ class LoggerCommons { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class); } class LoggerCommonsWithImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class); } class LoggerCommonsWithDifferentName { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("DifferentName"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerConfig.java b/test/transform/resource/after-delombok/LoggerConfig.java index fcfb118f..ab7671c6 100644 --- a/test/transform/resource/after-delombok/LoggerConfig.java +++ b/test/transform/resource/after-delombok/LoggerConfig.java @@ -1,5 +1,6 @@ class LoggerWithConfig { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private final org.slf4j.Logger myLogger = org.slf4j.LoggerFactory.getLogger(LoggerWithConfig.class); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerJBossLog.java b/test/transform/resource/after-delombok/LoggerJBossLog.java new file mode 100644 index 00000000..2c62da68 --- /dev/null +++ b/test/transform/resource/after-delombok/LoggerJBossLog.java @@ -0,0 +1,27 @@ +class LoggerJBossLog { + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLog.class); +} +class LoggerJBossLogWithImport { + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithImport.class); +} +class LoggerJBossLogOuter { + static class Inner { + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); + } +} + +class LoggerJBossLogWithDifferentLoggerName { + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger("DifferentLogger"); +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerJul.java b/test/transform/resource/after-delombok/LoggerJul.java index eabfb94a..66bb5099 100644 --- a/test/transform/resource/after-delombok/LoggerJul.java +++ b/test/transform/resource/after-delombok/LoggerJul.java @@ -1,15 +1,18 @@ class LoggerJul { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName()); } class LoggerJulWithImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName()); } class LoggerJulWithDifferentName { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("DifferentName"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerLog4j.java b/test/transform/resource/after-delombok/LoggerLog4j.java index 39667670..e161c9fe 100644 --- a/test/transform/resource/after-delombok/LoggerLog4j.java +++ b/test/transform/resource/after-delombok/LoggerLog4j.java @@ -1,15 +1,18 @@ class LoggerLog4j { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class); } class LoggerLog4jWithImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class); } class LoggerLog4jWithDifferentName { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("DifferentName"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerLog4j2.java b/test/transform/resource/after-delombok/LoggerLog4j2.java index 4d1ef01f..f0ae54db 100644 --- a/test/transform/resource/after-delombok/LoggerLog4j2.java +++ b/test/transform/resource/after-delombok/LoggerLog4j2.java @@ -1,15 +1,18 @@ class LoggerLog4j2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class); } class LoggerLog4j2WithImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class); } class LoggerLog4j2WithDifferentName { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger("DifferentName"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerSlf4j.java b/test/transform/resource/after-delombok/LoggerSlf4j.java index 91109145..3178bd63 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4j.java +++ b/test/transform/resource/after-delombok/LoggerSlf4j.java @@ -1,17 +1,20 @@ class LoggerSlf4j { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); } class LoggerSlf4jWithImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class); } class LoggerSlf4jOuter { static class Inner { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } @@ -19,5 +22,6 @@ class LoggerSlf4jOuter { class LoggerSlf4jWithDifferentLoggerName { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("DifferentLogger"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java index a4e13afc..0fa5615d 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java @@ -6,18 +6,21 @@ enum LoggerSlf4jTypesEnum { ; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class); } enum LoggerSlf4jTypesEnumWithElement { FOO; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class); } interface LoggerSlf4jTypesInterfaceOuter { class Inner { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java index 8a1d543f..b83a1140 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java @@ -2,12 +2,14 @@ package before; class LoggerSlf4jWithPackage { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class); } class LoggerSlf4jWithPackageOuter { static class Inner { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); } } diff --git a/test/transform/resource/after-delombok/LoggerXSlf4j.java b/test/transform/resource/after-delombok/LoggerXSlf4j.java index ec1c3e4e..7da0247c 100644 --- a/test/transform/resource/after-delombok/LoggerXSlf4j.java +++ b/test/transform/resource/after-delombok/LoggerXSlf4j.java @@ -1,15 +1,18 @@ class LoggerXSlf4j { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4j.class); } class LoggerXSlf4jWithImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithImport.class); } class LoggerXSlf4jWithDifferentName { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger("DifferentName"); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/MixGetterVal.java b/test/transform/resource/after-delombok/MixGetterVal.java index ee747e2a..d5c36f39 100644 --- a/test/transform/resource/after-delombok/MixGetterVal.java +++ b/test/transform/resource/after-delombok/MixGetterVal.java @@ -10,6 +10,7 @@ class MixGetterVal { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/MultiFieldGetter.java b/test/transform/resource/after-delombok/MultiFieldGetter.java index 8ed250e1..9d21e7f0 100644 --- a/test/transform/resource/after-delombok/MultiFieldGetter.java +++ b/test/transform/resource/after-delombok/MultiFieldGetter.java @@ -3,11 +3,13 @@ class MultiFieldGetter { int y; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected int getY() { return this.y; } @@ -17,11 +19,13 @@ class MultiFieldGetter2 { int y; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated int getY() { return this.y; } diff --git a/test/transform/resource/after-delombok/NoArgsConstructorForce.java b/test/transform/resource/after-delombok/NoArgsConstructorForce.java new file mode 100644 index 00000000..f0071a31 --- /dev/null +++ b/test/transform/resource/after-delombok/NoArgsConstructorForce.java @@ -0,0 +1,15 @@ + +public class NoArgsConstructorForce { + private final int[] i; + private final Object[] o; + private final java.util.List<?>[] fullQualifiedList; + + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public NoArgsConstructorForce() { + this.i = null; + this.o = null; + this.fullQualifiedList = null; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/NonNullPlain.java b/test/transform/resource/after-delombok/NonNullPlain.java index 52a80c1a..46f7699d 100644 --- a/test/transform/resource/after-delombok/NonNullPlain.java +++ b/test/transform/resource/after-delombok/NonNullPlain.java @@ -13,6 +13,7 @@ class NonNullPlain { @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) { if (s == null) { throw new java.lang.NullPointerException("s"); @@ -23,27 +24,32 @@ class NonNullPlain { @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getI() { return this.i; } @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getS() { return this.s; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Object getO() { return this.o; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setI(@lombok.NonNull final int i) { this.i = i; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setS(@lombok.NonNull final String s) { if (s == null) { throw new java.lang.NullPointerException("s"); @@ -52,6 +58,7 @@ class NonNullPlain { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setO(final Object o) { this.o = o; } diff --git a/test/transform/resource/after-delombok/NonNullWithAlternateException.java b/test/transform/resource/after-delombok/NonNullWithAlternateException.java index 9b606076..1c0179c0 100644 --- a/test/transform/resource/after-delombok/NonNullWithAlternateException.java +++ b/test/transform/resource/after-delombok/NonNullWithAlternateException.java @@ -9,6 +9,7 @@ public class NonNullWithAlternateException { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setTest(@lombok.NonNull final String test) { if (test == null) { throw new java.lang.IllegalArgumentException("test is null"); diff --git a/test/transform/resource/after-delombok/SetterAccessLevel.java b/test/transform/resource/after-delombok/SetterAccessLevel.java index 0bf20cd7..eff16797 100644 --- a/test/transform/resource/after-delombok/SetterAccessLevel.java +++ b/test/transform/resource/after-delombok/SetterAccessLevel.java @@ -7,26 +7,31 @@ class SetterAccessLevel { boolean value; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected void setProtected(final boolean isProtected) { this.isProtected = isProtected; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setValue(final boolean value) { this.value = value; } diff --git a/test/transform/resource/after-delombok/SetterAlreadyExists.java b/test/transform/resource/after-delombok/SetterAlreadyExists.java index 52e0ca10..5f492d07 100644 --- a/test/transform/resource/after-delombok/SetterAlreadyExists.java +++ b/test/transform/resource/after-delombok/SetterAlreadyExists.java @@ -24,6 +24,7 @@ class Setter5 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFoo(final String foo) { this.foo = foo; } @@ -34,6 +35,7 @@ class Setter6 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFoo(final String foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/SetterDeprecated.java b/test/transform/resource/after-delombok/SetterDeprecated.java index 7e984c6d..9d19d06c 100644 --- a/test/transform/resource/after-delombok/SetterDeprecated.java +++ b/test/transform/resource/after-delombok/SetterDeprecated.java @@ -8,6 +8,7 @@ class SetterDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setAnnotation(final int annotation) { this.annotation = annotation; } @@ -17,6 +18,7 @@ class SetterDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setJavadoc(final int javadoc) { this.javadoc = javadoc; } diff --git a/test/transform/resource/after-delombok/SetterOnClass.java b/test/transform/resource/after-delombok/SetterOnClass.java index eaf57def..2821ed05 100644 --- a/test/transform/resource/after-delombok/SetterOnClass.java +++ b/test/transform/resource/after-delombok/SetterOnClass.java @@ -3,6 +3,7 @@ class SetterOnClass1 { boolean isPublic; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @@ -13,11 +14,13 @@ class SetterOnClass2 { boolean isPackage; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected void setProtected(final boolean isProtected) { this.isProtected = isProtected; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @@ -27,6 +30,7 @@ class SetterOnClass3 { boolean isPackage; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } @@ -36,6 +40,7 @@ class SetterOnClass4 { boolean isPrivate; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @@ -45,6 +50,7 @@ class SetterOnClass5 { boolean isPublic; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setPublic(final boolean isPublic) { this.isPublic = isPublic; } @@ -55,11 +61,13 @@ class SetterOnClass6 { String nonNull; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setCouldBeNull(final String couldBeNull) { this.couldBeNull = couldBeNull; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setNonNull(@lombok.NonNull final String nonNull) { if (nonNull == null) { throw new java.lang.NullPointerException("nonNull"); diff --git a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java index c166f936..b9da6342 100644 --- a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java +++ b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java @@ -7,6 +7,7 @@ class SetterOnMethodOnParam { @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setI(final int i) { this.i = i; } @@ -14,6 +15,7 @@ class SetterOnMethodOnParam { @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setJ(@Test final int j) { this.j = j; } @@ -21,6 +23,7 @@ class SetterOnMethodOnParam { @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setK(@Test final int k) { this.k = k; } diff --git a/test/transform/resource/after-delombok/SetterOnStatic.java b/test/transform/resource/after-delombok/SetterOnStatic.java index a1947b36..4612df2b 100644 --- a/test/transform/resource/after-delombok/SetterOnStatic.java +++ b/test/transform/resource/after-delombok/SetterOnStatic.java @@ -3,11 +3,13 @@ class Setter { static int bar; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static void setFoo(final boolean foo) { Setter.foo = foo; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public static void setBar(final int bar) { Setter.bar = bar; } diff --git a/test/transform/resource/after-delombok/SetterPlain.java b/test/transform/resource/after-delombok/SetterPlain.java index 3f55bd21..3aaf89d5 100644 --- a/test/transform/resource/after-delombok/SetterPlain.java +++ b/test/transform/resource/after-delombok/SetterPlain.java @@ -3,11 +3,13 @@ class SetterPlain { int foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setI(final int i) { this.i = i; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setFoo(final int foo) { this.foo = foo; } diff --git a/test/transform/resource/after-delombok/SetterWithDollar.java b/test/transform/resource/after-delombok/SetterWithDollar.java index 3bdafa1b..cd8b0f21 100644 --- a/test/transform/resource/after-delombok/SetterWithDollar.java +++ b/test/transform/resource/after-delombok/SetterWithDollar.java @@ -4,6 +4,8 @@ class SetterWithDollar1 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void set$i(final int $i) { this.$i = $i; } @@ -15,11 +17,14 @@ class SetterWithDollar2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void set$i(final int $i) { this.$i = $i; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public void setI(final int i) { this.i = i; } diff --git a/test/transform/resource/after-delombok/SimpleTypeResolution.java b/test/transform/resource/after-delombok/SimpleTypeResolution.java index 1e45bb79..0360e80e 100644 --- a/test/transform/resource/after-delombok/SimpleTypeResolution.java +++ b/test/transform/resource/after-delombok/SimpleTypeResolution.java @@ -6,6 +6,7 @@ class SimpleTypeResolutionSuccess { private int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/SynchronizedPlain.java b/test/transform/resource/after-delombok/SynchronizedPlain.java index f0082faf..4e9ecac1 100644 --- a/test/transform/resource/after-delombok/SynchronizedPlain.java +++ b/test/transform/resource/after-delombok/SynchronizedPlain.java @@ -1,6 +1,7 @@ class SynchronizedPlain1 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; void test() { synchronized (this.$lock) { @@ -16,6 +17,7 @@ class SynchronizedPlain1 { class SynchronizedPlain2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private static final java.lang.Object $LOCK = new java.lang.Object[0]; static void test() { synchronized (SynchronizedPlain2.$LOCK) { diff --git a/test/transform/resource/after-delombok/ToStringConfiguration.java b/test/transform/resource/after-delombok/ToStringConfiguration.java index c44f8b75..85d02c61 100644 --- a/test/transform/resource/after-delombok/ToStringConfiguration.java +++ b/test/transform/resource/after-delombok/ToStringConfiguration.java @@ -3,11 +3,13 @@ class ToStringConfiguration { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration(" + this.x + ")"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @@ -17,6 +19,7 @@ class ToStringConfiguration2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration2(x=" + this.x + ")"; } @@ -26,11 +29,13 @@ class ToStringConfiguration3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringConfiguration3(" + this.getX() + ")"; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/ToStringInner.java b/test/transform/resource/after-delombok/ToStringInner.java index e8cea8fd..095b8c05 100644 --- a/test/transform/resource/after-delombok/ToStringInner.java +++ b/test/transform/resource/after-delombok/ToStringInner.java @@ -6,6 +6,7 @@ class ToStringOuter { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringInner(y=" + this.y + ")"; } @@ -15,6 +16,7 @@ class ToStringOuter { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringStaticInner(y=" + this.y + ")"; } @@ -25,6 +27,7 @@ class ToStringOuter { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name + ")"; } @@ -34,6 +37,7 @@ class ToStringOuter { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToStringOuter(x=" + this.x + ", name=" + this.name + ")"; } diff --git a/test/transform/resource/after-delombok/ToStringPlain.java b/test/transform/resource/after-delombok/ToStringPlain.java index a4265575..07bb0a87 100644 --- a/test/transform/resource/after-delombok/ToStringPlain.java +++ b/test/transform/resource/after-delombok/ToStringPlain.java @@ -4,6 +4,7 @@ class ToString1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToString1(x=" + this.x + ", name=" + this.name + ")"; } @@ -14,6 +15,7 @@ class ToString2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ToString2(x=" + this.x + ", name=" + this.name + ")"; } diff --git a/test/transform/resource/after-delombok/Tolerate.java b/test/transform/resource/after-delombok/Tolerate.java index 387739af..089f732f 100644 --- a/test/transform/resource/after-delombok/Tolerate.java +++ b/test/transform/resource/after-delombok/Tolerate.java @@ -12,6 +12,8 @@ class Tolerate { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public void setPattern(final Pattern pattern) { this.pattern = pattern; } @@ -19,6 +21,8 @@ class Tolerate { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public Pattern getPattern() { return this.pattern; } @@ -38,6 +42,8 @@ class Tolerate2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public Pattern getPattern() { return this.pattern; } @@ -45,6 +51,8 @@ class Tolerate2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + + @lombok.Generated public Tolerate2 withPattern(final Pattern pattern) { return this.pattern == pattern ? this : new Tolerate2(pattern); } @@ -52,6 +60,7 @@ class Tolerate2 { @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Tolerate2(final Pattern pattern) { this.pattern = pattern; } diff --git a/test/transform/resource/after-delombok/TrickyTypeResolution.java b/test/transform/resource/after-delombok/TrickyTypeResolution.java index 6badfbf4..05a31da6 100644 --- a/test/transform/resource/after-delombok/TrickyTypeResolution.java +++ b/test/transform/resource/after-delombok/TrickyTypeResolution.java @@ -15,6 +15,7 @@ class TrickySuccess { int x; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } diff --git a/test/transform/resource/after-delombok/UtilityClass.java b/test/transform/resource/after-delombok/UtilityClass.java index 6b3c1761..80bb1b7c 100644 --- a/test/transform/resource/after-delombok/UtilityClass.java +++ b/test/transform/resource/after-delombok/UtilityClass.java @@ -8,6 +8,7 @@ final class UtilityClass { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private UtilityClass() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -18,6 +19,7 @@ class UtilityInner { static int member; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private InnerInnerInner() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -29,6 +31,7 @@ class UtilityInner { static int member; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private InsideEnum() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -39,6 +42,7 @@ class UtilityInner { static int member; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private InsideInterface() { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } diff --git a/test/transform/resource/after-delombok/ValFinal.java b/test/transform/resource/after-delombok/ValFinal.java new file mode 100644 index 00000000..d35ca713 --- /dev/null +++ b/test/transform/resource/after-delombok/ValFinal.java @@ -0,0 +1,5 @@ +public class ValFinal { + public void test() { + final int x = 10; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/ValInLambda.java b/test/transform/resource/after-delombok/ValInLambda.java new file mode 100644 index 00000000..7ce1e1b4 --- /dev/null +++ b/test/transform/resource/after-delombok/ValInLambda.java @@ -0,0 +1,18 @@ +// version 8: +class ValInLambda { + Runnable foo = (Runnable) () -> { + final int i = 1; + }; + + public void easyLambda() { + Runnable foo = (Runnable) () -> { + final int i = 1; + }; + } + + public void easyIntersectionLambda() { + Runnable foo = (Runnable) () -> { + final int i = 1; + }; + } +} diff --git a/test/transform/resource/after-delombok/ValNullInit.java b/test/transform/resource/after-delombok/ValNullInit.java new file mode 100644 index 00000000..f0834a63 --- /dev/null +++ b/test/transform/resource/after-delombok/ValNullInit.java @@ -0,0 +1,5 @@ +class ValNullInit { + void method() { + final java.lang.Object x = null; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/ValueCallSuper.java b/test/transform/resource/after-delombok/ValueCallSuper.java new file mode 100644 index 00000000..79dcead3 --- /dev/null +++ b/test/transform/resource/after-delombok/ValueCallSuper.java @@ -0,0 +1,44 @@ +class ValueParent { +} +final class ValueCallSuper extends ValueParent { + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public ValueCallSuper() { + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof ValueCallSuper)) return false; + final ValueCallSuper other = (ValueCallSuper) o; + if (!other.canEqual((java.lang.Object) this)) return false; + if (!super.equals(o)) return false; + return true; + } + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + protected boolean canEqual(final java.lang.Object other) { + return other instanceof ValueCallSuper; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = result * PRIME + super.hashCode(); + return result; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + @javax.annotation.Generated("lombok") + @lombok.Generated + public java.lang.String toString() { + return "ValueCallSuper()"; + } +} diff --git a/test/transform/resource/after-delombok/ValueExperimental.java b/test/transform/resource/after-delombok/ValueExperimental.java index 20e7a9f4..723cfe87 100644 --- a/test/transform/resource/after-delombok/ValueExperimental.java +++ b/test/transform/resource/after-delombok/ValueExperimental.java @@ -1,11 +1,13 @@ final class ValueExperimental1 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueExperimental1() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueExperimental1)) return false; @@ -14,6 +16,7 @@ final class ValueExperimental1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -21,6 +24,7 @@ final class ValueExperimental1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ValueExperimental1()"; } @@ -28,11 +32,13 @@ final class ValueExperimental1 { final class ValueExperimental2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueExperimental2() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueExperimental2)) return false; @@ -41,6 +47,7 @@ final class ValueExperimental2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -48,6 +55,7 @@ final class ValueExperimental2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ValueExperimental2()"; } diff --git a/test/transform/resource/after-delombok/ValueExperimentalStarImport.java b/test/transform/resource/after-delombok/ValueExperimentalStarImport.java index ea9c4600..add5b3d6 100644 --- a/test/transform/resource/after-delombok/ValueExperimentalStarImport.java +++ b/test/transform/resource/after-delombok/ValueExperimentalStarImport.java @@ -2,12 +2,14 @@ import lombok.experimental.*; final class ValueExperimentalStarImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueExperimentalStarImport() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueExperimentalStarImport)) return false; @@ -16,6 +18,7 @@ final class ValueExperimentalStarImport { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -23,6 +26,7 @@ final class ValueExperimentalStarImport { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ValueExperimentalStarImport()"; } diff --git a/test/transform/resource/after-delombok/ValuePlain.java b/test/transform/resource/after-delombok/ValuePlain.java index 056cdacf..f20f4aea 100644 --- a/test/transform/resource/after-delombok/ValuePlain.java +++ b/test/transform/resource/after-delombok/ValuePlain.java @@ -4,23 +4,27 @@ final class Value1 { @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Value1(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value1)) return false; @@ -34,6 +38,7 @@ final class Value1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -45,6 +50,7 @@ final class Value1 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Value1(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -55,23 +61,27 @@ class Value2 { @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Value2(final int x, final String name) { this.x = x; this.name = name; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public String getName() { return this.name; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value2)) return false; @@ -85,12 +95,14 @@ class Value2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected boolean canEqual(final java.lang.Object other) { return other instanceof Value2; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -102,6 +114,7 @@ class Value2 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Value2(x=" + this.getX() + ", name=" + this.getName() + ")"; } @@ -112,23 +125,27 @@ final class Value3 { @java.beans.ConstructorProperties({"x", "y"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Value3(final int x, final int y) { this.x = x; this.y = y; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getX() { return this.x; } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int getY() { return this.y; } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof Value3)) return false; @@ -140,6 +157,7 @@ final class Value3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { final int PRIME = 59; int result = 1; @@ -150,6 +168,7 @@ final class Value3 { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "Value3(x=" + this.getX() + ", y=" + this.getY() + ")"; } diff --git a/test/transform/resource/after-delombok/ValueStaticField.java b/test/transform/resource/after-delombok/ValueStaticField.java index cec136f4..d5334869 100644 --- a/test/transform/resource/after-delombok/ValueStaticField.java +++ b/test/transform/resource/after-delombok/ValueStaticField.java @@ -1,13 +1,15 @@ final class ValueStaticField { - private static int x; - private static final String PASSWORD = "Ken sent me"; + static int x; + static String PASSWORD = "Ken sent me"; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public ValueStaticField() { } @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public boolean equals(final java.lang.Object o) { if (o == this) return true; if (!(o instanceof ValueStaticField)) return false; @@ -16,6 +18,7 @@ final class ValueStaticField { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public int hashCode() { int result = 1; return result; @@ -23,6 +26,7 @@ final class ValueStaticField { @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public java.lang.String toString() { return "ValueStaticField()"; } diff --git a/test/transform/resource/after-delombok/VarComplex.java b/test/transform/resource/after-delombok/VarComplex.java new file mode 100644 index 00000000..10b33943 --- /dev/null +++ b/test/transform/resource/after-delombok/VarComplex.java @@ -0,0 +1,20 @@ +public class VarComplex { + private String field = ""; + private static final int CONSTANT = 20; + public void testComplex() { + char[] shouldBeCharArray = field.toCharArray(); + int shouldBeInt = CONSTANT; + java.lang.Object lock = new Object(); + synchronized (lock) { + int field = 20; //Shadowing + int inner = 10; + switch (field) { + case 5: + char[] shouldBeCharArray2 = shouldBeCharArray; + int innerInner = inner; + + } + } + java.lang.String shouldBeString = field; //Unshadowing + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/VarInFor.java b/test/transform/resource/after-delombok/VarInFor.java new file mode 100644 index 00000000..363aeeff --- /dev/null +++ b/test/transform/resource/after-delombok/VarInFor.java @@ -0,0 +1,9 @@ +public class VarInFor { + public void enhancedFor() { + int[] list = new int[] {1, 2}; + for (int shouldBeInt : list) { + System.out.println(shouldBeInt); + int shouldBeInt2 = shouldBeInt; + } + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/VarInForOld.java b/test/transform/resource/after-delombok/VarInForOld.java new file mode 100644 index 00000000..bb510c0b --- /dev/null +++ b/test/transform/resource/after-delombok/VarInForOld.java @@ -0,0 +1,7 @@ +public class VarInForOld { + public void oldFor() { + for (int i = 0; i < 100; ++i) { + System.out.println(i); + } + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/VarModifier.java b/test/transform/resource/after-delombok/VarModifier.java new file mode 100644 index 00000000..9838cdf7 --- /dev/null +++ b/test/transform/resource/after-delombok/VarModifier.java @@ -0,0 +1,7 @@ +public class VarModifier { + private String field = ""; + public void testComplex() { + final char[] shouldBeFinalCharArray = field.toCharArray(); + char[] shouldBeCharArray = field.toCharArray(); + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/VarNullInit.java b/test/transform/resource/after-delombok/VarNullInit.java new file mode 100644 index 00000000..8ec2ea73 --- /dev/null +++ b/test/transform/resource/after-delombok/VarNullInit.java @@ -0,0 +1,6 @@ + +public class VarNullInit { + void method() { + java.lang.Object x = null; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/WitherAccessLevel.java b/test/transform/resource/after-delombok/WitherAccessLevel.java index 7ec03215..b828c5c6 100644 --- a/test/transform/resource/after-delombok/WitherAccessLevel.java +++ b/test/transform/resource/after-delombok/WitherAccessLevel.java @@ -9,26 +9,31 @@ class WitherAccessLevel { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated private WitherAccessLevel withPrivate(final boolean isPrivate) { return this.isPrivate == isPrivate ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated WitherAccessLevel withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected WitherAccessLevel withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherAccessLevel withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherAccessLevel withValue(final boolean value) { return this.value == value ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value); } diff --git a/test/transform/resource/after-delombok/WitherAlreadyExists.java b/test/transform/resource/after-delombok/WitherAlreadyExists.java index 48dda94d..352d3f18 100644 --- a/test/transform/resource/after-delombok/WitherAlreadyExists.java +++ b/test/transform/resource/after-delombok/WitherAlreadyExists.java @@ -34,6 +34,7 @@ class Wither5 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Wither5 withFoo(final String foo) { return this.foo == foo ? this : new Wither5(foo); } @@ -46,6 +47,7 @@ class Wither6 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public Wither6 withFoo(final String foo) { return this.foo == foo ? this : new Wither6(foo); } diff --git a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java index 2ffd310c..f285d75d 100644 --- a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java +++ b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java @@ -7,6 +7,7 @@ class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> { @java.beans.ConstructorProperties({"test", "test2", "y", "z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) { this.test = test; this.test2 = test2; @@ -15,11 +16,13 @@ class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherAndAllArgsConstructor<T, J, L> withTest(final J test) { return this.test == test ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) { return this.test2 == test2 ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z); } diff --git a/test/transform/resource/after-delombok/WitherDeprecated.java b/test/transform/resource/after-delombok/WitherDeprecated.java index 712bd603..18fb598f 100644 --- a/test/transform/resource/after-delombok/WitherDeprecated.java +++ b/test/transform/resource/after-delombok/WitherDeprecated.java @@ -10,6 +10,7 @@ class WitherDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherDeprecated withAnnotation(final int annotation) { return this.annotation == annotation ? this : new WitherDeprecated(annotation, this.javadoc); } @@ -19,6 +20,7 @@ class WitherDeprecated { @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherDeprecated withJavadoc(final int javadoc) { return this.javadoc == javadoc ? this : new WitherDeprecated(this.annotation, javadoc); } diff --git a/test/transform/resource/after-delombok/WitherOnClass.java b/test/transform/resource/after-delombok/WitherOnClass.java index ae352d33..98c789e8 100644 --- a/test/transform/resource/after-delombok/WitherOnClass.java +++ b/test/transform/resource/after-delombok/WitherOnClass.java @@ -5,6 +5,7 @@ class WitherOnClass1 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherOnClass1 withPublic(final boolean isPublic) { return this.isPublic == isPublic ? this : new WitherOnClass1(this.isNone, isPublic); } @@ -17,11 +18,13 @@ class WitherOnClass2 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated protected WitherOnClass2 withProtected(final boolean isProtected) { return this.isProtected == isProtected ? this : new WitherOnClass2(this.isNone, isProtected, this.isPackage); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated WitherOnClass2 withPackage(final boolean isPackage) { return this.isPackage == isPackage ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage); } @@ -34,11 +37,13 @@ class WitherOnClass3 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherOnClass3 withCouldBeNull(final String couldBeNull) { return this.couldBeNull == couldBeNull ? this : new WitherOnClass3(couldBeNull, this.nonNull); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherOnClass3 withNonNull(@lombok.NonNull final String nonNull) { if (nonNull == null) { throw new java.lang.NullPointerException("nonNull"); @@ -54,6 +59,7 @@ class WitherOnClass4 { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherOnClass4 withY(final int fY) { return this.fY == fY ? this : new WitherOnClass4(fY); } diff --git a/test/transform/resource/after-delombok/WitherPlain.java b/test/transform/resource/after-delombok/WitherPlain.java index 548ff299..3a0d42f7 100644 --- a/test/transform/resource/after-delombok/WitherPlain.java +++ b/test/transform/resource/after-delombok/WitherPlain.java @@ -7,11 +7,13 @@ class WitherPlain { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherPlain withI(final int i) { return this.i == i ? this : new WitherPlain(i, this.foo); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherPlain withFoo(final int foo) { return this.foo == foo ? this : new WitherPlain(this.i, foo); } diff --git a/test/transform/resource/after-delombok/WitherWithAbstract.java b/test/transform/resource/after-delombok/WitherWithAbstract.java index d5bfeef8..5acb8e84 100644 --- a/test/transform/resource/after-delombok/WitherWithAbstract.java +++ b/test/transform/resource/after-delombok/WitherWithAbstract.java @@ -2,5 +2,6 @@ abstract class WitherWithAbstract { String foo; @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public abstract WitherWithAbstract withFoo(final String foo); }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/WitherWithGenerics.java b/test/transform/resource/after-delombok/WitherWithGenerics.java index fd466559..c124276d 100644 --- a/test/transform/resource/after-delombok/WitherWithGenerics.java +++ b/test/transform/resource/after-delombok/WitherWithGenerics.java @@ -7,16 +7,19 @@ class WitherWithGenerics<T, J extends T, L extends java.lang.Number> { } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherWithGenerics<T, J, L> withTest(final J test) { return this.test == test ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { return this.test2 == test2 ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3); } @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") + @lombok.Generated public WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { return this.test3 == test3 ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3); } diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java index 450c35fa..09b94c8e 100644 --- a/test/transform/resource/after-ecj/Accessors.java +++ b/test/transform/resource/after-ecj/Accessors.java @@ -3,10 +3,10 @@ class AccessorsFluent { AccessorsFluent() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String fieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluent fieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AccessorsFluent fieldName(final String fieldName) { this.fieldName = fieldName; return this; } @@ -17,14 +17,14 @@ class AccessorsFluent { AccessorsFluentOnClass() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluentOnClass fieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AccessorsFluentOnClass fieldName(final String fieldName) { this.fieldName = fieldName; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String fieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getOtherFieldWithOverride() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getOtherFieldWithOverride() { return this.otherFieldWithOverride; } } @@ -33,7 +33,7 @@ class AccessorsChain { AccessorsChain() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsChain setRunning(final boolean isRunning) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AccessorsChain setRunning(final boolean isRunning) { this.isRunning = isRunning; return this; } @@ -44,7 +44,7 @@ class AccessorsChain { AccessorsPrefix() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setActualField(final String fActualField) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setActualField(final String fActualField) { this.fActualField = fActualField; } } @@ -54,10 +54,10 @@ class AccessorsChain { AccessorsPrefix2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final String fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFieldName(final String fieldName) { this.fieldName = fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setActualField(final String fActualField) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setActualField(final String fActualField) { this.fActualField = fActualField; } } @@ -69,10 +69,10 @@ class AccessorsChain { private String getName() { return fName; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("AccessorsPrefix3(fName=" + this.getName()) + ")"); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof AccessorsPrefix3))) @@ -86,10 +86,10 @@ class AccessorsChain { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof AccessorsPrefix3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $fName = this.getName(); @@ -102,7 +102,7 @@ class AccessorsFluentGenerics<T extends Number> { AccessorsFluentGenerics() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluentGenerics<T> name(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AccessorsFluentGenerics<T> name(final String name) { this.name = name; return this; } @@ -112,7 +112,7 @@ class AccessorsFluentNoChaining { AccessorsFluentNoChaining() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void name(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void name(final String name) { this.name = name; } } @@ -123,7 +123,7 @@ class AccessorsFluentStatic<T extends Number> { AccessorsFluentStatic() { super(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void name(final String name) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void name(final String name) { AccessorsFluentStatic.name = name; } } diff --git a/test/transform/resource/after-ecj/AccessorsConfiguration.java b/test/transform/resource/after-ecj/AccessorsConfiguration.java index fdf2ff85..7db470c5 100644 --- a/test/transform/resource/after-ecj/AccessorsConfiguration.java +++ b/test/transform/resource/after-ecj/AccessorsConfiguration.java @@ -3,10 +3,10 @@ class AccessorsConfiguration { AccessorsConfiguration() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String fieldName() { return this.m_FieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void fieldName(final String m_FieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void fieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } } @@ -15,7 +15,7 @@ class AccessorsConfiguration { AccessorsConfiguration2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setM_FieldName(final String m_FieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setM_FieldName(final String m_FieldName) { this.m_FieldName = m_FieldName; } } @@ -24,7 +24,7 @@ class AccessorsConfiguration { AccessorsConfiguration3() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsConfiguration3 setFieldName(final String fFieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AccessorsConfiguration3 setFieldName(final String fFieldName) { this.fFieldName = fFieldName; return this; } diff --git a/test/transform/resource/after-ecj/BuilderChainAndFluent.java b/test/transform/resource/after-ecj/BuilderChainAndFluent.java index 1554cf44..78d0bdec 100644 --- a/test/transform/resource/after-ecj/BuilderChainAndFluent.java +++ b/test/transform/resource/after-ecj/BuilderChainAndFluent.java @@ -1,25 +1,25 @@ @lombok.experimental.Builder(fluent = false,chain = false) class BuilderChainAndFluent { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderChainAndFluentBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluentBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderChainAndFluentBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int yes; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderChainAndFluentBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setYes(final int yes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setYes(final int yes) { this.yes = yes; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluent build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderChainAndFluent build() { return new BuilderChainAndFluent(yes); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes) + ")"); } } private final int yes; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluent(final int yes) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderChainAndFluent(final int yes) { super(); this.yes = yes; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluentBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderChainAndFluentBuilder builder() { return new BuilderChainAndFluentBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java index c63ad8e6..48995923 100644 --- a/test/transform/resource/after-ecj/BuilderComplex.java +++ b/test/transform/resource/after-ecj/BuilderComplex.java @@ -1,34 +1,34 @@ import java.util.List; import lombok.experimental.Builder; class BuilderComplex { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class VoidBuilder<T extends Number> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T number; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int arg2; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String arg3; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderComplex selfRef; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class VoidBuilder<T extends Number> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated T number; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int arg2; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String arg3; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderComplex selfRef; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> number(final T number) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> number(final T number) { this.number = number; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> arg2(final int arg2) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> arg2(final int arg2) { this.arg2 = arg2; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> arg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> arg3(final String arg3) { this.arg3 = arg3; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> selfRef(final BuilderComplex selfRef) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated VoidBuilder<T> selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void execute() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void execute() { BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((("BuilderComplex.VoidBuilder(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")"); } } @@ -37,7 +37,7 @@ class BuilderComplex { } private static @Builder(buildMethodName = "execute") <T extends Number>void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) { } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>VoidBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T extends Number>VoidBuilder<T> builder() { return new VoidBuilder<T>(); } } diff --git a/test/transform/resource/after-ecj/BuilderInstanceMethod.java b/test/transform/resource/after-ecj/BuilderInstanceMethod.java index ff7d0aab..985e8e1c 100644 --- a/test/transform/resource/after-ecj/BuilderInstanceMethod.java +++ b/test/transform/resource/after-ecj/BuilderInstanceMethod.java @@ -1,33 +1,33 @@ import java.util.List; class BuilderInstanceMethod<T> { - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class StringBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int show; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") List<T> also; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int $andMe; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class StringBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int show; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int yes; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated List<T> also; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int $andMe; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder show(final int show) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder show(final int show) { this.show = show; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder yes(final int yes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder yes(final int yes) { this.yes = yes; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder also(final List<T> also) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder also(final List<T> also) { this.also = also; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder $andMe(final int $andMe) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String build() { return BuilderInstanceMethod.this.create(show, yes, also, $andMe); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((("BuilderInstanceMethod.StringBuilder(show=" + this.show) + ", yes=") + this.yes) + ", also=") + this.also) + ", $andMe=") + this.$andMe) + ")"); } } @@ -37,7 +37,7 @@ class BuilderInstanceMethod<T> { public @lombok.Builder String create(int show, final int yes, List<T> also, int $andMe) { return (((("" + show) + yes) + also) + $andMe); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StringBuilder builder() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StringBuilder builder() { return new StringBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSimple.java b/test/transform/resource/after-ecj/BuilderSimple.java index c2b4fe87..c235201e 100644 --- a/test/transform/resource/after-ecj/BuilderSimple.java +++ b/test/transform/resource/after-ecj/BuilderSimple.java @@ -1,23 +1,23 @@ import java.util.List; -@lombok.experimental.Builder class BuilderSimple<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSimpleBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") List<T> also; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder() { +@lombok.Builder class BuilderSimple<T> { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSimpleBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int yes; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated List<T> also; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSimpleBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder<T> yes(final int yes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSimpleBuilder<T> yes(final int yes) { this.yes = yes; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder<T> also(final List<T> also) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSimpleBuilder<T> also(final List<T> also) { this.also = also; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimple<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSimple<T> build() { return new BuilderSimple<T>(yes, also); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes) + ", also=") + this.also) + ")"); } } @@ -25,12 +25,12 @@ import java.util.List; private final int yes; private List<T> also; private int $butNotMe; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimple(final int yes, final List<T> also) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSimple(final int yes, final List<T> also) { super(); this.yes = yes; this.also = also; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSimpleBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>BuilderSimpleBuilder<T> builder() { return new BuilderSimpleBuilder<T>(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java index 5cf9f4ac..2a596964 100644 --- a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java @@ -5,96 +5,96 @@ import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.ImmutableTable; import lombok.Singular; @lombok.Builder class BuilderSingularGuavaListsSets<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularGuavaListsSetsBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<T> cards; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<Number> frogs; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedSet.Builder<String> passes; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularGuavaListsSetsBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableList.Builder<T> cards; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableList.Builder<Number> frogs; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableSortedSet.Builder<String> passes; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> card(T card) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> card(T card) { if ((this.cards == null)) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> cards(java.lang.Iterable<? extends T> cards) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> cards(java.lang.Iterable<? extends T> cards) { if ((this.cards == null)) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearCards() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> clearCards() { this.cards = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> frog(Number frog) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> frog(Number frog) { if ((this.frogs == null)) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> frogs(java.lang.Iterable<? extends Number> frogs) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> frogs(java.lang.Iterable<? extends Number> frogs) { if ((this.frogs == null)) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() { this.frogs = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Iterable<?> rawSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Iterable<?> rawSet) { if ((this.rawSet == null)) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() { this.rawSet = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> pass(String pass) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> pass(String pass) { if ((this.passes == null)) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> passes(java.lang.Iterable<? extends String> passes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> passes(java.lang.Iterable<? extends String> passes) { if ((this.passes == null)) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearPasses() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> clearPasses() { this.passes = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> user(Number rowKey, Number columnKey, String value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> user(Number rowKey, Number columnKey, String value) { if ((this.users == null)) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.put(rowKey, columnKey, value); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> users(com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> users(com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) { if ((this.users == null)) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.putAll(users); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> clearUsers() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSetsBuilder<T> clearUsers() { this.users = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSets<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSets<T> build() { com.google.common.collect.ImmutableList<T> cards = ((this.cards == null) ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build()); com.google.common.collect.ImmutableCollection<Number> frogs = ((this.frogs == null) ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build()); com.google.common.collect.ImmutableSet<java.lang.Object> rawSet = ((this.rawSet == null) ? com.google.common.collect.ImmutableSet.<java.lang.Object>of() : this.rawSet.build()); @@ -102,7 +102,7 @@ import lombok.Singular; com.google.common.collect.ImmutableTable<Number, Number, String> users = ((this.users == null) ? com.google.common.collect.ImmutableTable.<Number, Number, String>of() : this.users.build()); return new BuilderSingularGuavaListsSets<T>(cards, frogs, rawSet, passes, users); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((((("BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ", users=") + this.users) + ")"); } } @@ -111,7 +111,7 @@ import lombok.Singular; private @SuppressWarnings("all") @Singular("rawSet") ImmutableSet rawSet; private @Singular ImmutableSortedSet<String> passes; private @Singular ImmutableTable<? extends Number, ? extends Number, String> users; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) { super(); this.cards = cards; this.frogs = frogs; @@ -119,7 +119,7 @@ import lombok.Singular; this.passes = passes; this.users = users; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularGuavaListsSetsBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>BuilderSingularGuavaListsSetsBuilder<T> builder() { return new BuilderSingularGuavaListsSetsBuilder<T>(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java index 378ec309..1988f097 100644 --- a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java @@ -3,81 +3,81 @@ import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableSortedMap; import lombok.Singular; @lombok.Builder class BuilderSingularGuavaMaps<K, V> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularGuavaMapsBuilder<K, V> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularGuavaMapsBuilder<K, V> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> battleaxe(K key, V value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> battleaxe(K key, V value) { if ((this.battleaxes == null)) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.put(key, value); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> battleaxes(java.util.Map<? extends K, ? extends V> battleaxes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> battleaxes(java.util.Map<? extends K, ? extends V> battleaxes) { if ((this.battleaxes == null)) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.putAll(battleaxes); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() { this.battleaxes = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> vertex(Integer key, V value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> vertex(Integer key, V value) { if ((this.vertices == null)) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.put(key, value); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> vertices(java.util.Map<? extends Integer, ? extends V> vertices) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> vertices(java.util.Map<? extends Integer, ? extends V> vertices) { if ((this.vertices == null)) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.putAll(vertices); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> clearVertices() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> clearVertices() { this.vertices = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.lang.Object key, java.lang.Object value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.lang.Object key, java.lang.Object value) { if ((this.rawMap == null)) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.put(key, value); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) { if ((this.rawMap == null)) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.putAll(rawMap); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() { this.rawMap = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMaps<K, V> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMaps<K, V> build() { com.google.common.collect.ImmutableMap<K, V> battleaxes = ((this.battleaxes == null) ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build()); com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = ((this.vertices == null) ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build()); com.google.common.collect.ImmutableBiMap<java.lang.Object, java.lang.Object> rawMap = ((this.rawMap == null) ? com.google.common.collect.ImmutableBiMap.<java.lang.Object, java.lang.Object>of() : this.rawMap.build()); return new BuilderSingularGuavaMaps<K, V>(battleaxes, vertices, rawMap); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")"); } } private @Singular ImmutableMap<K, V> battleaxes; private @Singular ImmutableSortedMap<Integer, ? extends V> vertices; private @SuppressWarnings("all") @Singular("rawMap") ImmutableBiMap rawMap; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) { super(); this.battleaxes = battleaxes; this.vertices = vertices; this.rawMap = rawMap; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() { return new BuilderSingularGuavaMapsBuilder<K, V>(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularLists.java b/test/transform/resource/after-ecj/BuilderSingularLists.java index e1036262..3293870a 100644 --- a/test/transform/resource/after-ecj/BuilderSingularLists.java +++ b/test/transform/resource/after-ecj/BuilderSingularLists.java @@ -3,65 +3,65 @@ import java.util.Collection; import lombok.Singular; @lombok.Builder class BuilderSingularLists<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularListsBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> children; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> scarves; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawList; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularListsBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<T> children; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<Number> scarves; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<java.lang.Object> rawList; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> child(T child) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> child(T child) { if ((this.children == null)) this.children = new java.util.ArrayList<T>(); this.children.add(child); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> children(java.util.Collection<? extends T> children) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> children(java.util.Collection<? extends T> children) { if ((this.children == null)) this.children = new java.util.ArrayList<T>(); this.children.addAll(children); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> clearChildren() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> clearChildren() { if ((this.children != null)) this.children.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> scarf(Number scarf) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> scarf(Number scarf) { if ((this.scarves == null)) this.scarves = new java.util.ArrayList<Number>(); this.scarves.add(scarf); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> scarves(java.util.Collection<? extends Number> scarves) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> scarves(java.util.Collection<? extends Number> scarves) { if ((this.scarves == null)) this.scarves = new java.util.ArrayList<Number>(); this.scarves.addAll(scarves); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> clearScarves() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> clearScarves() { if ((this.scarves != null)) this.scarves.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> rawList(java.lang.Object rawList) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> rawList(java.lang.Object rawList) { if ((this.rawList == null)) this.rawList = new java.util.ArrayList<java.lang.Object>(); this.rawList.add(rawList); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> rawList(java.util.Collection<?> rawList) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> rawList(java.util.Collection<?> rawList) { if ((this.rawList == null)) this.rawList = new java.util.ArrayList<java.lang.Object>(); this.rawList.addAll(rawList); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> clearRawList() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularListsBuilder<T> clearRawList() { if ((this.rawList != null)) this.rawList.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularLists<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularLists<T> build() { java.util.List<T> children; switch (((this.children == null) ? 0 : this.children.size())) { case 0 : @@ -97,20 +97,20 @@ import lombok.Singular; } return new BuilderSingularLists<T>(children, scarves, rawList); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")"); } } private @Singular List<T> children; private @Singular Collection<? extends Number> scarves; private @SuppressWarnings("all") @Singular("rawList") List rawList; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) { super(); this.children = children; this.scarves = scarves; this.rawList = rawList; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularListsBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>BuilderSingularListsBuilder<T> builder() { return new BuilderSingularListsBuilder<T>(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingularMaps.java b/test/transform/resource/after-ecj/BuilderSingularMaps.java index 38ac0ed7..7e778452 100644 --- a/test/transform/resource/after-ecj/BuilderSingularMaps.java +++ b/test/transform/resource/after-ecj/BuilderSingularMaps.java @@ -2,19 +2,19 @@ import java.util.Map; import java.util.SortedMap; import lombok.Singular; @lombok.Builder class BuilderSingularMaps<K, V> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularMapsBuilder<K, V> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<K> women$key; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<V> women$value; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<K> men$key; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> men$value; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawMap$key; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawMap$value; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> stringMap$key; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<V> stringMap$value; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularMapsBuilder<K, V> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<K> women$key; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<V> women$value; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<K> men$key; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<Number> men$value; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<java.lang.Object> rawMap$key; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<java.lang.Object> rawMap$value; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> stringMap$key; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<V> stringMap$value; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) { if ((this.women$key == null)) { this.women$key = new java.util.ArrayList<K>(); @@ -24,7 +24,7 @@ import lombok.Singular; this.women$value.add(womanValue); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) { if ((this.women$key == null)) { this.women$key = new java.util.ArrayList<K>(); @@ -37,7 +37,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearWomen() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> clearWomen() { if ((this.women$key != null)) { this.women$key.clear(); @@ -45,7 +45,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) { if ((this.men$key == null)) { this.men$key = new java.util.ArrayList<K>(); @@ -55,7 +55,7 @@ import lombok.Singular; this.men$value.add(manValue); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) { if ((this.men$key == null)) { this.men$key = new java.util.ArrayList<K>(); @@ -68,7 +68,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearMen() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> clearMen() { if ((this.men$key != null)) { this.men$key.clear(); @@ -76,7 +76,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) { if ((this.rawMap$key == null)) { this.rawMap$key = new java.util.ArrayList<java.lang.Object>(); @@ -86,7 +86,7 @@ import lombok.Singular; this.rawMap$value.add(rawMapValue); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) { if ((this.rawMap$key == null)) { this.rawMap$key = new java.util.ArrayList<java.lang.Object>(); @@ -99,7 +99,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearRawMap() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> clearRawMap() { if ((this.rawMap$key != null)) { this.rawMap$key.clear(); @@ -107,7 +107,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) { if ((this.stringMap$key == null)) { this.stringMap$key = new java.util.ArrayList<String>(); @@ -117,7 +117,7 @@ import lombok.Singular; this.stringMap$value.add(stringMapValue); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) { if ((this.stringMap$key == null)) { this.stringMap$key = new java.util.ArrayList<String>(); @@ -130,7 +130,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> clearStringMap() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMapsBuilder<K, V> clearStringMap() { if ((this.stringMap$key != null)) { this.stringMap$key.clear(); @@ -138,7 +138,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMaps<K, V> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMaps<K, V> build() { java.util.Map<K, V> women; switch (((this.women$key == null) ? 0 : this.women$key.size())) { case 0 : @@ -188,7 +188,7 @@ import lombok.Singular; } return new BuilderSingularMaps<K, V>(women, men, rawMap, stringMap); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((((((((((("BuilderSingularMaps.BuilderSingularMapsBuilder(women$key=" + this.women$key) + ", women$value=") + this.women$value) + ", men$key=") + this.men$key) + ", men$value=") + this.men$value) + ", rawMap$key=") + this.rawMap$key) + ", rawMap$value=") + this.rawMap$value) + ", stringMap$key=") + this.stringMap$key) + ", stringMap$value=") + this.stringMap$value) + ")"); } } @@ -196,14 +196,14 @@ import lombok.Singular; private @Singular SortedMap<K, ? extends Number> men; private @SuppressWarnings("all") @Singular("rawMap") Map rawMap; private @Singular("stringMap") Map<String, V> stringMap; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) { super(); this.women = women; this.men = men; this.rawMap = rawMap; this.stringMap = stringMap; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <K, V>BuilderSingularMapsBuilder<K, V> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <K, V>BuilderSingularMapsBuilder<K, V> builder() { return new BuilderSingularMapsBuilder<K, V>(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingularNoAuto.java b/test/transform/resource/after-ecj/BuilderSingularNoAuto.java index 1b79538c..6ea5a7db 100644 --- a/test/transform/resource/after-ecj/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-ecj/BuilderSingularNoAuto.java @@ -1,65 +1,65 @@ import java.util.List; import lombok.Singular; @lombok.Builder class BuilderSingularNoAuto { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularNoAutoBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> things; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> widgets; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> items; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularNoAutoBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> things; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> widgets; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> items; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder things(String things) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder things(String things) { if ((this.things == null)) this.things = new java.util.ArrayList<String>(); this.things.add(things); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder things(java.util.Collection<? extends String> things) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder things(java.util.Collection<? extends String> things) { if ((this.things == null)) this.things = new java.util.ArrayList<String>(); this.things.addAll(things); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder clearThings() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder clearThings() { if ((this.things != null)) this.things.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder widget(String widget) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder widget(String widget) { if ((this.widgets == null)) this.widgets = new java.util.ArrayList<String>(); this.widgets.add(widget); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder widgets(java.util.Collection<? extends String> widgets) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder widgets(java.util.Collection<? extends String> widgets) { if ((this.widgets == null)) this.widgets = new java.util.ArrayList<String>(); this.widgets.addAll(widgets); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder clearWidgets() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder clearWidgets() { if ((this.widgets != null)) this.widgets.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder items(String items) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder items(String items) { if ((this.items == null)) this.items = new java.util.ArrayList<String>(); this.items.add(items); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder items(java.util.Collection<? extends String> items) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder items(java.util.Collection<? extends String> items) { if ((this.items == null)) this.items = new java.util.ArrayList<String>(); this.items.addAll(items); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder clearItems() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder clearItems() { if ((this.items != null)) this.items.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAuto build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAuto build() { java.util.List<String> things; switch (((this.things == null) ? 0 : this.things.size())) { case 0 : @@ -95,20 +95,20 @@ import lombok.Singular; } return new BuilderSingularNoAuto(things, widgets, items); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things) + ", widgets=") + this.widgets) + ", items=") + this.items) + ")"); } } private @Singular List<String> things; private @Singular("widget") List<String> widgets; private @Singular List<String> items; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) { super(); this.things = things; this.widgets = widgets; this.items = items; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutoBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularNoAutoBuilder builder() { return new BuilderSingularNoAutoBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java index 84335f46..2b65ba3f 100644 --- a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java @@ -3,81 +3,81 @@ import java.util.NavigableMap; import java.util.Collection; import lombok.Singular; @lombok.Builder class BuilderSingularRedirectToGuava { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularRedirectToGuavaBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSet.Builder<String> dangerMice; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularRedirectToGuavaBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableSet.Builder<String> dangerMice; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder dangerMouse(String dangerMouse) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder dangerMouse(String dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder dangerMice(java.lang.Iterable<? extends String> dangerMice) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder dangerMice(java.lang.Iterable<? extends String> dangerMice) { if ((this.dangerMice == null)) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder clearDangerMice() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder thing(Integer key, Number value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder thing(Integer key, Number value) { if ((this.things == null)) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.put(key, value); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder things(java.util.Map<? extends Integer, ? extends Number> things) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder things(java.util.Map<? extends Integer, ? extends Number> things) { if ((this.things == null)) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.putAll(things); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder clearThings() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder doohickey(Class<?> doohickey) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder doohickey(Class<?> doohickey) { if ((this.doohickeys == null)) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder doohickeys(java.lang.Iterable<? extends Class<?>> doohickeys) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder doohickeys(java.lang.Iterable<? extends Class<?>> doohickeys) { if ((this.doohickeys == null)) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.addAll(doohickeys); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuava build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuava build() { java.util.Set<String> dangerMice = ((this.dangerMice == null) ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build()); java.util.NavigableMap<Integer, Number> things = ((this.things == null) ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build()); java.util.Collection<Class<?>> doohickeys = ((this.doohickeys == null) ? com.google.common.collect.ImmutableList.<Class<?>>of() : this.doohickeys.build()); return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice) + ", things=") + this.things) + ", doohickeys=") + this.doohickeys) + ")"); } } private @Singular Set<String> dangerMice; private @Singular NavigableMap<Integer, Number> things; private @Singular Collection<Class<?>> doohickeys; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) { super(); this.dangerMice = dangerMice; this.things = things; this.doohickeys = doohickeys; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularRedirectToGuavaBuilder builder() { return new BuilderSingularRedirectToGuavaBuilder(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingularSets.java b/test/transform/resource/after-ecj/BuilderSingularSets.java index 118eb16f..49a87fe9 100644 --- a/test/transform/resource/after-ecj/BuilderSingularSets.java +++ b/test/transform/resource/after-ecj/BuilderSingularSets.java @@ -2,83 +2,83 @@ import java.util.Set; import java.util.SortedSet; import lombok.Singular; @lombok.Builder class BuilderSingularSets<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularSetsBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> dangerMice; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> octopodes; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawSet; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> stringSet; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularSetsBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<T> dangerMice; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<Number> octopodes; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<java.lang.Object> rawSet; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> stringSet; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> dangerMouse(T dangerMouse) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> dangerMouse(T dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> dangerMice(java.util.Collection<? extends T> dangerMice) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> dangerMice(java.util.Collection<? extends T> dangerMice) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearDangerMice() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> clearDangerMice() { if ((this.dangerMice != null)) this.dangerMice.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> octopus(Number octopus) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> octopus(Number octopus) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.add(octopus); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> octopodes(java.util.Collection<? extends Number> octopodes) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> octopodes(java.util.Collection<? extends Number> octopodes) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.addAll(octopodes); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearOctopodes() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> clearOctopodes() { if ((this.octopodes != null)) this.octopodes.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> rawSet(java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> rawSet(java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.add(rawSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> rawSet(java.util.Collection<?> rawSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> rawSet(java.util.Collection<?> rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearRawSet() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> clearRawSet() { if ((this.rawSet != null)) this.rawSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> stringSet(String stringSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> stringSet(String stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.add(stringSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> stringSet(java.util.Collection<? extends String> stringSet) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> stringSet(java.util.Collection<? extends String> stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.addAll(stringSet); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<T> clearStringSet() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSetsBuilder<T> clearStringSet() { if ((this.stringSet != null)) this.stringSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSets<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSets<T> build() { java.util.Set<T> dangerMice; switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) { case 0 : @@ -124,7 +124,7 @@ import lombok.Singular; } return new BuilderSingularSets<T>(dangerMice, octopodes, rawSet, stringSet); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((("BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")"); } } @@ -132,14 +132,14 @@ import lombok.Singular; private @Singular SortedSet<? extends Number> octopodes; private @SuppressWarnings("all") @Singular("rawSet") Set rawSet; private @Singular("stringSet") Set<String> stringSet; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) { super(); this.dangerMice = dangerMice; this.octopodes = octopodes; this.rawSet = rawSet; this.stringSet = stringSet; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularSetsBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>BuilderSingularSetsBuilder<T> builder() { return new BuilderSingularSetsBuilder<T>(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java index c0e4af75..1351ae15 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java +++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixes.java @@ -1,28 +1,28 @@ import lombok.Singular; @lombok.Builder @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixes { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularWithPrefixesBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> elems; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderSingularWithPrefixesBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<String> elems; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixesBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder elem(String elem) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixesBuilder elem(String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList<String>(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder elems(java.util.Collection<? extends String> elems) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixesBuilder elems(java.util.Collection<? extends String> elems) { if ((this.elems == null)) this.elems = new java.util.ArrayList<String>(); this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder clearElems() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixesBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixes build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixes build() { java.util.List<String> elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -36,16 +36,16 @@ import lombok.Singular; } return new BuilderSingularWithPrefixes(elems); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems) + ")"); } } private @Singular java.util.List<String> _elems; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixes(final java.util.List<String> elems) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixes(final java.util.List<String> elems) { super(); this._elems = elems; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularWithPrefixesBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderSingularWithPrefixesBuilder builder() { return new BuilderSingularWithPrefixesBuilder(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderValueData.java b/test/transform/resource/after-ecj/BuilderValueData.java new file mode 100644 index 00000000..855979f1 --- /dev/null +++ b/test/transform/resource/after-ecj/BuilderValueData.java @@ -0,0 +1,90 @@ +import java.util.List; +final @lombok.Builder @lombok.Value class BuilderAndValue { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderAndValueBuilder { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndValueBuilder() { + super(); + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndValue build() { + return new BuilderAndValue(); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { + return "BuilderAndValue.BuilderAndValueBuilder()"; + } + } + private final int zero = 0; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndValue() { + super(); + } + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndValueBuilder builder() { + return new BuilderAndValueBuilder(); + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getZero() { + return this.zero; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { + if ((o == this)) + return true; + if ((! (o instanceof BuilderAndValue))) + return false; + final BuilderAndValue other = (BuilderAndValue) o; + if ((this.getZero() != other.getZero())) + return false; + return true; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { + final int PRIME = 59; + int result = 1; + result = ((result * PRIME) + this.getZero()); + return result; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { + return (("BuilderAndValue(zero=" + this.getZero()) + ")"); + } +} +@lombok.Builder @lombok.Data class BuilderAndData { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderAndDataBuilder { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndDataBuilder() { + super(); + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndData build() { + return new BuilderAndData(); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { + return "BuilderAndData.BuilderAndDataBuilder()"; + } + } + private final int zero = 0; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndData() { + super(); + } + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderAndDataBuilder builder() { + return new BuilderAndDataBuilder(); + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getZero() { + return this.zero; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { + if ((o == this)) + return true; + if ((! (o instanceof BuilderAndData))) + return false; + final BuilderAndData other = (BuilderAndData) o; + if ((! other.canEqual((java.lang.Object) this))) + return false; + if ((this.getZero() != other.getZero())) + return false; + return true; + } + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { + return (other instanceof BuilderAndData); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { + final int PRIME = 59; + int result = 1; + result = ((result * PRIME) + this.getZero()); + return result; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { + return (("BuilderAndData(zero=" + this.getZero()) + ")"); + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderWithAccessors.java b/test/transform/resource/after-ecj/BuilderWithAccessors.java index 4221ea7c..2846fd80 100644 --- a/test/transform/resource/after-ecj/BuilderWithAccessors.java +++ b/test/transform/resource/after-ecj/BuilderWithAccessors.java @@ -1,32 +1,32 @@ -@lombok.experimental.Builder @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderWithAccessorsBuilder { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int plower; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int upper; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int foo; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int _bar; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder() { +@lombok.Builder @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderWithAccessorsBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int plower; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int upper; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int foo; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int _bar; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder plower(final int plower) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder plower(final int plower) { this.plower = plower; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder upper(final int upper) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder upper(final int upper) { this.upper = upper; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder foo(final int foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder foo(final int foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder _bar(final int _bar) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder _bar(final int _bar) { this._bar = _bar; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessors build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessors build() { return new BuilderWithAccessors(plower, upper, foo, _bar); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((("BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower) + ", upper=") + this.upper) + ", foo=") + this.foo) + ", _bar=") + this._bar) + ")"); } } @@ -34,14 +34,14 @@ private final int pUpper; private int _foo; private int __bar; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { super(); this.plower = plower; this.pUpper = upper; this._foo = foo; this.__bar = _bar; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithAccessorsBuilder builder() { return new BuilderWithAccessorsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java index 1c23e0ee..114d4cfa 100644 --- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java +++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java @@ -1,26 +1,26 @@ import lombok.Builder; class BuilderWithExistingBuilderClass<T, K extends Number> { public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean arg2; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String arg3; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean arg2; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String arg3; private Z arg1; public void arg2(boolean arg) { } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithExistingBuilderClassBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) { this.arg1 = arg1; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) { this.arg3 = arg3; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClass<String, Z> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithExistingBuilderClass<String, Z> build() { return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")"); } } @@ -30,7 +30,7 @@ class BuilderWithExistingBuilderClass<T, K extends Number> { public static @Builder <Z extends Number>BuilderWithExistingBuilderClass<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) { return null; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <Z extends Number>BuilderWithExistingBuilderClassBuilder<Z> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <Z extends Number>BuilderWithExistingBuilderClassBuilder<Z> builder() { return new BuilderWithExistingBuilderClassBuilder<Z>(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilder.java b/test/transform/resource/after-ecj/BuilderWithToBuilder.java index 0d296cb6..d1245c70 100644 --- a/test/transform/resource/after-ecj/BuilderWithToBuilder.java +++ b/test/transform/resource/after-ecj/BuilderWithToBuilder.java @@ -1,44 +1,44 @@ import java.util.List; import lombok.Builder; @Builder(toBuilder = true) @lombok.experimental.Accessors(prefix = "m") class BuilderWithToBuilder<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderWithToBuilderBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String one; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String two; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T foo; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> bars; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class BuilderWithToBuilderBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String one; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String two; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated T foo; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.util.ArrayList<T> bars; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> one(final String one) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> one(final String one) { this.one = one; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> two(final String two) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> two(final String two) { this.two = two; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> foo(final T foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> foo(final T foo) { this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> bar(T bar) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> bar(T bar) { if ((this.bars == null)) this.bars = new java.util.ArrayList<T>(); this.bars.add(bar); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> bars(java.util.Collection<? extends T> bars) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> bars(java.util.Collection<? extends T> bars) { if ((this.bars == null)) this.bars = new java.util.ArrayList<T>(); this.bars.addAll(bars); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> clearBars() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> clearBars() { if ((this.bars != null)) this.bars.clear(); return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilder<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilder<T> build() { java.util.List<T> bars; switch (((this.bars == null) ? 0 : this.bars.size())) { case 0 : @@ -52,7 +52,7 @@ import lombok.Builder; } return new BuilderWithToBuilder<T>(one, two, foo, bars); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((((("BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one) + ", two=") + this.two) + ", foo=") + this.foo) + ", bars=") + this.bars) + ")"); } } @@ -63,39 +63,39 @@ import lombok.Builder; public static <K>K rrr(BuilderWithToBuilder<K> x) { return x.foo; } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilder(final String one, final String two, final T foo, final List<T> bars) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilder(final String one, final String two, final T foo, final List<T> bars) { super(); this.mOne = one; this.mTwo = two; this.foo = foo; this.bars = bars; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderWithToBuilderBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>BuilderWithToBuilderBuilder<T> builder() { return new BuilderWithToBuilderBuilder<T>(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithToBuilderBuilder<T> toBuilder() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithToBuilderBuilder<T> toBuilder() { return new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars); } } @lombok.experimental.Accessors(prefix = "m") class ConstructorWithToBuilder<T> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class ConstructorWithToBuilderBuilder<T> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String mOne; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T bar; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class ConstructorWithToBuilderBuilder<T> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String mOne; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated T bar; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorWithToBuilderBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder<T> mOne(final String mOne) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorWithToBuilderBuilder<T> mOne(final String mOne) { this.mOne = mOne; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder<T> bar(final T bar) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorWithToBuilderBuilder<T> bar(final T bar) { this.bar = bar; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilder<T> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorWithToBuilder<T> build() { return new ConstructorWithToBuilder<T>(mOne, bar); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne) + ", bar=") + this.bar) + ")"); } } @@ -106,32 +106,32 @@ import lombok.Builder; public @Builder(toBuilder = true) ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T bar) { super(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>ConstructorWithToBuilderBuilder<T> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T>ConstructorWithToBuilderBuilder<T> builder() { return new ConstructorWithToBuilderBuilder<T>(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorWithToBuilderBuilder<T> toBuilder() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorWithToBuilderBuilder<T> toBuilder() { return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); } } @lombok.experimental.Accessors(prefix = "m") class StaticWithToBuilder<T, K> { - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class StaticWithToBuilderBuilder<Z> { - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String mOne; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Z bar; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated class StaticWithToBuilderBuilder<Z> { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String mOne; + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Z bar; + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StaticWithToBuilderBuilder() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder<Z> mOne(final String mOne) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StaticWithToBuilderBuilder<Z> mOne(final String mOne) { this.mOne = mOne; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder<Z> bar(final Z bar) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StaticWithToBuilderBuilder<Z> bar(final Z bar) { this.bar = bar; return this; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilder<Z, String> build() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StaticWithToBuilder<Z, String> build() { return StaticWithToBuilder.<Z>test(mOne, bar); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("StaticWithToBuilder.StaticWithToBuilderBuilder(mOne=" + this.mOne) + ", bar=") + this.bar) + ")"); } } @@ -146,10 +146,10 @@ import lombok.Builder; public static @Builder(toBuilder = true) <Z>StaticWithToBuilder<Z, String> test(String mOne, @Builder.ObtainVia(field = "foo") Z bar) { return new StaticWithToBuilder<Z, String>(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <Z>StaticWithToBuilderBuilder<Z> builder() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <Z>StaticWithToBuilderBuilder<Z> builder() { return new StaticWithToBuilderBuilder<Z>(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") StaticWithToBuilderBuilder<T> toBuilder() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated StaticWithToBuilderBuilder<T> toBuilder() { return new StaticWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); } } diff --git a/test/transform/resource/after-ecj/BuilderWithTolerate.java b/test/transform/resource/after-ecj/BuilderWithTolerate.java new file mode 100644 index 00000000..ec6ae542 --- /dev/null +++ b/test/transform/resource/after-ecj/BuilderWithTolerate.java @@ -0,0 +1,34 @@ +import lombok.Builder; +import lombok.experimental.Tolerate; +public @Builder class BuilderWithTolerate { + public static class BuilderWithTolerateBuilder { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int value; + public @Tolerate BuilderWithTolerateBuilder value(String s) { + return this.value(Integer.parseInt(s)); + } + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithTolerateBuilder() { + super(); + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithTolerateBuilder value(final int value) { + this.value = value; + return this; + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithTolerate build() { + return new BuilderWithTolerate(value); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { + return (("BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value) + ")"); + } + } + private final int value; + public static void main(String[] args) { + BuilderWithTolerate.builder().value("42").build(); + } + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithTolerate(final int value) { + super(); + this.value = value; + } + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated BuilderWithTolerateBuilder builder() { + return new BuilderWithTolerateBuilder(); + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java index 79b422cc..33596372 100644 --- a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java +++ b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java @@ -3,7 +3,7 @@ class GetFoo { GetFoo() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/CommentsInterspersed.java b/test/transform/resource/after-ecj/CommentsInterspersed.java index 95489d54..17eaba9f 100644 --- a/test/transform/resource/after-ecj/CommentsInterspersed.java +++ b/test/transform/resource/after-ecj/CommentsInterspersed.java @@ -6,7 +6,7 @@ public class CommentsInterspersed { super(); } public native void gwtTest(); - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getTest() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getTest() { return this.test; } } diff --git a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java index f9437f0e..e508ed14 100644 --- a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java +++ b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java @@ -1,5 +1,5 @@ @lombok.Data(staticConstructor = "of") @lombok.NoArgsConstructor class ConflictingStaticConstructorNames { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ConflictingStaticConstructorNames))) @@ -9,17 +9,17 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof ConflictingStaticConstructorNames); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ConflictingStaticConstructorNames()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConflictingStaticConstructorNames() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConflictingStaticConstructorNames() { super(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/Constructors.java b/test/transform/resource/after-ecj/Constructors.java index 4cc24a81..7537a0f8 100644 --- a/test/transform/resource/after-ecj/Constructors.java +++ b/test/transform/resource/after-ecj/Constructors.java @@ -1,7 +1,7 @@ @lombok.RequiredArgsConstructor class RequiredArgsConstructor1 { final int x; String name; - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructor1(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructor1(final int x) { super(); this.x = x; } @@ -9,7 +9,7 @@ @lombok.RequiredArgsConstructor(access = lombok.AccessLevel.PROTECTED) class RequiredArgsConstructorAccess { final int x; String name; - protected @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorAccess(final int x) { + protected @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorAccess(final int x) { super(); this.x = x; } @@ -17,18 +17,18 @@ @lombok.RequiredArgsConstructor(staticName = "staticname") class RequiredArgsConstructorStaticName { final int x; String name; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticName(final int x) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorStaticName(final int x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticName staticname(final int x) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorStaticName staticname(final int x) { return new RequiredArgsConstructorStaticName(x); } } @lombok.RequiredArgsConstructor() class RequiredArgsConstructorWithAnnotations { final int x; String name; - public @Deprecated @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorWithAnnotations(final int x) { + public @Deprecated @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorWithAnnotations(final int x) { super(); this.x = x; } @@ -36,7 +36,7 @@ @lombok.AllArgsConstructor class AllArgsConstructor1 { final int x; String name; - public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AllArgsConstructor1(final int x, final String name) { + public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AllArgsConstructor1(final int x, final String name) { super(); this.x = x; this.name = name; @@ -45,35 +45,35 @@ @lombok.NoArgsConstructor class NoArgsConstructor1 { int x; String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructor1() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated NoArgsConstructor1() { super(); } } @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics<T extends Number> { final T x; String name; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticNameGenerics(final T x) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorStaticNameGenerics(final T x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>RequiredArgsConstructorStaticNameGenerics<T> of(final T x) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T extends Number>RequiredArgsConstructorStaticNameGenerics<T> of(final T x) { return new RequiredArgsConstructorStaticNameGenerics<T>(x); } } @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics2<T extends Number> { final Class<T> x; String name; - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) { super(); this.x = x; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated <T extends Number>RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) { return new RequiredArgsConstructorStaticNameGenerics2<T>(x); } } @lombok.AllArgsConstructor(access = lombok.AccessLevel.PACKAGE) class AllArgsConstructorPackageAccess { final String x; - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AllArgsConstructorPackageAccess(final String x) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated AllArgsConstructorPackageAccess(final String x) { super(); this.x = x; } @@ -86,7 +86,7 @@ final float f; final String s; byte z; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructor2() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated NoArgsConstructor2() { super(); this.x = 0; this.y = 0D; diff --git a/test/transform/resource/after-ecj/ConstructorsConfiguration.java b/test/transform/resource/after-ecj/ConstructorsConfiguration.java index 33a95181..8bd1e38b 100644 --- a/test/transform/resource/after-ecj/ConstructorsConfiguration.java +++ b/test/transform/resource/after-ecj/ConstructorsConfiguration.java @@ -1,13 +1,13 @@ @lombok.AllArgsConstructor class ConstructorsConfiguration { int x; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsConfiguration(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorsConfiguration(final int x) { super(); this.x = x; } } @lombok.AllArgsConstructor(suppressConstructorProperties = false) class ConstructorsConfigurationExplicit { int x; - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsConfigurationExplicit(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorsConfigurationExplicit(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java index 7c691b42..27ff3488 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java +++ b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java @@ -3,7 +3,7 @@ int pUpper; int _huh; int __huh2; - public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { + public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { super(); this.plower = plower; this.pUpper = upper; diff --git a/test/transform/resource/after-ecj/DataConfiguration.java b/test/transform/resource/after-ecj/DataConfiguration.java index 4ca1f093..83b95737 100644 --- a/test/transform/resource/after-ecj/DataConfiguration.java +++ b/test/transform/resource/after-ecj/DataConfiguration.java @@ -1,9 +1,9 @@ @lombok.Data class DataConfiguration { final int x; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataConfiguration))) @@ -15,19 +15,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataConfiguration); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("DataConfiguration(x=" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataConfiguration(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataConfiguration(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/DataExtended.java b/test/transform/resource/after-ecj/DataExtended.java index 46446a0f..875b4cd7 100644 --- a/test/transform/resource/after-ecj/DataExtended.java +++ b/test/transform/resource/after-ecj/DataExtended.java @@ -1,12 +1,12 @@ @lombok.Data @lombok.ToString(doNotUseGetters = true) class DataExtended { int x; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataExtended))) @@ -18,19 +18,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataExtended); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataExtended() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataExtended() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("DataExtended(x=" + this.x) + ")"); } } diff --git a/test/transform/resource/after-ecj/DataIgnore.java b/test/transform/resource/after-ecj/DataIgnore.java index dbf9713f..264f9927 100644 --- a/test/transform/resource/after-ecj/DataIgnore.java +++ b/test/transform/resource/after-ecj/DataIgnore.java @@ -1,10 +1,10 @@ @lombok.Data class DataIgnore { final int x; String $name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataIgnore))) @@ -16,19 +16,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataIgnore); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("DataIgnore(x=" + this.getX()) + ")"); } - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataIgnore(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataIgnore(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/DataOnEnum.java b/test/transform/resource/after-ecj/DataOnEnum.java index 917a840b..c80696dd 100644 --- a/test/transform/resource/after-ecj/DataOnEnum.java +++ b/test/transform/resource/after-ecj/DataOnEnum.java @@ -3,13 +3,13 @@ public @lombok.Getter @lombok.ToString @lombok.RequiredArgsConstructor enum Data private final String someField; <clinit>() { } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getSomeField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getSomeField() { return this.someField; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("DataOnEnum(someField=" + this.getSomeField()) + ")"); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataOnEnum(final String someField) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataOnEnum(final String someField) { super(); this.someField = someField; } diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java index 9d6bced1..ee7682bd 100644 --- a/test/transform/resource/after-ecj/DataOnLocalClass.java +++ b/test/transform/resource/after-ecj/DataOnLocalClass.java @@ -7,16 +7,16 @@ class DataOnLocalClass1 { @Data class Local { final int x; String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local))) @@ -32,10 +32,10 @@ class DataOnLocalClass1 { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -43,10 +43,10 @@ class DataOnLocalClass1 { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Local(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Local(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Local(final int x) { super(); this.x = x; } @@ -58,17 +58,17 @@ class DataOnLocalClass2 { @Data class Local { @Data class InnerLocal { @lombok.NonNull String name; - public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final @lombok.NonNull String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setName(final @lombok.NonNull String name) { if ((name == null)) { throw new java.lang.NullPointerException("name"); } this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local.InnerLocal))) @@ -82,20 +82,20 @@ class DataOnLocalClass2 { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local.InnerLocal); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $name = this.getName(); result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("Local.InnerLocal(name=" + this.getName()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InnerLocal(final @lombok.NonNull String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated InnerLocal(final @lombok.NonNull String name) { super(); if ((name == null)) { @@ -105,10 +105,10 @@ class DataOnLocalClass2 { } } final int x; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Local))) @@ -120,19 +120,19 @@ class DataOnLocalClass2 { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Local); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("Local(x=" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Local(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Local(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java index ba6c75c8..708b2102 100644 --- a/test/transform/resource/after-ecj/DataPlain.java +++ b/test/transform/resource/after-ecj/DataPlain.java @@ -2,16 +2,16 @@ import lombok.Data; @lombok.Data class Data1 { final int x; String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data1))) @@ -27,10 +27,10 @@ import lombok.Data; return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -38,10 +38,10 @@ import lombok.Data; result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Data1(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data1(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Data1(final int x) { super(); this.x = x; } @@ -49,16 +49,16 @@ import lombok.Data; @Data class Data2 { final int x; String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data2))) @@ -74,10 +74,10 @@ import lombok.Data; return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -85,10 +85,10 @@ import lombok.Data; result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Data2(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data2(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Data2(final int x) { super(); this.x = x; } @@ -96,16 +96,16 @@ import lombok.Data; final @Data class Data3 { final int x; String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setName(final String name) { this.name = name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data3))) @@ -119,7 +119,7 @@ final @Data class Data3 { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -127,10 +127,10 @@ final @Data class Data3 { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Data3(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data3(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Data3(final int x) { super(); this.x = x; } @@ -140,16 +140,16 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java Data4() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("Data4(x=" + this.getX()) + ")"); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data4))) @@ -163,10 +163,10 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data4); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + super.hashCode()); @@ -175,7 +175,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java } } @Data class Data5 { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data5))) @@ -185,36 +185,36 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Data5); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "Data5()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data5() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Data5() { super(); } } final @Data class Data6 { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Data6))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "Data6()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data6() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Data6() { super(); } } diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java index 5a358c89..62661aad 100644 --- a/test/transform/resource/after-ecj/DataWithGetter.java +++ b/test/transform/resource/after-ecj/DataWithGetter.java @@ -2,13 +2,13 @@ private int x; private int y; private final String z; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setY(final int y) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setY(final int y) { this.y = y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataWithGetter))) @@ -26,10 +26,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataWithGetter); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -38,20 +38,20 @@ result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("DataWithGetter(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")"); } - public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataWithGetter(final String z) { + public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataWithGetter(final String z) { super(); this.z = z; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getY() { return this.y; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getZ() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getZ() { return this.z; } } diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java index b03ce146..c28cf119 100644 --- a/test/transform/resource/after-ecj/DataWithGetterNone.java +++ b/test/transform/resource/after-ecj/DataWithGetterNone.java @@ -2,13 +2,13 @@ private int x; private int y; private final String z; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setX(final int x) { this.x = x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setY(final int y) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setY(final int y) { this.y = y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof DataWithGetterNone))) @@ -26,10 +26,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof DataWithGetterNone); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -38,10 +38,10 @@ result = ((result * PRIME) + (($z == null) ? 43 : $z.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((((("DataWithGetterNone(x=" + this.x) + ", y=") + this.y) + ", z=") + this.z) + ")"); } - public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataWithGetterNone(final String z) { + public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated DataWithGetterNone(final String z) { super(); this.z = z; } diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java index 06b57ceb..41c3e7b9 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetter.java +++ b/test/transform/resource/after-ecj/DelegateOnGetter.java @@ -9,7 +9,7 @@ class DelegateOnGetter { DelegateOnGetter() { super(); } - public @Delegate @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Bar getBar() { + public @Delegate @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Bar getBar() { java.lang.Object value = this.bar.get(); if ((value == null)) { @@ -35,10 +35,10 @@ class DelegateOnGetter { } return (Bar) ((value == this.bar) ? null : value); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getInt() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getInt() { return this.getBar().getInt(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setList(final java.util.ArrayList<java.lang.String> list) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setList(final java.util.ArrayList<java.lang.String> list) { this.getBar().setList(list); } } diff --git a/test/transform/resource/after-ecj/DelegateOnGetterNone.java b/test/transform/resource/after-ecj/DelegateOnGetterNone.java index 2018e1e9..86e508bc 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetterNone.java +++ b/test/transform/resource/after-ecj/DelegateOnGetterNone.java @@ -10,10 +10,10 @@ import lombok.Getter; DelegateOnGetterNone() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getInt() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getInt() { return this.bar.getInt(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setList(final java.util.ArrayList<java.lang.String> list) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setList(final java.util.ArrayList<java.lang.String> list) { this.bar.setList(list); } } diff --git a/test/transform/resource/after-ecj/DelegateOnMethods.java b/test/transform/resource/after-ecj/DelegateOnMethods.java index 3e833ebb..21b84654 100644 --- a/test/transform/resource/after-ecj/DelegateOnMethods.java +++ b/test/transform/resource/after-ecj/DelegateOnMethods.java @@ -7,7 +7,7 @@ abstract class DelegateOnMethods { super(); } public abstract @Delegate Bar getBar(); - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void bar(final java.util.ArrayList<java.lang.String> list) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void bar(final java.util.ArrayList<java.lang.String> list) { this.getBar().bar(list); } } diff --git a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java index 3718c5d9..31bb0be6 100644 --- a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java +++ b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java @@ -27,10 +27,10 @@ class DelegatePlain { DelegatePlain() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void bar(final java.util.ArrayList<java.lang.String> list) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void bar(final java.util.ArrayList<java.lang.String> list) { this.bar.bar(list); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void foo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void foo() { this.foo.foo(); } } diff --git a/test/transform/resource/after-ecj/DelegateWithDeprecated.java b/test/transform/resource/after-ecj/DelegateWithDeprecated.java index ab3aa188..89e78b8c 100644 --- a/test/transform/resource/after-ecj/DelegateWithDeprecated.java +++ b/test/transform/resource/after-ecj/DelegateWithDeprecated.java @@ -9,13 +9,13 @@ class DelegateWithDeprecated { DelegateWithDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void deprecatedAnnotation() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void deprecatedAnnotation() { this.bar.deprecatedAnnotation(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void deprecatedComment() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void deprecatedComment() { this.bar.deprecatedComment(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void notDeprecated() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void notDeprecated() { this.bar.notDeprecated(); } } diff --git a/test/transform/resource/after-ecj/DelegateWithVarargs.java b/test/transform/resource/after-ecj/DelegateWithVarargs.java index a0b5b7b5..98da057b 100644 --- a/test/transform/resource/after-ecj/DelegateWithVarargs.java +++ b/test/transform/resource/after-ecj/DelegateWithVarargs.java @@ -10,16 +10,16 @@ class DelegateWithVarargs { DelegateWithVarargs() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void array(final int[] array) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void array(final int[] array) { this.bar.array(array); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void arrayVarargs(final int[]... arrayVarargs) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void arrayVarargs(final int[]... arrayVarargs) { this.bar.arrayVarargs(arrayVarargs); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void justOneParameter(final int... varargs) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void justOneParameter(final int... varargs) { this.bar.justOneParameter(varargs); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void multipleParameters(final java.lang.String first, final int... varargs) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void multipleParameters(final java.lang.String first, final int... varargs) { this.bar.multipleParameters(first, varargs); } } diff --git a/test/transform/resource/after-ecj/EncodingUtf8.java b/test/transform/resource/after-ecj/EncodingUtf8.java index 29dce86f..b66feb0c 100644 --- a/test/transform/resource/after-ecj/EncodingUtf8.java +++ b/test/transform/resource/after-ecj/EncodingUtf8.java @@ -1,9 +1 @@ -@lombok.ToString class EncodingUtf8 { - String foo๑๑ = "\t\b "; - EncodingUtf8() { - super(); - } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { - return (("EncodingUtf8(foo๑๑=" + this.foo๑๑) + ")"); - } -}
\ No newline at end of file +//ignore: This test serves to check what happens with 'weird' characters when you use delombok. It's just not relevant for ecj. diff --git a/test/transform/resource/after-ecj/EqualsAndHashCode.java b/test/transform/resource/after-ecj/EqualsAndHashCode.java index c0bb5bbb..e72352cc 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCode.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCode.java @@ -7,7 +7,7 @@ EqualsAndHashCode() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode))) @@ -31,10 +31,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -56,7 +56,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 { EqualsAndHashCode2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode2))) @@ -74,7 +74,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -91,7 +91,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte EqualsAndHashCode3() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode3))) @@ -101,10 +101,10 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode3); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } @@ -113,7 +113,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte EqualsAndHashCode4() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCode4))) @@ -125,10 +125,10 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCode4); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + super.hashCode()); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java index d2c7b201..59c34377 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys1.java @@ -2,7 +2,7 @@ EqualsAndHashCodeConfigKeys1Parent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys1Parent))) @@ -12,10 +12,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys1Parent); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } @@ -25,7 +25,7 @@ EqualsAndHashCodeConfigKeys1() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys1))) @@ -37,10 +37,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java index 0b93f980..2ce92965 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeConfigKeys2.java @@ -2,7 +2,7 @@ EqualsAndHashCodeConfigKeys2Parent() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys2Parent))) @@ -12,10 +12,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys2Parent); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } @@ -25,7 +25,7 @@ EqualsAndHashCodeConfigKeys2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeConfigKeys2))) @@ -39,10 +39,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof EqualsAndHashCodeConfigKeys2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + super.hashCode()); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java index e4efb336..477ee64c 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java @@ -24,7 +24,7 @@ final @lombok.EqualsAndHashCode(callSuper = true) class EqualsAndHashCodeWithExi private boolean canEqual(Object other) { return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithExistingMethods3))) @@ -38,7 +38,7 @@ final @lombok.EqualsAndHashCode(callSuper = true) class EqualsAndHashCodeWithExi return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + super.hashCode()); diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java index a59d2835..f7845019 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java @@ -10,7 +10,7 @@ EqualsAndHashCodeWithOnParam() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final @Nullable java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final @Nullable java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeWithOnParam))) @@ -34,10 +34,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final @Nullable java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final @Nullable java.lang.Object other) { return (other instanceof EqualsAndHashCodeWithOnParam); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java index 283c5430..fda2d69b 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java +++ b/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java @@ -4,7 +4,7 @@ final @lombok.EqualsAndHashCode(of = {"x"}) class EqualsAndHashCodeOf { EqualsAndHashCodeOf() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeOf))) @@ -14,7 +14,7 @@ final @lombok.EqualsAndHashCode(of = {"x"}) class EqualsAndHashCodeOf { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); @@ -27,7 +27,7 @@ final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude EqualsAndHashCodeExclude() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof EqualsAndHashCodeExclude))) @@ -37,7 +37,7 @@ final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.x); diff --git a/test/transform/resource/after-ecj/FieldDefaults.java b/test/transform/resource/after-ecj/FieldDefaults.java index e76c1251..a6941b7b 100644 --- a/test/transform/resource/after-ecj/FieldDefaults.java +++ b/test/transform/resource/after-ecj/FieldDefaults.java @@ -1,14 +1,20 @@ @lombok.experimental.FieldDefaults(makeFinal = true) class FieldDefaults1 { + static int STATIC = 3; final int x; @lombok.experimental.NonFinal int y; + <clinit>() { + } FieldDefaults1(int x) { super(); this.x = x; } } @lombok.experimental.FieldDefaults(level = lombok.AccessLevel.PRIVATE) class FieldDefaults2 { + static int STATIC = 3; @lombok.experimental.PackagePrivate int x; private int y; + <clinit>() { + } FieldDefaults2() { super(); } diff --git a/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java b/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java index 6a727f1d..50658497 100644 --- a/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java +++ b/test/transform/resource/after-ecj/FieldDefaultsViaConfigAndRequiredArgsConstructor.java @@ -1,6 +1,6 @@ @lombok.RequiredArgsConstructor class FieldDefaultsViaConfigAndRequiredArgsConstructor { final int x; - public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { + public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated FieldDefaultsViaConfigAndRequiredArgsConstructor(final int x) { super(); this.x = x; } diff --git a/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java b/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java index 407d41b6..78c46eae 100644 --- a/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java +++ b/test/transform/resource/after-ecj/GenerateSuppressFBWarnings.java @@ -3,7 +3,7 @@ class GenerateSuppressFBWarnings { GenerateSuppressFBWarnings() { super(); } - public @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") @javax.annotation.Generated("lombok") int getY() { + public @java.lang.SuppressWarnings("all") @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(justification = "generated code") @javax.annotation.Generated("lombok") @lombok.Generated int getY() { return this.y; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/GeneratedGlobalOff.java b/test/transform/resource/after-ecj/GeneratedGlobalOff.java new file mode 100644 index 00000000..046bac10 --- /dev/null +++ b/test/transform/resource/after-ecj/GeneratedGlobalOff.java @@ -0,0 +1,9 @@ +class GeneratedGlobalOff { + @lombok.Getter int x; + GeneratedGlobalOff() { + super(); + } + public @java.lang.SuppressWarnings("all") int getX() { + return this.x; + } +} diff --git a/test/transform/resource/after-ecj/GeneratedGlobalOffJavaxOn.java b/test/transform/resource/after-ecj/GeneratedGlobalOffJavaxOn.java new file mode 100644 index 00000000..25aea362 --- /dev/null +++ b/test/transform/resource/after-ecj/GeneratedGlobalOffJavaxOn.java @@ -0,0 +1,9 @@ +class GeneratedGlobalOffJavaxOn { + @lombok.Getter int x; + GeneratedGlobalOffJavaxOn() { + super(); + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + return this.x; + } +} diff --git a/test/transform/resource/after-ecj/GeneratedGlobalOffLombokOn.java b/test/transform/resource/after-ecj/GeneratedGlobalOffLombokOn.java new file mode 100644 index 00000000..edb72863 --- /dev/null +++ b/test/transform/resource/after-ecj/GeneratedGlobalOffLombokOn.java @@ -0,0 +1,9 @@ +class GeneratedGlobalOffLombokOn { + @lombok.Getter int x; + GeneratedGlobalOffLombokOn() { + super(); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { + return this.x; + } +} diff --git a/test/transform/resource/after-ecj/GeneratedJavaxOff.java b/test/transform/resource/after-ecj/GeneratedJavaxOff.java new file mode 100644 index 00000000..43c2e954 --- /dev/null +++ b/test/transform/resource/after-ecj/GeneratedJavaxOff.java @@ -0,0 +1,9 @@ +class GeneratedJavaxOff { + @lombok.Getter int x; + GeneratedJavaxOff() { + super(); + } + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { + return this.x; + } +} diff --git a/test/transform/resource/after-ecj/GeneratedLombokOff.java b/test/transform/resource/after-ecj/GeneratedLombokOff.java new file mode 100644 index 00000000..2f153ec7 --- /dev/null +++ b/test/transform/resource/after-ecj/GeneratedLombokOff.java @@ -0,0 +1,9 @@ +class GeneratedLombokOff { + @lombok.Getter int x; + GeneratedLombokOff() { + super(); + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + return this.x; + } +} diff --git a/test/transform/resource/after-ecj/GetterAccessLevel.java b/test/transform/resource/after-ecj/GetterAccessLevel.java index 533e05cc..9988a240 100644 --- a/test/transform/resource/after-ecj/GetterAccessLevel.java +++ b/test/transform/resource/after-ecj/GetterAccessLevel.java @@ -13,31 +13,31 @@ class GetterAccessLevel { GetterAccessLevel() { super(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPrivate() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPrivate() { return this.isPrivate; } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPackage() { return this.isPackage; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isProtected() { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isProtected() { return this.isProtected; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPublic() { return this.isPublic; } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPrivateString() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getPrivateString() { return this.privateString; } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPackageString() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getPackageString() { return this.packageString; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getProtectedString() { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getProtectedString() { return this.protectedString; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPublicString() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getPublicString() { return this.publicString; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getValue() { return this.value; } } diff --git a/test/transform/resource/after-ecj/GetterAlreadyExists.java b/test/transform/resource/after-ecj/GetterAlreadyExists.java index b0856dce..6e3a5d08 100644 --- a/test/transform/resource/after-ecj/GetterAlreadyExists.java +++ b/test/transform/resource/after-ecj/GetterAlreadyExists.java @@ -6,7 +6,7 @@ class Getter1 { boolean hasFoo() { return true; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isFoo() { return this.foo; } } @@ -36,7 +36,7 @@ class Getter4 { String hasFoo() { return null; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -48,7 +48,7 @@ class Getter5 { String isFoo() { return null; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -69,7 +69,7 @@ class Getter7 { boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -81,7 +81,7 @@ class Getter8 { boolean isFoo() { return false; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -102,7 +102,7 @@ class Getter10 { static boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isFoo() { return this.foo; } } @@ -132,7 +132,7 @@ class Getter13 { static boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -144,7 +144,7 @@ class Getter14 { static boolean isFoo() { return false; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -165,7 +165,7 @@ class Getter16 { static String hasFoo() { return ""; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } @@ -177,7 +177,7 @@ class Getter17 { static String isFoo() { return ""; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterBoolean.java b/test/transform/resource/after-ecj/GetterBoolean.java index a1d1446e..03619e7f 100644 --- a/test/transform/resource/after-ecj/GetterBoolean.java +++ b/test/transform/resource/after-ecj/GetterBoolean.java @@ -5,13 +5,13 @@ class Getter { Getter() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isFoo() { return this.foo; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBar() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isBar() { return this.isBar; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isHasBaz() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isHasBaz() { return this.hasBaz; } } @@ -23,7 +23,7 @@ class MoreGetter { boolean hasFoo() { return true; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterDeprecated.java b/test/transform/resource/after-ecj/GetterDeprecated.java index fc7ce561..d7e661fb 100644 --- a/test/transform/resource/after-ecj/GetterDeprecated.java +++ b/test/transform/resource/after-ecj/GetterDeprecated.java @@ -5,10 +5,10 @@ class GetterDeprecated { GetterDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getAnnotation() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getAnnotation() { return this.annotation; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getJavadoc() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getJavadoc() { return this.javadoc; } } diff --git a/test/transform/resource/after-ecj/GetterEnum.java b/test/transform/resource/after-ecj/GetterEnum.java index 22a5b0fd..d54b4809 100644 --- a/test/transform/resource/after-ecj/GetterEnum.java +++ b/test/transform/resource/after-ecj/GetterEnum.java @@ -7,13 +7,13 @@ import lombok.RequiredArgsConstructor; private final @Getter String name; <clinit>() { } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getId() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getId() { return this.id; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterEnum(final int id, final String name) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated GetterEnum(final int id, final String name) { super(); this.id = id; this.name = name; diff --git a/test/transform/resource/after-ecj/GetterLazy.java b/test/transform/resource/after-ecj/GetterLazy.java index d1ec507c..e48d5e31 100644 --- a/test/transform/resource/after-ecj/GetterLazy.java +++ b/test/transform/resource/after-ecj/GetterLazy.java @@ -8,7 +8,7 @@ class GetterLazy { GetterLazy() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueType getFieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueType getFieldName() { java.lang.Object value = this.fieldName.get(); if ((value == null)) { diff --git a/test/transform/resource/after-ecj/GetterLazyBoolean.java b/test/transform/resource/after-ecj/GetterLazyBoolean.java index 0a1d2564..2edae3bc 100644 --- a/test/transform/resource/after-ecj/GetterLazyBoolean.java +++ b/test/transform/resource/after-ecj/GetterLazyBoolean.java @@ -7,7 +7,7 @@ private static boolean calculateBoolean() { return true; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBooleanValue() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isBooleanValue() { java.lang.Object value = this.booleanValue.get(); if ((value == null)) { @@ -24,7 +24,7 @@ } return (java.lang.Boolean) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isOtherBooleanValue() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isOtherBooleanValue() { java.lang.Object value = this.otherBooleanValue.get(); if ((value == null)) { @@ -41,7 +41,7 @@ } return (java.lang.Boolean) value; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterLazyBoolean))) @@ -53,16 +53,16 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterLazyBoolean); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + (this.isBooleanValue() ? 79 : 97)); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("GetterLazyBoolean(booleanValue=" + this.isBooleanValue()) + ")"); } } diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java index 40716f8b..f192555e 100644 --- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java +++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java @@ -4,7 +4,7 @@ GetterLazyEahcToString() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getValue() { java.lang.Object value = this.value.get(); if ((value == null)) { @@ -21,10 +21,10 @@ } return (String) ((value == this.value) ? null : value); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue2() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getValue2() { return this.value2; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterLazyEahcToString))) @@ -42,10 +42,10 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterLazyEahcToString); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; final java.lang.Object $value = this.getValue(); @@ -54,7 +54,7 @@ result = ((result * PRIME) + (($value2 == null) ? 43 : $value2.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("GetterLazyEahcToString(value=" + this.getValue()) + ", value2=") + this.value2) + ")"); } } diff --git a/test/transform/resource/after-ecj/GetterLazyInvalid.java b/test/transform/resource/after-ecj/GetterLazyInvalid.java index 8e2bc4f3..abfba640 100644 --- a/test/transform/resource/after-ecj/GetterLazyInvalid.java +++ b/test/transform/resource/after-ecj/GetterLazyInvalid.java @@ -27,7 +27,7 @@ class GetterLazyInvalidNone { GetterLazyInvalidClass() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getFieldName() { return this.fieldName; } } diff --git a/test/transform/resource/after-ecj/GetterLazyNative.java b/test/transform/resource/after-ecj/GetterLazyNative.java index 40fe1c84..1bcc3206 100644 --- a/test/transform/resource/after-ecj/GetterLazyNative.java +++ b/test/transform/resource/after-ecj/GetterLazyNative.java @@ -11,7 +11,7 @@ class GetterLazyNative { GetterLazyNative() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBooleanField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isBooleanField() { java.lang.Object value = this.booleanField.get(); if ((value == null)) { @@ -28,7 +28,7 @@ class GetterLazyNative { } return (java.lang.Boolean) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") byte getByteField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated byte getByteField() { java.lang.Object value = this.byteField.get(); if ((value == null)) { @@ -45,7 +45,7 @@ class GetterLazyNative { } return (java.lang.Byte) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") short getShortField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated short getShortField() { java.lang.Object value = this.shortField.get(); if ((value == null)) { @@ -62,7 +62,7 @@ class GetterLazyNative { } return (java.lang.Short) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getIntField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getIntField() { java.lang.Object value = this.intField.get(); if ((value == null)) { @@ -79,7 +79,7 @@ class GetterLazyNative { } return (java.lang.Integer) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") long getLongField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated long getLongField() { java.lang.Object value = this.longField.get(); if ((value == null)) { @@ -96,7 +96,7 @@ class GetterLazyNative { } return (java.lang.Long) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") float getFloatField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated float getFloatField() { java.lang.Object value = this.floatField.get(); if ((value == null)) { @@ -113,7 +113,7 @@ class GetterLazyNative { } return (java.lang.Float) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") double getDoubleField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated double getDoubleField() { java.lang.Object value = this.doubleField.get(); if ((value == null)) { @@ -130,7 +130,7 @@ class GetterLazyNative { } return (java.lang.Double) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") char getCharField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated char getCharField() { java.lang.Object value = this.charField.get(); if ((value == null)) { @@ -147,7 +147,7 @@ class GetterLazyNative { } return (java.lang.Character) value; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int[] getIntArrayField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int[] getIntArrayField() { java.lang.Object value = this.intArrayField.get(); if ((value == null)) { diff --git a/test/transform/resource/after-ecj/GetterLazyTransient.java b/test/transform/resource/after-ecj/GetterLazyTransient.java new file mode 100644 index 00000000..73eb920e --- /dev/null +++ b/test/transform/resource/after-ecj/GetterLazyTransient.java @@ -0,0 +1,28 @@ +class GetterLazyTransient { + private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> nonTransientField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>(); + private final transient @lombok.Getter(lazy = true) int transientField = 2; + private final transient @lombok.Getter int nonLazyTransientField = 3; + GetterLazyTransient() { + super(); + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getNonTransientField() { + java.lang.Object value = this.nonTransientField.get(); + if ((value == null)) + { + synchronized (this.nonTransientField) + { + value = this.nonTransientField.get(); + if ((value == null)) + { + final int actualValue = 1; + value = actualValue; + this.nonTransientField.set(value); + } + } + } + return (java.lang.Integer) value; + } + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getNonLazyTransientField() { + return this.nonLazyTransientField; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterNone.java b/test/transform/resource/after-ecj/GetterNone.java index e13379e0..56c19630 100644 --- a/test/transform/resource/after-ecj/GetterNone.java +++ b/test/transform/resource/after-ecj/GetterNone.java @@ -6,7 +6,7 @@ import lombok.Getter; GetterNone() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/GetterOnClass.java b/test/transform/resource/after-ecj/GetterOnClass.java index deb56392..8a822bcd 100644 --- a/test/transform/resource/after-ecj/GetterOnClass.java +++ b/test/transform/resource/after-ecj/GetterOnClass.java @@ -4,7 +4,7 @@ GetterOnClass1() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPublic() { return this.isPublic; } } @@ -15,10 +15,10 @@ GetterOnClass2() { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPackage() { return this.isPackage; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isProtected() { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isProtected() { return this.isProtected; } } @@ -28,7 +28,7 @@ GetterOnClass3() { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPackage() { return this.isPackage; } } @@ -38,7 +38,7 @@ GetterOnClass4() { super(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPrivate() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPrivate() { return this.isPrivate; } } @@ -48,7 +48,7 @@ GetterOnClass5() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPublic() { return this.isPublic; } } @@ -58,10 +58,10 @@ GetterOnClass6() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getCouldBeNull() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getCouldBeNull() { return this.couldBeNull; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getNonNull() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getNonNull() { return this.nonNull; } } diff --git a/test/transform/resource/after-ecj/GetterOnMethod.java b/test/transform/resource/after-ecj/GetterOnMethod.java index 6b227326..78cbf44d 100644 --- a/test/transform/resource/after-ecj/GetterOnMethod.java +++ b/test/transform/resource/after-ecj/GetterOnMethod.java @@ -7,13 +7,13 @@ class GetterOnMethod { GetterOnMethod() { super(); } - public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() { + public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getI() { return this.i; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getJ() { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getJ() { return this.j; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getK() { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getK() { return this.k; } } diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors.java b/test/transform/resource/after-ecj/GetterOnMethodErrors.java index 7ba02422..af196221 100644 --- a/test/transform/resource/after-ecj/GetterOnMethodErrors.java +++ b/test/transform/resource/after-ecj/GetterOnMethodErrors.java @@ -8,7 +8,7 @@ class PlaceFillerToMakeSurePositionIsRelevant { GetterOnMethodErrors() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getTest() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getTest() { return this.test; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java index 0dfd4c13..8801a199 100644 --- a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java +++ b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java @@ -12,28 +12,28 @@ class GetterOnMethodErrors2 { GetterOnMethodErrors2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad1() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getBad1() { return this.bad1; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad2() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getBad2() { return this.bad2; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad3() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getBad3() { return this.bad3; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad4() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getBad4() { return this.bad4; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood1() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getGood1() { return this.good1; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood2() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getGood2() { return this.good2; } - public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood3() { + public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getGood3() { return this.good3; } - public @Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood4() { + public @Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getGood4() { return this.good4; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterOnStatic.java b/test/transform/resource/after-ecj/GetterOnStatic.java index 89b83ed0..ec6d887e 100644 --- a/test/transform/resource/after-ecj/GetterOnStatic.java +++ b/test/transform/resource/after-ecj/GetterOnStatic.java @@ -6,10 +6,10 @@ class Getter { Getter() { super(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isFoo() { return Getter.foo; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBar() { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getBar() { return Getter.bar; } } diff --git a/test/transform/resource/after-ecj/GetterPlain.java b/test/transform/resource/after-ecj/GetterPlain.java index d3801b62..6e1540ad 100644 --- a/test/transform/resource/after-ecj/GetterPlain.java +++ b/test/transform/resource/after-ecj/GetterPlain.java @@ -5,10 +5,10 @@ class GetterPlain { GetterPlain() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getI() { return this.i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFoo() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getFoo() { return this.foo; } } diff --git a/test/transform/resource/after-ecj/GetterSetterJavadoc.java b/test/transform/resource/after-ecj/GetterSetterJavadoc.java index 275b408d..da2f4324 100644 --- a/test/transform/resource/after-ecj/GetterSetterJavadoc.java +++ b/test/transform/resource/after-ecj/GetterSetterJavadoc.java @@ -1,12 +1,12 @@ @lombok.Data class GetterSetterJavadoc1 { private int fieldName; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getFieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof GetterSetterJavadoc1))) @@ -18,19 +18,19 @@ return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof GetterSetterJavadoc1); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getFieldName()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("GetterSetterJavadoc1(fieldName=" + this.getFieldName()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterSetterJavadoc1() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated GetterSetterJavadoc1() { super(); } } @@ -39,10 +39,10 @@ class GetterSetterJavadoc2 { GetterSetterJavadoc2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getFieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } } @@ -51,10 +51,10 @@ class GetterSetterJavadoc3 { GetterSetterJavadoc3() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getFieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFieldName(final int fieldName) { this.fieldName = fieldName; } } @@ -63,10 +63,10 @@ class GetterSetterJavadoc3 { GetterSetterJavadoc4() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int fieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int fieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterSetterJavadoc4 fieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated GetterSetterJavadoc4 fieldName(final int fieldName) { this.fieldName = fieldName; return this; } @@ -76,10 +76,10 @@ class GetterSetterJavadoc3 { GetterSetterJavadoc5() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int fieldName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int fieldName() { return this.fieldName; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterSetterJavadoc5 fieldName(final int fieldName) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated GetterSetterJavadoc5 fieldName(final int fieldName) { this.fieldName = fieldName; return this; } diff --git a/test/transform/resource/after-ecj/GetterWithDollar.java b/test/transform/resource/after-ecj/GetterWithDollar.java index 424635ed..0223ae16 100644 --- a/test/transform/resource/after-ecj/GetterWithDollar.java +++ b/test/transform/resource/after-ecj/GetterWithDollar.java @@ -3,7 +3,7 @@ class GetterWithDollar1 { GetterWithDollar1() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int get$i() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int get$i() { return this.$i; } } @@ -13,10 +13,10 @@ class GetterWithDollar2 { GetterWithDollar2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int get$i() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int get$i() { return this.$i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/LoggerJBossLog.java b/test/transform/resource/after-ecj/LoggerJBossLog.java new file mode 100644 index 00000000..e5c35708 --- /dev/null +++ b/test/transform/resource/after-ecj/LoggerJBossLog.java @@ -0,0 +1,38 @@ +import lombok.extern.jbosslog.JBossLog; +@lombok.extern.jbosslog.JBossLog class LoggerJBossLog { + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLog.class); + <clinit>() { + } + LoggerJBossLog() { + super(); + } +} +@JBossLog class LoggerJBossLogWithImport { + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggerJBossLogWithImport.class); + <clinit>() { + } + LoggerJBossLogWithImport() { + super(); + } +} +class LoggerJBossLogOuter { + static @lombok.extern.jbosslog.JBossLog class Inner { + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(Inner.class); + <clinit>() { + } + Inner() { + super(); + } + } + LoggerJBossLogOuter() { + super(); + } +} +@JBossLog(topic = "DifferentLogger") class LoggerJBossLogWithDifferentLoggerName { + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger("DifferentLogger"); + <clinit>() { + } + LoggerJBossLogWithDifferentLoggerName() { + super(); + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/MixGetterVal.java b/test/transform/resource/after-ecj/MixGetterVal.java index fbc89a02..92882390 100644 --- a/test/transform/resource/after-ecj/MixGetterVal.java +++ b/test/transform/resource/after-ecj/MixGetterVal.java @@ -13,7 +13,7 @@ class MixGetterVal { final @val int a = getX(); m(a); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/MultiFieldGetter.java b/test/transform/resource/after-ecj/MultiFieldGetter.java index a608578e..0045de34 100644 --- a/test/transform/resource/after-ecj/MultiFieldGetter.java +++ b/test/transform/resource/after-ecj/MultiFieldGetter.java @@ -6,10 +6,10 @@ class MultiFieldGetter { MultiFieldGetter() { super(); } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getY() { return this.y; } } @@ -19,10 +19,10 @@ class MultiFieldGetter { MultiFieldGetter2() { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getY() { return this.y; } } diff --git a/test/transform/resource/after-ecj/NoArgsConstructorForce.java b/test/transform/resource/after-ecj/NoArgsConstructorForce.java new file mode 100644 index 00000000..e191e5eb --- /dev/null +++ b/test/transform/resource/after-ecj/NoArgsConstructorForce.java @@ -0,0 +1,12 @@ +import lombok.NoArgsConstructor; +public @NoArgsConstructor(force = true) class NoArgsConstructorForce { + private final int[] i; + private final Object[] o; + private final java.util.List<?>[] fullQualifiedList; + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated NoArgsConstructorForce() { + super(); + this.i = null; + this.o = null; + this.fullQualifiedList = null; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java index 592ff4b5..d9059d7a 100644 --- a/test/transform/resource/after-ecj/NonNullPlain.java +++ b/test/transform/resource/after-ecj/NonNullPlain.java @@ -5,7 +5,7 @@ import java.lang.annotation.*; @lombok.NonNull int i; @lombok.NonNull String s; @NotNull Object o; - public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) { + public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) { super(); if ((s == null)) { @@ -14,26 +14,26 @@ import java.lang.annotation.*; this.i = i; this.s = s; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getI() { return this.i; } - public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getS() { + public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getS() { return this.s; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Object getO() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Object getO() { return this.o; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @lombok.NonNull int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final @lombok.NonNull int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setS(final @lombok.NonNull String s) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setS(final @lombok.NonNull String s) { if ((s == null)) { throw new java.lang.NullPointerException("s"); } this.s = s; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setO(final Object o) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setO(final Object o) { this.o = o; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/NonNullWithAlternateException.java b/test/transform/resource/after-ecj/NonNullWithAlternateException.java index 1df18538..a2594b91 100644 --- a/test/transform/resource/after-ecj/NonNullWithAlternateException.java +++ b/test/transform/resource/after-ecj/NonNullWithAlternateException.java @@ -10,7 +10,7 @@ public class NonNullWithAlternateException { } System.out.println(arg); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setTest(final @lombok.NonNull String test) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setTest(final @lombok.NonNull String test) { if ((test == null)) { throw new java.lang.IllegalArgumentException("test is null"); diff --git a/test/transform/resource/after-ecj/SetterAccessLevel.java b/test/transform/resource/after-ecj/SetterAccessLevel.java index db26226f..a23e00cb 100644 --- a/test/transform/resource/after-ecj/SetterAccessLevel.java +++ b/test/transform/resource/after-ecj/SetterAccessLevel.java @@ -8,19 +8,19 @@ class SetterAccessLevel { SetterAccessLevel() { super(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setProtected(final boolean isProtected) { this.isProtected = isProtected; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setValue(final boolean value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setValue(final boolean value) { this.value = value; } } diff --git a/test/transform/resource/after-ecj/SetterAlreadyExists.java b/test/transform/resource/after-ecj/SetterAlreadyExists.java index 4a4d0c4c..228b07e4 100644 --- a/test/transform/resource/after-ecj/SetterAlreadyExists.java +++ b/test/transform/resource/after-ecj/SetterAlreadyExists.java @@ -37,7 +37,7 @@ class Setter5 { } void setFoo() { } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFoo(final String foo) { this.foo = foo; } } @@ -48,7 +48,7 @@ class Setter6 { } void setFoo(String foo, int x) { } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFoo(final String foo) { this.foo = foo; } } diff --git a/test/transform/resource/after-ecj/SetterDeprecated.java b/test/transform/resource/after-ecj/SetterDeprecated.java index 91008c96..dc899f8e 100644 --- a/test/transform/resource/after-ecj/SetterDeprecated.java +++ b/test/transform/resource/after-ecj/SetterDeprecated.java @@ -5,10 +5,10 @@ class SetterDeprecated { SetterDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setAnnotation(final int annotation) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setAnnotation(final int annotation) { this.annotation = annotation; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJavadoc(final int javadoc) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJavadoc(final int javadoc) { this.javadoc = javadoc; } } diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java index 8e6455d3..e3cebe68 100644 --- a/test/transform/resource/after-ecj/SetterOnClass.java +++ b/test/transform/resource/after-ecj/SetterOnClass.java @@ -4,7 +4,7 @@ SetterOnClass1() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } } @@ -15,10 +15,10 @@ SetterOnClass2() { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setProtected(final boolean isProtected) { this.isProtected = isProtected; } } @@ -28,7 +28,7 @@ SetterOnClass3() { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPackage(final boolean isPackage) { this.isPackage = isPackage; } } @@ -38,7 +38,7 @@ SetterOnClass4() { super(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } } @@ -48,7 +48,7 @@ SetterOnClass5() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPublic(final boolean isPublic) { this.isPublic = isPublic; } } @@ -58,10 +58,10 @@ SetterOnClass6() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setCouldBeNull(final String couldBeNull) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setCouldBeNull(final String couldBeNull) { this.couldBeNull = couldBeNull; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setNonNull(final @lombok.NonNull String nonNull) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setNonNull(final @lombok.NonNull String nonNull) { if ((nonNull == null)) { throw new java.lang.NullPointerException("nonNull"); diff --git a/test/transform/resource/after-ecj/SetterOnMethod.java b/test/transform/resource/after-ecj/SetterOnMethod.java index 4eaea8e5..8f4399eb 100644 --- a/test/transform/resource/after-ecj/SetterOnMethod.java +++ b/test/transform/resource/after-ecj/SetterOnMethod.java @@ -2,10 +2,10 @@ import lombok.Setter; class SetterOnMethod { @lombok.Setter() int i; @lombok.Setter() int j; - public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final int j) { this.j = j; } SetterOnMethod() { @@ -15,10 +15,10 @@ class SetterOnMethod { @lombok.Setter() class SetterOnClassOnMethod { int i; int j; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final int j) { this.j = j; } SetterOnClassOnMethod() { @@ -28,10 +28,10 @@ class SetterOnMethod { @lombok.Setter() class SetterOnClassAndOnAField { int i; @lombok.Setter() int j; - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final int j) { this.j = j; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } SetterOnClassAndOnAField() { diff --git a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java index 28799f42..ab580e22 100644 --- a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java +++ b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java @@ -7,13 +7,13 @@ class SetterOnMethodOnParam { SetterOnMethodOnParam() { super(); } - public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @Test int j) { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final @Test int j) { this.j = j; } - public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setK(final @Test int k) { + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setK(final @Test int k) { this.k = k; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/SetterOnParam.java b/test/transform/resource/after-ecj/SetterOnParam.java index 7c2d1fc6..d91645dc 100644 --- a/test/transform/resource/after-ecj/SetterOnParam.java +++ b/test/transform/resource/after-ecj/SetterOnParam.java @@ -2,10 +2,10 @@ import lombok.Setter; class SetterOnParam { @lombok.Setter() int i; @lombok.Setter() int j; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @SuppressWarnings("all") int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final @SuppressWarnings("all") int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int j) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int j) { this.j = j; } SetterOnParam() { @@ -15,10 +15,10 @@ class SetterOnParam { @lombok.Setter() class SetterOnClassOnParam { int i; int j; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final int j) { this.j = j; } SetterOnClassOnParam() { @@ -28,10 +28,10 @@ class SetterOnParam { @lombok.Setter() class SetterOnClassAndOnAFieldParam { int i; @lombok.Setter() int j; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int j) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int j) { this.j = j; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } SetterOnClassAndOnAFieldParam() { diff --git a/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java b/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java index 011b2241..fc60c75f 100644 --- a/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java +++ b/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java @@ -1,6 +1,6 @@ class SetterOnParamAndOnMethod { @lombok.Setter() int i; - public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @SuppressWarnings("all") int i) { + public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final @SuppressWarnings("all") int i) { this.i = i; } SetterOnParamAndOnMethod() { diff --git a/test/transform/resource/after-ecj/SetterOnStatic.java b/test/transform/resource/after-ecj/SetterOnStatic.java index 1c5b71ae..78799b42 100644 --- a/test/transform/resource/after-ecj/SetterOnStatic.java +++ b/test/transform/resource/after-ecj/SetterOnStatic.java @@ -6,10 +6,10 @@ class Setter { Setter() { super(); } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final boolean foo) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFoo(final boolean foo) { Setter.foo = foo; } - public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setBar(final int bar) { + public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setBar(final int bar) { Setter.bar = bar; } } diff --git a/test/transform/resource/after-ecj/SetterPlain.java b/test/transform/resource/after-ecj/SetterPlain.java index 4f428f0b..fc442efb 100644 --- a/test/transform/resource/after-ecj/SetterPlain.java +++ b/test/transform/resource/after-ecj/SetterPlain.java @@ -5,10 +5,10 @@ class SetterPlain { SetterPlain() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final int foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setFoo(final int foo) { this.foo = foo; } } diff --git a/test/transform/resource/after-ecj/SetterWithDollar.java b/test/transform/resource/after-ecj/SetterWithDollar.java index e8bd91df..28fed82f 100644 --- a/test/transform/resource/after-ecj/SetterWithDollar.java +++ b/test/transform/resource/after-ecj/SetterWithDollar.java @@ -3,7 +3,7 @@ class SetterWithDollar1 { SetterWithDollar1() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void set$i(final int $i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void set$i(final int $i) { this.$i = $i; } } @@ -13,10 +13,10 @@ class SetterWithDollar2 { SetterWithDollar2() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void set$i(final int $i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void set$i(final int $i) { this.$i = $i; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setI(final int i) { this.i = i; } } diff --git a/test/transform/resource/after-ecj/SimpleTypeResolution.java b/test/transform/resource/after-ecj/SimpleTypeResolution.java index 736632bc..77d52ada 100644 --- a/test/transform/resource/after-ecj/SimpleTypeResolution.java +++ b/test/transform/resource/after-ecj/SimpleTypeResolution.java @@ -7,7 +7,7 @@ class SimpleTypeResolutionSuccess { private @lombok.Getter int x; SimpleTypeResolutionSuccess() { } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/ToStringConfiguration.java b/test/transform/resource/after-ecj/ToStringConfiguration.java index ca36d1b4..508c5f5a 100644 --- a/test/transform/resource/after-ecj/ToStringConfiguration.java +++ b/test/transform/resource/after-ecj/ToStringConfiguration.java @@ -5,10 +5,10 @@ import lombok.Getter; ToStringConfiguration() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration(" + this.x) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } @@ -17,7 +17,7 @@ import lombok.Getter; ToStringConfiguration2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration2(x=" + this.x) + ")"); } } @@ -26,10 +26,10 @@ import lombok.Getter; ToStringConfiguration3() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringConfiguration3(" + this.getX()) + ")"); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/ToStringInner.java b/test/transform/resource/after-ecj/ToStringInner.java index 027ccd0c..42fa81af 100644 --- a/test/transform/resource/after-ecj/ToStringInner.java +++ b/test/transform/resource/after-ecj/ToStringInner.java @@ -5,7 +5,7 @@ import lombok.ToString; ToStringInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringInner(y=" + this.y) + ")"); } } @@ -14,7 +14,7 @@ import lombok.ToString; ToStringStaticInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")"); } } @@ -24,7 +24,7 @@ import lombok.ToString; ToStringMoreInner() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")"); } } @@ -37,7 +37,7 @@ import lombok.ToString; ToStringOuter() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")"); } } diff --git a/test/transform/resource/after-ecj/ToStringPlain.java b/test/transform/resource/after-ecj/ToStringPlain.java index 939aa78e..fa87fde9 100644 --- a/test/transform/resource/after-ecj/ToStringPlain.java +++ b/test/transform/resource/after-ecj/ToStringPlain.java @@ -5,7 +5,7 @@ import lombok.ToString; ToString1() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("ToString1(x=" + this.x) + ", name=") + this.name) + ")"); } } @@ -15,7 +15,7 @@ import lombok.ToString; ToString2() { super(); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("ToString2(x=" + this.x) + ", name=") + this.name) + ")"); } } diff --git a/test/transform/resource/after-ecj/Tolerate.java b/test/transform/resource/after-ecj/Tolerate.java index 1c7b1038..6b027163 100644 --- a/test/transform/resource/after-ecj/Tolerate.java +++ b/test/transform/resource/after-ecj/Tolerate.java @@ -7,10 +7,10 @@ import java.util.regex.Pattern; public @lombok.experimental.Tolerate void setPattern(String pattern) { setPattern(Pattern.compile(pattern)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPattern(final Pattern pattern) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated void setPattern(final Pattern pattern) { this.pattern = pattern; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Pattern getPattern() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Pattern getPattern() { return this.pattern; } } @@ -22,13 +22,13 @@ import java.util.regex.Pattern; public Tolerate2 withPattern(String nameGlob, String extensionGlob) { return withPattern(((nameGlob.replace("*", ".*") + "\\.") + extensionGlob.replace("*", ".*"))); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Pattern getPattern() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Pattern getPattern() { return this.pattern; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Tolerate2 withPattern(final Pattern pattern) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Tolerate2 withPattern(final Pattern pattern) { return ((this.pattern == pattern) ? this : new Tolerate2(pattern)); } - public @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Tolerate2(final Pattern pattern) { + public @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Tolerate2(final Pattern pattern) { super(); this.pattern = pattern; } diff --git a/test/transform/resource/after-ecj/TrickyTypeResolution.java b/test/transform/resource/after-ecj/TrickyTypeResolution.java index 5ea802dc..aca9050d 100644 --- a/test/transform/resource/after-ecj/TrickyTypeResolution.java +++ b/test/transform/resource/after-ecj/TrickyTypeResolution.java @@ -20,7 +20,7 @@ class TrickySuccess { TrickySuccess() { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/UtilityClass.java b/test/transform/resource/after-ecj/UtilityClass.java index 81d5d9e6..b2dfc0df 100644 --- a/test/transform/resource/after-ecj/UtilityClass.java +++ b/test/transform/resource/after-ecj/UtilityClass.java @@ -11,7 +11,7 @@ final @lombok.experimental.UtilityClass class UtilityClass { static void someMethod() { System.out.println(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") UtilityClass() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated UtilityClass() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -22,7 +22,7 @@ class UtilityInner { static int member; <clinit>() { } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InnerInnerInner() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated InnerInnerInner() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -36,7 +36,7 @@ class UtilityInner { static int member; <clinit>() { } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InsideEnum() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated InsideEnum() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -54,7 +54,7 @@ class UtilityInner { static int member; <clinit>() { } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InsideInterface() { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated InsideInterface() { super(); throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } diff --git a/test/transform/resource/after-ecj/ValFinal.java b/test/transform/resource/after-ecj/ValFinal.java new file mode 100644 index 00000000..d7cf9cb7 --- /dev/null +++ b/test/transform/resource/after-ecj/ValFinal.java @@ -0,0 +1,9 @@ +import lombok.val; +public class ValFinal { + public ValFinal() { + super(); + } + public void test() { + final @val int x = 10; + } +} diff --git a/test/transform/resource/after-ecj/ValInLambda.java b/test/transform/resource/after-ecj/ValInLambda.java new file mode 100644 index 00000000..7669789b --- /dev/null +++ b/test/transform/resource/after-ecj/ValInLambda.java @@ -0,0 +1,21 @@ +// version 8: + +import lombok.val; +class ValInLambda { + Runnable foo = (Runnable) () -> { + final @val int i = 1; +}; + ValInLambda() { + super(); + } + public void easyLambda() { + Runnable foo = (Runnable) () -> { + final @val int i = 1; +}; + } + public void easyIntersectionLambda() { + Runnable foo = (Runnable) () -> { + final @val int i = 1; +}; + } +} diff --git a/test/transform/resource/after-ecj/ValNullInit.java b/test/transform/resource/after-ecj/ValNullInit.java new file mode 100644 index 00000000..bd89c023 --- /dev/null +++ b/test/transform/resource/after-ecj/ValNullInit.java @@ -0,0 +1,10 @@ +import lombok.val; + +class ValNullInit { + ValNullInit() { + super(); + } + void method() { + final @val java.lang.Object x = null; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/ValueCallSuper.java b/test/transform/resource/after-ecj/ValueCallSuper.java new file mode 100644 index 00000000..7d046e56 --- /dev/null +++ b/test/transform/resource/after-ecj/ValueCallSuper.java @@ -0,0 +1,34 @@ +class ValueParent {
+ ValueParent() {
+ super();
+ }
+}
+final @lombok.Value class ValueCallSuper extends ValueParent {
+ public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof ValueCallSuper)))
+ return false;
+ final ValueCallSuper other = (ValueCallSuper) o;
+ if ((! other.canEqual((java.lang.Object) this)))
+ return false;
+ if ((! super.equals(o)))
+ return false;
+ return true;
+ }
+ protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) {
+ return (other instanceof ValueCallSuper);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ result = ((result * PRIME) + super.hashCode());
+ return result;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() {
+ return "ValueCallSuper()";
+ }
+ public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueCallSuper() {
+ super();
+ }
+}
diff --git a/test/transform/resource/after-ecj/ValueExperimental.java b/test/transform/resource/after-ecj/ValueExperimental.java index 92deb614..20c6d8f5 100644 --- a/test/transform/resource/after-ecj/ValueExperimental.java +++ b/test/transform/resource/after-ecj/ValueExperimental.java @@ -1,39 +1,39 @@ import lombok.experimental.Value; final @Value class ValueExperimental1 { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueExperimental1))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ValueExperimental1()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimental1() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueExperimental1() { super(); } } final @lombok.experimental.Value class ValueExperimental2 { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueExperimental2))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ValueExperimental2()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimental2() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueExperimental2() { super(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java index 5b366e04..94ff473a 100644 --- a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java +++ b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java @@ -1,20 +1,20 @@ import lombok.experimental.*; final @Value class ValueExperimentalStarImport { - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueExperimentalStarImport))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ValueExperimentalStarImport()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimentalStarImport() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueExperimentalStarImport() { super(); } } diff --git a/test/transform/resource/after-ecj/ValuePlain.java b/test/transform/resource/after-ecj/ValuePlain.java index 6a3265c9..594e3f9b 100644 --- a/test/transform/resource/after-ecj/ValuePlain.java +++ b/test/transform/resource/after-ecj/ValuePlain.java @@ -2,13 +2,13 @@ import lombok.Value; final @lombok.Value class Value1 { private final int x; private final String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value1))) @@ -22,7 +22,7 @@ final @lombok.Value class Value1 { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -30,10 +30,10 @@ final @lombok.Value class Value1 { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Value1(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value1(final int x, final String name) { + public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Value1(final int x, final String name) { super(); this.x = x; this.name = name; @@ -42,13 +42,13 @@ final @lombok.Value class Value1 { @Value @lombok.experimental.NonFinal class Value2 { public final int x; private final String name; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getName() { return this.name; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value2))) @@ -64,10 +64,10 @@ final @lombok.Value class Value1 { return false; return true; } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean canEqual(final java.lang.Object other) { return (other instanceof Value2); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); @@ -75,10 +75,10 @@ final @lombok.Value class Value1 { result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode())); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Value2(x=" + this.getX()) + ", name=") + this.getName()) + ")"); } - public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value2(final int x, final String name) { + public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Value2(final int x, final String name) { super(); this.x = x; this.name = name; @@ -87,13 +87,13 @@ final @lombok.Value class Value1 { final @Value class Value3 { private @lombok.experimental.NonFinal int x; private final int y; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getX() { return this.x; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getY() { return this.y; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof Value3))) @@ -105,17 +105,17 @@ final @Value class Value3 { return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { final int PRIME = 59; int result = 1; result = ((result * PRIME) + this.getX()); result = ((result * PRIME) + this.getY()); return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return (((("Value3(x=" + this.getX()) + ", y=") + this.getY()) + ")"); } - public @java.beans.ConstructorProperties({"x", "y"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value3(final int x, final int y) { + public @java.beans.ConstructorProperties({"x", "y"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Value3(final int x, final int y) { super(); this.x = x; this.y = y; diff --git a/test/transform/resource/after-ecj/ValueStaticField.java b/test/transform/resource/after-ecj/ValueStaticField.java index 4ce84a02..97677417 100644 --- a/test/transform/resource/after-ecj/ValueStaticField.java +++ b/test/transform/resource/after-ecj/ValueStaticField.java @@ -1,24 +1,24 @@ import lombok.Value; final @Value class ValueStaticField { - private static int x; - private static final String PASSWORD = "Ken sent me"; + static int x; + static String PASSWORD = "Ken sent me"; <clinit>() { } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean equals(final java.lang.Object o) { if ((o == this)) return true; if ((! (o instanceof ValueStaticField))) return false; return true; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int hashCode() { int result = 1; return result; } - public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() { + public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated java.lang.String toString() { return "ValueStaticField()"; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueStaticField() { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated ValueStaticField() { super(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/VarComplex.java b/test/transform/resource/after-ecj/VarComplex.java new file mode 100644 index 00000000..10c456eb --- /dev/null +++ b/test/transform/resource/after-ecj/VarComplex.java @@ -0,0 +1,26 @@ +import lombok.experimental.var; +public class VarComplex { + private String field = ""; + private static final int CONSTANT = 20; + <clinit>() { + } + public VarComplex() { + super(); + } + public void testComplex() { + @var char[] shouldBeCharArray = field.toCharArray(); + @var int shouldBeInt = CONSTANT; + @var java.lang.Object lock = new Object(); + synchronized (lock) + { + @var int field = 20; + @var int inner = 10; + switch (field) { + case 5 : + @var char[] shouldBeCharArray2 = shouldBeCharArray; + @var int innerInner = inner; + } + } + @var java.lang.String shouldBeString = field; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/VarInFor.java b/test/transform/resource/after-ecj/VarInFor.java new file mode 100644 index 00000000..0192aaed --- /dev/null +++ b/test/transform/resource/after-ecj/VarInFor.java @@ -0,0 +1,14 @@ +import lombok.experimental.var; +public class VarInFor { + public VarInFor() { + super(); + } + public void enhancedFor() { + int[] list = new int[]{1, 2}; + for (@var int shouldBeInt : list) + { + System.out.println(shouldBeInt); + @var int shouldBeInt2 = shouldBeInt; + } + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/VarInForOld.java b/test/transform/resource/after-ecj/VarInForOld.java new file mode 100644 index 00000000..98fedf03 --- /dev/null +++ b/test/transform/resource/after-ecj/VarInForOld.java @@ -0,0 +1,12 @@ +import lombok.experimental.var; +public class VarInForOld { + public VarInForOld() { + super(); + } + public void oldFor() { + for (@var int i = 0;; (i < 100); ++ i) + { + System.out.println(i); + } + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/VarModifier.java b/test/transform/resource/after-ecj/VarModifier.java new file mode 100644 index 00000000..d11142ca --- /dev/null +++ b/test/transform/resource/after-ecj/VarModifier.java @@ -0,0 +1,12 @@ +import lombok.experimental.var; +public class VarModifier { + private String field = ""; + public VarModifier() { + super(); + } + public void testComplex() { + final @var char[] shouldBeFinalCharArray = field.toCharArray(); + @var char[] shouldBeCharArray = field.toCharArray(); + + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/VarNullInit.java b/test/transform/resource/after-ecj/VarNullInit.java new file mode 100644 index 00000000..3eb2d506 --- /dev/null +++ b/test/transform/resource/after-ecj/VarNullInit.java @@ -0,0 +1,9 @@ +import lombok.experimental.var; +public class VarNullInit { + public VarNullInit() { + super(); + } + void method() { + @var java.lang.Object x = null; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/WitherAccessLevel.java b/test/transform/resource/after-ecj/WitherAccessLevel.java index 18b896df..3248e8ce 100644 --- a/test/transform/resource/after-ecj/WitherAccessLevel.java +++ b/test/transform/resource/after-ecj/WitherAccessLevel.java @@ -9,19 +9,19 @@ class WitherAccessLevel { WitherAccessLevel(boolean isNone, boolean isPrivate, boolean isPackage, boolean isProtected, boolean isPublic, boolean value) { super(); } - private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPrivate(final boolean isPrivate) { + private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAccessLevel withPrivate(final boolean isPrivate) { return ((this.isPrivate == isPrivate) ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value)); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAccessLevel withPackage(final boolean isPackage) { return ((this.isPackage == isPackage) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value)); } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAccessLevel withProtected(final boolean isProtected) { return ((this.isProtected == isProtected) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAccessLevel withPublic(final boolean isPublic) { return ((this.isPublic == isPublic) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withValue(final boolean value) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAccessLevel withValue(final boolean value) { return ((this.value == value) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value)); } } diff --git a/test/transform/resource/after-ecj/WitherAlreadyExists.java b/test/transform/resource/after-ecj/WitherAlreadyExists.java index f0186ca3..9f1b3e12 100644 --- a/test/transform/resource/after-ecj/WitherAlreadyExists.java +++ b/test/transform/resource/after-ecj/WitherAlreadyExists.java @@ -37,7 +37,7 @@ class Wither5 { Wither5(String foo) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Wither5 withFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Wither5 withFoo(final String foo) { return ((this.foo == foo) ? this : new Wither5(foo)); } } @@ -48,7 +48,7 @@ class Wither6 { Wither6(String foo) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Wither6 withFoo(final String foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated Wither6 withFoo(final String foo) { return ((this.foo == foo) ? this : new Wither6(foo)); } } diff --git a/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java b/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java index 4443085c..db0c5d7d 100644 --- a/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java +++ b/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java @@ -4,13 +4,13 @@ final int x = 10; int y = 20; final int z; - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor<T, J, L> withTest(final J test) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAndAllArgsConstructor<T, J, L> withTest(final J test) { return ((this.test == test) ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) { return ((this.test2 == test2) ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z)); } - public @java.beans.ConstructorProperties({"test", "test2", "y", "z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) { + public @java.beans.ConstructorProperties({"test", "test2", "y", "z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) { super(); this.test = test; this.test2 = test2; diff --git a/test/transform/resource/after-ecj/WitherDeprecated.java b/test/transform/resource/after-ecj/WitherDeprecated.java index 90e5fb88..26c7a63f 100644 --- a/test/transform/resource/after-ecj/WitherDeprecated.java +++ b/test/transform/resource/after-ecj/WitherDeprecated.java @@ -5,10 +5,10 @@ class WitherDeprecated { WitherDeprecated(int annotation, int javadoc) { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherDeprecated withAnnotation(final int annotation) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherDeprecated withAnnotation(final int annotation) { return ((this.annotation == annotation) ? this : new WitherDeprecated(annotation, this.javadoc)); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherDeprecated withJavadoc(final int javadoc) { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherDeprecated withJavadoc(final int javadoc) { return ((this.javadoc == javadoc) ? this : new WitherDeprecated(this.annotation, javadoc)); } } diff --git a/test/transform/resource/after-ecj/WitherOnClass.java b/test/transform/resource/after-ecj/WitherOnClass.java index 1d5414d0..b6048394 100644 --- a/test/transform/resource/after-ecj/WitherOnClass.java +++ b/test/transform/resource/after-ecj/WitherOnClass.java @@ -4,7 +4,7 @@ WitherOnClass1(boolean isNone, boolean isPublic) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass1 withPublic(final boolean isPublic) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass1 withPublic(final boolean isPublic) { return ((this.isPublic == isPublic) ? this : new WitherOnClass1(this.isNone, isPublic)); } } @@ -15,10 +15,10 @@ WitherOnClass2(boolean isNone, boolean isProtected, boolean isPackage) { super(); } - @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass2 withPackage(final boolean isPackage) { + @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass2 withPackage(final boolean isPackage) { return ((this.isPackage == isPackage) ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage)); } - protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass2 withProtected(final boolean isProtected) { + protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass2 withProtected(final boolean isProtected) { return ((this.isProtected == isProtected) ? this : new WitherOnClass2(this.isNone, isProtected, this.isPackage)); } } @@ -28,10 +28,10 @@ WitherOnClass3(String couldBeNull, String nonNull) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass3 withCouldBeNull(final String couldBeNull) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass3 withCouldBeNull(final String couldBeNull) { return ((this.couldBeNull == couldBeNull) ? this : new WitherOnClass3(couldBeNull, this.nonNull)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) { if ((nonNull == null)) { throw new java.lang.NullPointerException("nonNull"); @@ -46,7 +46,7 @@ super(); this.fY = y; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass4 withY(final int fY) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherOnClass4 withY(final int fY) { return ((this.fY == fY) ? this : new WitherOnClass4(fY)); } } diff --git a/test/transform/resource/after-ecj/WitherPlain.java b/test/transform/resource/after-ecj/WitherPlain.java index 52177ef1..0364bae4 100644 --- a/test/transform/resource/after-ecj/WitherPlain.java +++ b/test/transform/resource/after-ecj/WitherPlain.java @@ -7,10 +7,10 @@ class WitherPlain { this.i = i; this.foo = foo; } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherPlain withI(final int i) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherPlain withI(final int i) { return ((this.i == i) ? this : new WitherPlain(i, this.foo)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherPlain withFoo(final int foo) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherPlain withFoo(final int foo) { return ((this.foo == foo) ? this : new WitherPlain(this.i, foo)); } } diff --git a/test/transform/resource/after-ecj/WitherWithAbstract.java b/test/transform/resource/after-ecj/WitherWithAbstract.java index 90fd6448..de53630d 100644 --- a/test/transform/resource/after-ecj/WitherWithAbstract.java +++ b/test/transform/resource/after-ecj/WitherWithAbstract.java @@ -3,5 +3,5 @@ abstract class WitherWithAbstract { WitherWithAbstract() { super(); } - public abstract @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithAbstract withFoo(final String foo); + public abstract @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithAbstract withFoo(final String foo); } diff --git a/test/transform/resource/after-ecj/WitherWithGenerics.java b/test/transform/resource/after-ecj/WitherWithGenerics.java index 66d8a8f8..904e005a 100644 --- a/test/transform/resource/after-ecj/WitherWithGenerics.java +++ b/test/transform/resource/after-ecj/WitherWithGenerics.java @@ -6,13 +6,13 @@ class WitherWithGenerics<T, J extends T, L extends java.lang.Number> { public WitherWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest(final J test) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithGenerics<T, J, L> withTest(final J test) { return ((this.test == test) ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { return ((this.test2 == test2) ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { return ((this.test3 == test3) ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3)); } } diff --git a/test/transform/resource/before/BuilderInvalidUse.java b/test/transform/resource/before/BuilderInvalidUse.java index d7052e1e..1a5f2950 100644 --- a/test/transform/resource/before/BuilderInvalidUse.java +++ b/test/transform/resource/before/BuilderInvalidUse.java @@ -1,5 +1,5 @@ //skip compare content -@lombok.experimental.Builder +@lombok.Builder class BuilderInvalidUse { private int something; @@ -10,7 +10,7 @@ class BuilderInvalidUse { } } -@lombok.experimental.Builder +@lombok.Builder class AlsoInvalid { @lombok.Value public static class AlsoInvalidBuilder { diff --git a/test/transform/resource/before/BuilderSimple.java b/test/transform/resource/before/BuilderSimple.java index c749bb6c..83c89713 100644 --- a/test/transform/resource/before/BuilderSimple.java +++ b/test/transform/resource/before/BuilderSimple.java @@ -1,6 +1,6 @@ import java.util.List; -@lombok.experimental.Builder +@lombok.Builder class BuilderSimple<T> { private final int noshow = 0; private final int yes; diff --git a/test/transform/resource/before/BuilderValueData.java b/test/transform/resource/before/BuilderValueData.java new file mode 100644 index 00000000..da4da99a --- /dev/null +++ b/test/transform/resource/before/BuilderValueData.java @@ -0,0 +1,11 @@ +import java.util.List; + +@lombok.Builder @lombok.Value +class BuilderAndValue { + private final int zero = 0; +} + +@lombok.Builder @lombok.Data +class BuilderAndData { + private final int zero = 0; +} diff --git a/test/transform/resource/before/BuilderWithAccessors.java b/test/transform/resource/before/BuilderWithAccessors.java index 4f5660a1..79546885 100644 --- a/test/transform/resource/before/BuilderWithAccessors.java +++ b/test/transform/resource/before/BuilderWithAccessors.java @@ -1,4 +1,4 @@ -@lombok.experimental.Builder @lombok.experimental.Accessors(prefix={"p", "_"}) +@lombok.Builder @lombok.experimental.Accessors(prefix={"p", "_"}) class BuilderWithAccessors { private final int plower; private final int pUpper; diff --git a/test/transform/resource/before/BuilderWithTolerate.java b/test/transform/resource/before/BuilderWithTolerate.java new file mode 100644 index 00000000..48fefce5 --- /dev/null +++ b/test/transform/resource/before/BuilderWithTolerate.java @@ -0,0 +1,18 @@ +import lombok.Builder; +import lombok.experimental.Tolerate; + +@Builder +public class BuilderWithTolerate { + private final int value; + + public static void main(String[] args) { + BuilderWithTolerate.builder().value("42").build(); + } + + public static class BuilderWithTolerateBuilder { + @Tolerate + public BuilderWithTolerateBuilder value(String s) { + return this.value(Integer.parseInt(s)); + } + } +}
\ No newline at end of file diff --git a/test/transform/resource/before/FieldDefaults.java b/test/transform/resource/before/FieldDefaults.java index ffe89734..97389411 100644 --- a/test/transform/resource/before/FieldDefaults.java +++ b/test/transform/resource/before/FieldDefaults.java @@ -1,5 +1,6 @@ @lombok.experimental.FieldDefaults(makeFinal = true) class FieldDefaults1 { + static int STATIC = 3; int x; @lombok.experimental.NonFinal int y; @@ -10,6 +11,7 @@ class FieldDefaults1 { @lombok.experimental.FieldDefaults(level = lombok.AccessLevel.PRIVATE) class FieldDefaults2 { + static int STATIC = 3; @lombok.experimental.PackagePrivate int x; int y; }
\ No newline at end of file diff --git a/test/transform/resource/before/GeneratedGlobalOff.java b/test/transform/resource/before/GeneratedGlobalOff.java new file mode 100644 index 00000000..89dcff62 --- /dev/null +++ b/test/transform/resource/before/GeneratedGlobalOff.java @@ -0,0 +1,5 @@ +//CONF: lombok.addGeneratedAnnotation = false +class GeneratedGlobalOff { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java b/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java new file mode 100644 index 00000000..dc7e9d8a --- /dev/null +++ b/test/transform/resource/before/GeneratedGlobalOffJavaxOn.java @@ -0,0 +1,6 @@ +//CONF: lombok.addGeneratedAnnotation = false +//CONF: lombok.addJavaxGeneratedAnnotation = true +class GeneratedGlobalOffJavaxOn { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedGlobalOffLombokOn.java b/test/transform/resource/before/GeneratedGlobalOffLombokOn.java new file mode 100644 index 00000000..39e80f7e --- /dev/null +++ b/test/transform/resource/before/GeneratedGlobalOffLombokOn.java @@ -0,0 +1,6 @@ +//CONF: lombok.addGeneratedAnnotation = false +//CONF: lombok.addLombokGeneratedAnnotation = true +class GeneratedGlobalOffLombokOn { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedJavaxOff.java b/test/transform/resource/before/GeneratedJavaxOff.java new file mode 100644 index 00000000..db7ee0d1 --- /dev/null +++ b/test/transform/resource/before/GeneratedJavaxOff.java @@ -0,0 +1,5 @@ +//CONF: lombok.addJavaxGeneratedAnnotation = false +class GeneratedJavaxOff { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GeneratedLombokOff.java b/test/transform/resource/before/GeneratedLombokOff.java new file mode 100644 index 00000000..53fcc462 --- /dev/null +++ b/test/transform/resource/before/GeneratedLombokOff.java @@ -0,0 +1,5 @@ +//CONF: lombok.addLombokGeneratedAnnotation = false +class GeneratedLombokOff { + @lombok.Getter + int x; +} diff --git a/test/transform/resource/before/GetterLazyTransient.java b/test/transform/resource/before/GetterLazyTransient.java new file mode 100644 index 00000000..1a913669 --- /dev/null +++ b/test/transform/resource/before/GetterLazyTransient.java @@ -0,0 +1,10 @@ +class GetterLazyTransient { + @lombok.Getter(lazy=true) + private final int nonTransientField = 1; + + @lombok.Getter(lazy=true) + private final transient int transientField = 2; + + @lombok.Getter + private final transient int nonLazyTransientField = 3; +} diff --git a/test/transform/resource/before/LoggerJBossLog.java b/test/transform/resource/before/LoggerJBossLog.java new file mode 100644 index 00000000..fbd88177 --- /dev/null +++ b/test/transform/resource/before/LoggerJBossLog.java @@ -0,0 +1,20 @@ +import lombok.extern.jbosslog.JBossLog; + +@lombok.extern.jbosslog.JBossLog +class LoggerJBossLog { +} + +@JBossLog +class LoggerJBossLogWithImport { +} + +class LoggerJBossLogOuter { + @lombok.extern.jbosslog.JBossLog + static class Inner { + + } +} + +@JBossLog(topic="DifferentLogger") +class LoggerJBossLogWithDifferentLoggerName { +}
\ No newline at end of file diff --git a/test/transform/resource/before/NoArgsConstructorForce.java b/test/transform/resource/before/NoArgsConstructorForce.java new file mode 100644 index 00000000..48df1a37 --- /dev/null +++ b/test/transform/resource/before/NoArgsConstructorForce.java @@ -0,0 +1,8 @@ +import lombok.NoArgsConstructor; + +@NoArgsConstructor(force = true) +public class NoArgsConstructorForce { + private final int[] i; + private final Object[] o; + private final java.util.List<?>[] fullQualifiedList; +}
\ No newline at end of file diff --git a/test/transform/resource/before/ValFinal.java b/test/transform/resource/before/ValFinal.java new file mode 100644 index 00000000..3c5af366 --- /dev/null +++ b/test/transform/resource/before/ValFinal.java @@ -0,0 +1,6 @@ +import lombok.val; +public class ValFinal { + public void test() { + final val x = 10; + } +}
\ No newline at end of file diff --git a/test/transform/resource/before/ValInLambda.java b/test/transform/resource/before/ValInLambda.java new file mode 100644 index 00000000..2c2a5942 --- /dev/null +++ b/test/transform/resource/before/ValInLambda.java @@ -0,0 +1,21 @@ +// version 8: + +import lombok.val; + +class ValInLambda { + Runnable foo = (Runnable) () -> { + val i = 1; + }; + + public void easyLambda() { + Runnable foo = (Runnable) () -> { + val i = 1; + }; + } + + public void easyIntersectionLambda() { + Runnable foo = (Runnable) () -> { + val i = 1; + }; + } +} diff --git a/test/transform/resource/before/ValNullInit.java b/test/transform/resource/before/ValNullInit.java new file mode 100644 index 00000000..649bc0cd --- /dev/null +++ b/test/transform/resource/before/ValNullInit.java @@ -0,0 +1,7 @@ +import lombok.val; + +class ValNullInit { + void method() { + val x = null; + } +}
\ No newline at end of file diff --git a/test/transform/resource/before/ValueCallSuper.java b/test/transform/resource/before/ValueCallSuper.java new file mode 100644 index 00000000..e236b404 --- /dev/null +++ b/test/transform/resource/before/ValueCallSuper.java @@ -0,0 +1,7 @@ +//CONF: lombok.equalsAndHashCode.callSuper = call
+
+class ValueParent {
+}
+@lombok.Value
+class ValueCallSuper extends ValueParent {
+}
diff --git a/test/transform/resource/before/VarComplex.java b/test/transform/resource/before/VarComplex.java new file mode 100644 index 00000000..bfaa8804 --- /dev/null +++ b/test/transform/resource/before/VarComplex.java @@ -0,0 +1,23 @@ +//CONF: lombok.var.flagUsage = ALLOW +import lombok.experimental.var; + +public class VarComplex { + private String field = ""; + private static final int CONSTANT = 20; + + public void testComplex() { + var shouldBeCharArray = field.toCharArray(); + var shouldBeInt = CONSTANT; + var lock = new Object(); + synchronized (lock) { + var field = 20; //Shadowing + var inner = 10; + switch (field) { + case 5: + var shouldBeCharArray2 = shouldBeCharArray; + var innerInner = inner; + } + } + var shouldBeString = field; //Unshadowing + } +}
\ No newline at end of file diff --git a/test/transform/resource/before/VarInFor.java b/test/transform/resource/before/VarInFor.java new file mode 100644 index 00000000..cc8c387e --- /dev/null +++ b/test/transform/resource/before/VarInFor.java @@ -0,0 +1,12 @@ +//CONF: lombok.var.flagUsage = ALLOW +import lombok.experimental.var; + +public class VarInFor { + public void enhancedFor() { + int[] list = new int[] {1, 2}; + for (var shouldBeInt : list) { + System.out.println(shouldBeInt); + var shouldBeInt2 = shouldBeInt; + } + } +}
\ No newline at end of file diff --git a/test/transform/resource/before/VarInForOld.java b/test/transform/resource/before/VarInForOld.java new file mode 100644 index 00000000..f90aba7f --- /dev/null +++ b/test/transform/resource/before/VarInForOld.java @@ -0,0 +1,10 @@ +//CONF: lombok.var.flagUsage = ALLOW +import lombok.experimental.var; + +public class VarInForOld { + public void oldFor() { + for (var i = 0; i < 100; ++i) { + System.out.println(i); + } + } +}
\ No newline at end of file diff --git a/test/transform/resource/before/VarModifier.java b/test/transform/resource/before/VarModifier.java new file mode 100644 index 00000000..7250c1c5 --- /dev/null +++ b/test/transform/resource/before/VarModifier.java @@ -0,0 +1,11 @@ +//CONF: lombok.var.flagUsage = ALLOW +import lombok.experimental.var; + +public class VarModifier { + private String field = ""; + + public void testComplex() { + final var shouldBeFinalCharArray = field.toCharArray(); + var shouldBeCharArray = field.toCharArray(); + } +}
\ No newline at end of file diff --git a/test/transform/resource/before/VarNullInit.java b/test/transform/resource/before/VarNullInit.java new file mode 100644 index 00000000..efdc9d9e --- /dev/null +++ b/test/transform/resource/before/VarNullInit.java @@ -0,0 +1,8 @@ +//CONF: lombok.var.flagUsage = ALLOW +import lombok.experimental.var; + +public class VarNullInit { + void method() { + var x = null; + } +}
\ No newline at end of file diff --git a/test/transform/resource/before/VarWarning.java b/test/transform/resource/before/VarWarning.java new file mode 100644 index 00000000..85559587 --- /dev/null +++ b/test/transform/resource/before/VarWarning.java @@ -0,0 +1,10 @@ +//CONF: lombok.var.flagUsage = WARNING +//skip compare contents +import lombok.experimental.var; + +public class VarWarning { + public void isOkay() { + var x = "Warning"; + x.toLowerCase(); + } +}
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/GetterLazyTransient.java.messages b/test/transform/resource/messages-delombok/GetterLazyTransient.java.messages new file mode 100644 index 00000000..8c1873eb --- /dev/null +++ b/test/transform/resource/messages-delombok/GetterLazyTransient.java.messages @@ -0,0 +1 @@ +5 'lazy' is not supported on transient fields.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/VarNullInit.java.messages b/test/transform/resource/messages-delombok/VarNullInit.java.messages new file mode 100644 index 00000000..190ab7c4 --- /dev/null +++ b/test/transform/resource/messages-delombok/VarNullInit.java.messages @@ -0,0 +1 @@ +6 variable initializer is 'null'
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/VarWarning.java.messages b/test/transform/resource/messages-delombok/VarWarning.java.messages new file mode 100644 index 00000000..48c89581 --- /dev/null +++ b/test/transform/resource/messages-delombok/VarWarning.java.messages @@ -0,0 +1 @@ +7 Use of var is flagged according to lombok configuration
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/GetterLazyTransient.java.messages b/test/transform/resource/messages-ecj/GetterLazyTransient.java.messages new file mode 100644 index 00000000..8c1873eb --- /dev/null +++ b/test/transform/resource/messages-ecj/GetterLazyTransient.java.messages @@ -0,0 +1 @@ +5 'lazy' is not supported on transient fields.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/VarNullInit.java.messages b/test/transform/resource/messages-ecj/VarNullInit.java.messages new file mode 100644 index 00000000..190ab7c4 --- /dev/null +++ b/test/transform/resource/messages-ecj/VarNullInit.java.messages @@ -0,0 +1 @@ +6 variable initializer is 'null'
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/VarWarning.java.messages b/test/transform/resource/messages-ecj/VarWarning.java.messages new file mode 100644 index 00000000..48c89581 --- /dev/null +++ b/test/transform/resource/messages-ecj/VarWarning.java.messages @@ -0,0 +1 @@ +7 Use of var is flagged according to lombok configuration
\ No newline at end of file diff --git a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages index 0b520462..20a621df 100644 --- a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages +++ b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages @@ -1,3 +1,3 @@ 3 @NonNull is meaningless on a primitive. -16 @NonNull is meaningless on a primitive. -42 @NonNull is meaningless on a primitive.
\ No newline at end of file +17 @NonNull is meaningless on a primitive. +47 @NonNull is meaningless on a primitive.
\ No newline at end of file diff --git a/usage_examples/experimental/varExample_post.jpage b/usage_examples/experimental/varExample_post.jpage new file mode 100644 index 00000000..41c022d3 --- /dev/null +++ b/usage_examples/experimental/varExample_post.jpage @@ -0,0 +1,21 @@ +import java.util.ArrayList; +import lombok.var; + +public class ValExample { + public String example() { + ArrayList<String> example = new ArrayList<String>(); + example.add("Hello, World!"); + final String foo = example.get(0); + return foo.toLowerCase(); + } + + public void example2() { + ArrayList<String> list = new ArrayList<String>(); + list.add("zero"); + list.add("one"); + list.add("two"); + for(int i = 0; i < list.size(); ++i) { + System.out.printf("%d: %s\n", i, list.get(i)); + } + } +} diff --git a/usage_examples/experimental/varExample_pre.jpage b/usage_examples/experimental/varExample_pre.jpage new file mode 100644 index 00000000..0786c0df --- /dev/null +++ b/usage_examples/experimental/varExample_pre.jpage @@ -0,0 +1,21 @@ +import java.util.ArrayList; +import lombok.var; + +public class ValExample { + public String example() { + var example = new ArrayList<String>(); + example.add("Hello, World!"); + final var foo = example.get(0); + return foo.toLowerCase(); + } + + public void example2() { + var list = new ArrayList<String>(); + list.add("zero"); + list.add("one"); + list.add("two"); + for(var i = 0; i < list.size(); ++i) { + System.out.printf("%d: %s\n", i, list.get(i)); + } + } +} diff --git a/website/features/Log.html b/website/features/Log.html index 31fab3dc..9415ddd9 100644 --- a/website/features/Log.html +++ b/website/features/Log.html @@ -18,10 +18,12 @@ <em>NEW in lombok 0.10: </em>You can annotate any class with a log annotation to let lombok generate a logger field.<br /> The logger is named <code>log</code> and the field's type depends on which logger you have selected. </p><p> - There are six choices available:<br /> + There are several choices available:<br /> <dl> <dt><code>@CommonsLog</code></dt> <dd>Creates <code><span class="keyword">private static final </span><a href="http://commons.apache.org/logging/apidocs/org/apache/commons/logging/Log.html">org.apache.commons.logging.Log</a> <span class="staticfield">log</span> = <a href="http://commons.apache.org/logging/apidocs/org/apache/commons/logging/LogFactory.html#getLog(java.lang.Class)">org.apache.commons.logging.LogFactory.getLog</a>(LogExample.<span class="keyword">class</span>);</code></dd> + <dt><code>@JBossLog</code></dt> + <dd>Creates <code><span class="keyword">private static final </span><a href="http://docs.jboss.org/jbosslogging/latest/org/jboss/logging/Logger.html">org.jboss.logging.Logger</a> <span class="staticfield">log</span> = <a href="http://docs.jboss.org/jbosslogging/latest/org/jboss/logging/Logger.html#getLogger(java.lang.Class)">org.jboss.logging.Logger.getLogger</a>(LogExample.<span class="keyword">class</span>);</code></dd> <dt><code>@Log</code></dt> <dd>Creates <code><span class="keyword">private static final </span><a href="http://download.oracle.com/javase/6/docs/api/java/util/logging/Logger.html">java.util.logging.Logger</a> <span class="staticfield">log</span> = <a href="http://download.oracle.com/javase/6/docs/api/java/util/logging/Logger.html#getLogger(java.lang.String)">java.util.logging.Logger.getLogger</a>(LogExample.<span class="keyword">class</span>.getName());</code></dd> <dt><code>@Log4j</code></dt> @@ -34,7 +36,7 @@ <dd>Creates <code><span class="keyword">private static final </span><a href="http://www.slf4j.org/api/org/slf4j/ext/XLogger.html">org.slf4j.ext.XLogger</a> <span class="staticfield">log</span> = <a href="http://www.slf4j.org/apidocs/org/slf4j/ext/XLoggerFactory.html#getXLogger(java.lang.Class)">org.slf4j.ext.XLoggerFactory.getXLogger</a>(LogExample.<span class="keyword">class</span>);</code></dd> </dl> </p><p> - By default, the topic (or name) of the logger will be the class name of the class annotated with the <code>@Log</code> annotation. This can be customised by specifying the <code>topic</code> parameter. For example: <code>@XSlf4j(topic="reporting")</code>. + By default, the topic (or name) of the logger will be the class name of the class annotated with the <code>@Log</code> annotation. This can be customised by specifying the <code>topic</code> parameter. For example: <code>@XSlf4j(topic="reporting")</code>. </p> </div> <div class="snippets"> @@ -62,6 +64,8 @@ <dd>Lombok will flag any usage of <code>@lombok.extern.apachecommons.CommonsLog</code> as a warning or error if configured.</dd> <dt><code>lombok.log.javaUtilLogging.flagUsage</code> = [<code>warning</code> | <code>error</code>] (default: not set)</dt> <dd>Lombok will flag any usage of <code>@lombok.extern.java.Log</code> as a warning or error if configured.</dd> + <dt><code>lombok.log.jbosslog.flagUsage</code> = [<code>warning</code> | <code>error</code>] (default: not set)</dt> + <dd>Lombok will flag any usage of <code>@lombok.extern.jbosslog.JBossLog</code> as a warning or error if configured.</dd> <dt><code>lombok.log.log4j.flagUsage</code> = [<code>warning</code> | <code>error</code>] (default: not set)</dt> <dd>Lombok will flag any usage of <code>@lombok.extern.log4j.Log4j</code> as a warning or error if configured.</dd> <dt><code>lombok.log.log4j2.flagUsage</code> = [<code>warning</code> | <code>error</code>] (default: not set)</dt> diff --git a/website/features/Value.html b/website/features/Value.html index 3bae89fc..6c86a77b 100644 --- a/website/features/Value.html +++ b/website/features/Value.html @@ -30,8 +30,8 @@ </p><p> In practice, <code>@Value</code> is shorthand for: <code>final @ToString @EqualsAndHashCode @AllArgsConstructor @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE) @Getter</code>, except that explicitly including an implementation of any of the relevant methods simply means that part won't be generated and no warning will be emitted. For example, if you write your own <code>toString</code>, no error occurs, and lombok will not generate a <code>toString</code>. Also, <em>any</em> explicit constructor, no matter the arguments list, implies lombok will not generate a constructor. If you do want lombok to generate the all-args constructor, add <code>@AllArgsConstructor</code> to the class. You can mark any constructor or method with <code>@lombok.experimental.Tolerate</code> to hide them from lombok. </p><p> - It is possible to override the final-by-default and private-by-default behaviour using either an explicit access level on a field, or by using the <code>@NonFinal</code> or <code>@PackagePrivate</code> annotations.<br /> - It is possible to override any default behaviour for any of the 'parts' that make up <code>@Value</code> by explicitly using that annotation. + It is possible to override the final-by-default and private-by-default behavior using either an explicit access level on a field, or by using the <code>@NonFinal</code> or <code>@PackagePrivate</code> annotations.<br /> + It is possible to override any default behavior for any of the 'parts' that make up <code>@Value</code> by explicitly using that annotation. </p> </div> <div class="snippets"> diff --git a/website/features/experimental/Accessors.html b/website/features/experimental/Accessors.html index f59b4386..909c0873 100644 --- a/website/features/experimental/Accessors.html +++ b/website/features/experimental/Accessors.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="../features.css" /> <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> - <title>EXPERIMENTAL - @Accessors</title> + <title>EXPERIMENTAL – @Accessors</title> </head><body><div id="pepper"> <div class="minimumHeight"></div> <div class="meat"> @@ -97,7 +97,7 @@ </div> </div> <div class="footer"> - <a href="index.html">Back to experimental features</a> | <span class="disabled">Previous feature</span> | <a href="ExtensionMethod.html">Next feature (@ExtensionMethod)</a><br /> + <a href="index.html">Back to experimental features</a> | <a href="var.html">Previous feature (var)</a> | <a href="ExtensionMethod.html">Next feature (@ExtensionMethod)</a><br /> <a href="../../credits.html" class="creditsLink">credits</a> | <span class="copyright">Copyright © 2009-2016 The Project Lombok Authors, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT license</a>.</span> </div> <div style="clear: both;"></div> diff --git a/website/features/experimental/Builder.html b/website/features/experimental/Builder.html index c08c5ab8..e1c545fc 100644 --- a/website/features/experimental/Builder.html +++ b/website/features/experimental/Builder.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="../features.css" /> <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> - <title>EXPERIMENTAL - @Builder</title> + <title>@Builder</title> </head><body><div id="pepper"> <div class="minimumHeight"></div> <div class="meat"> diff --git a/website/features/experimental/Delegate.html b/website/features/experimental/Delegate.html index cae88b1b..5173376d 100644 --- a/website/features/experimental/Delegate.html +++ b/website/features/experimental/Delegate.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="../features.css" /> <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> - <title>@Delegate</title> + <title>EXPERIMENTAL – @Delegate</title> </head><body><div id="pepper"> <div class="minimumHeight"></div> <div class="meat"> diff --git a/website/features/experimental/ExtensionMethod.html b/website/features/experimental/ExtensionMethod.html index 2a3d354c..7090fd19 100644 --- a/website/features/experimental/ExtensionMethod.html +++ b/website/features/experimental/ExtensionMethod.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="../features.css" /> <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> - <title>EXPERIMENTAL - @ExtensionMethod</title> + <title>EXPERIMENTAL – @ExtensionMethod</title> </head><body><div id="pepper"> <div class="minimumHeight"></div> <div class="meat"> diff --git a/website/features/experimental/FieldDefaults.html b/website/features/experimental/FieldDefaults.html index 1aec74b6..a253198b 100644 --- a/website/features/experimental/FieldDefaults.html +++ b/website/features/experimental/FieldDefaults.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="../features.css" /> <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> - <title>EXPERIMENTAL - @FieldDefaults</title> + <title>EXPERIMENTAL – @FieldDefaults</title> </head><body><div id="pepper"> <div class="minimumHeight"></div> <div class="meat"> @@ -36,10 +36,10 @@ to each field in the annotated class or enum. It can also add <code>final</code> to each field in the annotated class or enum. </p> </p><p> - To add <code>final</code> to each field, use <code>@FieldDefaults(makeFinal=true)</code>. Any non-final field which must remain nonfinal + To add <code>final</code> to each (instance) field, use <code>@FieldDefaults(makeFinal=true)</code>. Any non-final field which must remain nonfinal can be annotated with <code>@NonFinal</code> (also in the <code>lombok.experimental</code> package). </p><p> - To add an access modifier to each field, use <code>@FieldDefaults(level=AccessLevel.PRIVATE)</code>. Any field that does not already have an + To add an access modifier to each (instance) field, use <code>@FieldDefaults(level=AccessLevel.PRIVATE)</code>. Any field that does not already have an access modifier (i.e. any field that looks like package private access) is changed to have the appropriate access modifier. Any package private field which must remain package private can be annotated with <code>@PackagePrivate</code> (also in the <code>lombok.experimental</code> package). </p> diff --git a/website/features/experimental/Helper.html b/website/features/experimental/Helper.html index 24903731..da474fc2 100644 --- a/website/features/experimental/Helper.html +++ b/website/features/experimental/Helper.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="../features.css" /> <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> - <title>@Helper</title> + <title>EXPERIMENTAL – @Helper</title> </head><body><div id="pepper"> <div class="minimumHeight"></div> <div class="meat"> diff --git a/website/features/experimental/UtilityClass.html b/website/features/experimental/UtilityClass.html index 42b3b62c..d123b384 100644 --- a/website/features/experimental/UtilityClass.html +++ b/website/features/experimental/UtilityClass.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="../features.css" /> <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> - <title>@UtilityClass</title> + <title>EXPERIMENTAL – @UtilityClass</title> </head><body><div id="pepper"> <div class="minimumHeight"></div> <div class="meat"> diff --git a/website/features/experimental/Value.html b/website/features/experimental/Value.html index 853531bc..ec0ff9e4 100644 --- a/website/features/experimental/Value.html +++ b/website/features/experimental/Value.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="../features.css" /> <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> - <title>EXPERIMENTAL - @Value</title> + <title>EXPERIMENTAL – @Value</title> </head><body><div id="pepper"> <div class="minimumHeight"></div> <div class="meat"> diff --git a/website/features/experimental/Wither.html b/website/features/experimental/Wither.html index 5c1be900..c8030bd9 100644 --- a/website/features/experimental/Wither.html +++ b/website/features/experimental/Wither.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="../features.css" /> <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> - <title>EXPERIMENTAL - @ExtensionMethod</title> + <title>EXPERIMENTAL – @Wither</title> </head><body><div id="pepper"> <div class="minimumHeight"></div> <div class="meat"> diff --git a/website/features/experimental/index.html b/website/features/experimental/index.html index f3893674..4a6d12bb 100644 --- a/website/features/experimental/index.html +++ b/website/features/experimental/index.html @@ -22,6 +22,8 @@ Features that receive positive community feedback and which seem to produce clean, flexible code will eventually become accepted as a core feature and move out of the experimental package. <dl> + <dt><a href="var.html"><code>@var</code></a></dt> + <dd>The same as @val but modifiable.</dd> <dt><a href="Accessors.html"><code>@Accessors</code></a></dt> <dd>A more fluent API for getters and setters.</dd> <dt><a href="ExtensionMethod.html"><code>@ExtensionMethod</code></a></dt> diff --git a/website/features/experimental/onX.html b/website/features/experimental/onX.html index 890feadf..d4260dd5 100644 --- a/website/features/experimental/onX.html +++ b/website/features/experimental/onX.html @@ -5,7 +5,7 @@ <link rel="stylesheet" type="text/css" href="../features.css" /> <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> <meta name="description" content="Spice up your java" /> - <title>onX</title> + <title>EXPERIMENTAL – onX</title> </head><body><div id="pepper"> <div class="minimumHeight"></div> <div class="meat"> diff --git a/website/features/experimental/var.html b/website/features/experimental/var.html new file mode 100644 index 00000000..dde9c35e --- /dev/null +++ b/website/features/experimental/var.html @@ -0,0 +1,83 @@ +<!DOCTYPE html> +<html><head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <link rel="stylesheet" type="text/css" href="../../logi/reset.css" /> + <link rel="stylesheet" type="text/css" href="../features.css" /> + <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" /> + <meta name="description" content="Spice up your java" /> + <title>EXPERIMENTAL – @var</title> +</head><body><div id="pepper"> + <div class="minimumHeight"></div> + <div class="meat"> + <div class="header"><a href="../../index.html">Project Lombok</a></div> + <h1>@var</h1> + <div class="byline">Modifiable local variables with a type inferred by assigning value.</div> + <div class="since"> + <h3>Since</h3> + <p> + @var was introduced as experimental feature in lombok v1.16.12. + </p> + </div> + <div class="experimental"> + <h3>Experimental</h3> + <p> + Experimental because: + <ul> + <li>This feature is very controversial.</li> + <li>There is <a href="http://openjdk.java.net/jeps/286">JEP 286</a> that should make the @var obsolete.</li> + </ul>Current status: <em>uncertain</em> - Currently we feel this feature cannot move out of experimental status. + </div> + <div class="overview"> + <h3>Overview</h3> + <p> + The <code>@var</code> has the same mission as the <a href="../val.html">@val</a> annotation but modifable. + </p> + </div> + <div class="snippets"> + <div class="pre"> + <h3>With Lombok</h3> + <div class="snippet">@HTML_PRE@</div> + </div> + <div class="sep"></div> + <div class="post"> + <h3>Vanilla Java</h3> + <div class="snippet">@HTML_POST@</div> + </div> + </div> + <div style="clear: left;"></div> + <div class="overview confKeys"> + <h3>Supported configuration keys:</h3> + <dl> + <dt><code>lombok.val.flagUsage</code> = [<code>allow</code>] (default: not set)</dt> + <dd><strong>Lombok will flag any usage of <code>var</code> as an error if not configured.</strong></dd> + </dl> + </div> + <div class="overview"> + <h3>Small print</h3><div class="smallprint"> + <p> + For compound types, the most common superclass is inferred, not any shared interfaces. For example, <code>bool ? new HashSet() : new ArrayList()</code> + is an expression with a compound type: The result is both <code>AbstractCollection</code> as well as <code>Serializable</code>. The type inferred will be + <code>AbstractCollection</code>, as that is a class, whereas <code>Serializable</code> is an interface. + </p><p> + In ambiguous cases, <code>java.lang.Object</code> is inferred. + </p> + </div> + </div> + <div class="footer"> + <a href="index.html">Back to experimental features</a> | <span class="disabled">Previous feature</span> | <a href="Accessors.html">Next feature (@Accessors)</a><br /> + <a href="../../credits.html" class="creditsLink">credits</a> | <span class="copyright">Copyright © 2009-2016 The Project Lombok Authors, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT license</a>.</span> + </div> + <div style="clear: both;"></div> + </div> +</div> +<script type="text/javascript"> + var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); + document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); +</script> +<script type="text/javascript"> + try { + var pageTracker = _gat._getTracker("UA-9884254-1"); + pageTracker._trackPageview(); + } catch(err) {} +</script> +</body></html> diff --git a/website/index.css b/website/index.css index b89e65cb..eeb330ce 100644 --- a/website/index.css +++ b/website/index.css @@ -40,6 +40,16 @@ h1 { height: 170px; } +.separator { + background-image: url(buttonbar.jpg); + width: 800px; + height: 8px; + line-height: 8px; + font-size: 14px; + text-align: center; + clear: both; +} + .endBar { -webkit-border-bottom-right-radius: 15px 15px; -webkit-border-bottom-left-radius: 15px 15px; @@ -133,6 +143,10 @@ code { margin-left: 32px; } +.note { + color: grey; +} + .footer { margin-top: 8px; display: block; diff --git a/website/mavenrepo/index.html b/website/mavenrepo/index.html index b97eb829..a51a5a20 100644 --- a/website/mavenrepo/index.html +++ b/website/mavenrepo/index.html @@ -66,12 +66,19 @@ <div class="snippet">libraryDependencies += "org.projectlombok" % "lombok" % "@VERSION@"</div> </div> <h2>Gradle</h2> + + <div> + If your gradle version is <strong> >= 2.12</strong> you can use lombok by adding the following to your <strong>build.gradle</strong> in the <strong>dependencies</strong> block: + <div class="snippet">compileOnly "org.projectlombok:lombok:@VERSION@"</div> + </div> <div> - You can use lombok with gradle by adding the following to your <strong>build.gradle</strong> in the <strong>dependencies</strong> block: + If you use an older version you can still use the following: <div class="snippet">provided "org.projectlombok:lombok:@VERSION@"</div> + as long as your gradle build include a war task (otherwise the "provided" scope is not available and you have to create your own configuration as <a href="https://issues.gradle.org/browse/GRADLE-784">explained here</a> ) </div> + <br> <div> - <em>NOTE:</em> You'll still need to download lombok, or doubleclick on the lombok.jar file downloaded by maven / ivy / gradle, to install lombok into your eclipse installation. + <strong><em>NOTE:</em></strong> You'll still need to download lombok, or doubleclick on the lombok.jar file downloaded by maven / ivy / gradle, to install lombok into your eclipse installation. </div> <a id="downloadLink" href="https://projectlombok.org/downloads/lombok.jar">Download lombok.jar</a> </div> diff --git a/website/setup/ecj.html b/website/setup/ecj.html index 07d2f0f6..cc70c566 100644 --- a/website/setup/ecj.html +++ b/website/setup/ecj.html @@ -42,10 +42,34 @@ <div class="downloadHelp"> ecj (the eclipse standalone compiler) is compatible with lombok. Use the following command line to enable lombok with ecj: <p> - <pre> -java <strong>-javaagent:lombok.jar=ECJ -Xbootclasspath/p:lombok.jar</strong> -jar ecj.jar -cp lombok.jar <em>(rest of arguments)</em></pre> + <pre>java <strong>-javaagent:lombok.jar=ECJ</strong> -jar ecj.jar -cp lombok.jar -source 1.8 <em class="note">(rest of arguments)</em></pre> + <p> + You may have to add the following VM argument, if you're using an older version of lombok or java: + <pre><strong>-Xbootclasspath/p:lombok.jar</strong></pre> + <p> If you're using a tool based on ecj, adding these VM arguments and adding lombok.jar to the classpath should work. </div> + <div class="separator"> + </div> + <div class="downloadHelp"> + <h3>Using ecj with Maven</h3> + <p> + It is possible to <a href="pom.xml">configure</a> <code>maven-compiler-plugin</code> with <code>maven-dependency-plugin</code> and <code>plexus-compiler-eclipse</code>. + </p> + <p> + Before the <code>compile</code> phase, you will have to set your <code>MAVEN_OPTS</code> environment variable to include the <code>javaagent</code> argument. + In the example below, <code>target</code> is your <code>${project.build.directory}</code>. + </p> + <p> + Use the following commands in sequence to enable lombok with ecj in your Maven build: +<pre> +mvn clean <strong>dependency:copy@get-lombok</strong> +set MAVEN_OPTS=<strong>-javaagent:target/lombok.jar=ECJ</strong> <em class="note">(or your OS's equivalent)</em> +mvn install +set MAVEN_OPTS= <em class="note">(or your OS's equivalent)</em> +</pre> + </p> + </div> <div class="endBar"> </div> <div class="footer"> diff --git a/website/setup/pom.xml b/website/setup/pom.xml new file mode 100644 index 00000000..6562afe8 --- /dev/null +++ b/website/setup/pom.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.projectlombok</groupId> + <artifactId>eclipse-compiler-test</artifactId> + <version>1.0-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <lombok.version>1.16.8</lombok.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.5.1</version> + <configuration> + <compilerId>eclipse</compilerId> + <source>1.8</source> + <target>1.8</target> + </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-compiler-eclipse</artifactId> + <version>2.7</version> + </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <executions> + <execution> + <id>get-lombok</id> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + <type>jar</type> + <outputDirectory>${project.build.directory}</outputDirectory> + <destFileName>lombok.jar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> |
