diff options
49 files changed, 465 insertions, 191 deletions
@@ -25,6 +25,8 @@ This buildfile is part of projectlombok.org. It is the main entry point that con the common tasks and can be called on to run the main aspects of all the sub-scripts. </description> + <property name="pattern.jdk9Plus" value="^(9|[1-9][0-9])(\..*)?$" /> + <property name="pattern.jdkUpto8" value="^(1\.)?[2-8](\..*)?$" /> <property name="build.compiler" value="javac1.6" /> <property name="ivy.retrieve.pattern" value="lib/[conf]/[organisation]-[artifact].[ext]" /> <available file="lib/ivyplusplus.jar" property="ivyplusplus.available" /> @@ -163,7 +165,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <target name="-ensureJdk9"> <condition property="java.version.insufficient"> - <matches string="${java.version}" pattern="^1\.[2-8](\..*)?" /> + <matches string="${ant.java.version}" pattern="${pattern.jdkUpto8}" /> </condition> <fail if="java.version.insufficient">To compile lombok, you need JDK9 or higher; lombok requires this version because it's rather difficult to produce lombok builds that are compatible on JDK9 without at least building with JDK9. Sorry about that.</fail> </target> @@ -543,6 +545,7 @@ ${sourceWarning}</echo> <classpath refid="test.path" /> <classpath refid="build.path" /> <classpath path="build/lombok" /> + <classpath path="build/tests" /> <src path="test/core/src" /> <src path="test/transform/src" /> <src path="test/bytecode/src" /> @@ -551,11 +554,11 @@ ${sourceWarning}</echo> </target> <target name="test-ecj" depends="dist, contrib, setupJavaOracle8TestEnvironment" unless="tests.skip"> - <condition property="ecj.loc" value="lib/ecj9/*" else="lib/ecj8/*"> - <equals arg1="${ant.java.version}" arg2="9" /> + <condition property="ecj.loc" value="lib/ecj9/org.eclipse.jdt-ecj.jar" else="lib/ecj8/org.eclipse.jdt.core.compiler-ecj.jar"> + <matches string="${ant.java.version}" pattern="${pattern.jdk9Plus}" /> </condition> - <java classname="org.eclipse.jdt.internal.compiler.batch.Main" fork="true" failonerror="true"> - <classpath path="${ecj.loc}" /> + <echo>Testing ECJ using ECJ: ${ecj.loc}</echo> + <java jar="${ecj.loc}" fork="true" failonerror="true"> <jvmarg value="-javaagent:dist/lombok.jar=ecj" /> <arg value="-source" /> <arg value="1.6" /> @@ -645,7 +648,7 @@ ${sourceWarning}</echo> <get src="https://projectlombok.org/ivyrepo/langtools/jdk8-javac-sources.zip" dest="lib/oracleJDK8Environment/javac8-sources.zip" verbose="true" usetimestamp="true" /> <propertyfile file="testenvironment.properties"> <entry key="test.location.javac" value="lib/oracleJDK8Environment/javac8.jar" /> - <entry key="test.location.ecj" value="lib/ecj8/org.eclipse.custom-ecj.jar" /> + <entry key="test.location.ecj" value="lib/ecj8/org.eclipse.jdt.core.compiler-ecj.jar" /> <entry key="test.location.bootclasspath" value="lib/oracleJDK8Environment/rt.jar" /> <entry key="test.location.name" value="OracleJDK8" /> <entry key="test.javaversion" value="8" /> @@ -679,24 +682,26 @@ You can also create your own by writing a 'testenvironment.properties' file. The </fail> </target> - <target name="test" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj, -test-check, -test8, -test9" /> + <target name="test" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj, -test-check, -test8, -test9" description="Runs all tests." /> + + <target name="testfast" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, -test-check, -test8, -test9" /> <target name="-test-check"> <condition property="test9.run"> <and> <not><isset property="tests.skip" /></not> - <equals arg1="${ant.java.version}" arg2="9" /> + <matches string="${ant.java.version}" pattern="${pattern.jdk9Plus}" /> </and> </condition> <condition property="test8.run"> <and> <not><isset property="tests.skip" /></not> - <not><equals arg1="${ant.java.version}" arg2="9" /></not> + <matches string="${ant.java.version}" pattern="${pattern.jdkUpto8}" /> </and> </condition> </target> - <target name="-test9" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj" if="test9.run"> + <target name="-test9" if="test9.run"> <echo>Running test suite in JDK9+ mode</echo> <junit haltonfailure="no" fork="true"> <jvmarg value="-javaagent:dist/lombok.jar" /> @@ -731,7 +736,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The </junit> </target> - <target name="-test8" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj" if="test8.run" description="Runs the tests."> + <target name="-test8" if="test8.run"> <echo>Running test suite in JDK6-8 mode</echo> <junit haltonfailure="no" fork="true"> <jvmarg value="-javaagent:dist/lombok.jar" /> diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index 15c03ed1..081be608 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -44,8 +44,8 @@ <dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime; contrib->sources" /> <dependency org="org.eclipse.custom" name="ecj" rev="4.3.1" conf="ecj7->default; contrib->sources" /> <dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="4.6.1" conf="ecj8->default; contrib->sources" /> - <dependency org="org.eclipse.tycho" name="org.eclipse.jdt.core" rev="3.13.50.v20171007-0855" conf="ecj9->default; eclipseBuild->default" /> - <dependency org="org.eclipse.tycho" name="org.eclipse.jdt.compiler.apt" rev="1.3.50.v20170920-0950" conf="ecj9->default; eclipseBuild->default" /> + <dependency org="org.eclipse.jdt" name="ecj" rev="3.15.0" conf="ecj9->default; eclipseBuild->default" /> + <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.compiler.apt" rev="1.3.300" conf="ecj9->default; eclipseBuild->default" /> <dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" /> <dependency org="netbeans.org" name="openide.modules" rev="6.8beta" conf="netbeansBuild->build" /> diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 220e0dc0..aad47a85 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -5,7 +5,11 @@ Lombok Changelog * PLATFORM: Support for Eclipse Photon. [Issue #1831](https://github.com/rzwitserloot/lombok/issues/1831) * FEATURE: The `@FieldNameConstants` feature has been completely redesigned. [Issue #1774](https://github.com/rzwitserloot/lombok/issues/1774) [FieldNameConstants documentation](https://projectlombok.org/features/experimental/FieldNameConstants) * FEATURE: Lombok's `@NonNull` annotation can now be used on types (annotation on types has been introduced in JDK 8). `@Builder`'s `@Singular` annotation now properly deals with annotations on the generics type on the collection: `@Singular List<@NonNull String> names;` now does the right thing. +* FEATURE: You can now mix `@SuperBuilder` and `toBuilder`, and `toBuilder` no longer throws `NullPointerException` if an `@Singular`-marked collection field is `null`. [Issue #1324](https://github.com/rzwitserloot/lombok/issues/1324) +* FEATURE: delombok now supports module paths via the `--module-path` option, and will automatically add lombok itself to the module path. This should make it possible to delombok your modularized projects. [Issue #1848](https://github.com/rzwitserloot/lombok/issues/1848) +* FEATURE: You can pass `@args.txt` to `delombok` to read args from the text file; useful if you have really long classpaths you need to pass to delombok. [Issue #1795](https://github.com/rzwitserloot/lombok/issues/1795) * BREAKING CHANGE: Lombok will now always copy specific annotations around (from field to getter, from field to builder 'setter', etcetera): A specific curated list of known annotations where that is the right thing to do (generally, `@NonNull` style annotations from various libraries), as well as any annotations you explicitly list in the `lombok.copyableAnnotations` config key in your `lombok.config` file. Also, lombok is more consistent about copying these annotations. (Previous behaviour: Lombok used to copy any annotation whose simple name was `NonNull`, `Nullable`, or `CheckForNull`). [Issue #1570](https://github.com/rzwitserloot/lombok/issues/1570) and [Issue #1634](https://github.com/rzwitserloot/lombok/issues/1634) +* BUGFIX: `@NoArgsConstructor(force=true)` would try to initialize already initialized final fields in Eclipse. [Issue #1829](https://github.com/rzwitserloot/lombok/issues/1829) * BUGFIX: When using lombok to compile modularized (`module-info.java`-style) code, if the module name has dots in it, it wouldn't work. [Issue #1808](https://github.com/rzwitserloot/lombok/issues/1808) * BUGFIX: Errors about lombok not reading a module providing `org.mapstruct.ap.spi` when trying to use lombok in jigsaw-mode on JDK 11. [Issue #1806](https://github.com/rzwitserloot/lombok/issues/1806) * BUGFIX: Fix NetBeans compile on save. [Issue #1770](https://github.com/rzwitserloot/lombok/issues/1770) diff --git a/src/core/lombok/core/Main.java b/src/core/lombok/core/Main.java index 6952ab78..47afaefd 100644 --- a/src/core/lombok/core/Main.java +++ b/src/core/lombok/core/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 The Project Lombok Authors. + * Copyright (C) 2009-2018 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,7 +41,9 @@ public class Main { Thread.currentThread().setContextClassLoader(Main.class.getClassLoader()); int err = new Main(SpiLoadUtil.readAllFromIterator( SpiLoadUtil.findServices(LombokApp.class)), Arrays.asList(args)).go(); - System.exit(err); + if (err != 0) { + System.exit(err); + } } @ProviderFor(LombokApp.class) @@ -143,7 +145,7 @@ public class Main { out.println("------------------------------"); } out.println("projectlombok.org " + Version.getFullVersion()); - out.println("Copyright (C) 2009-2015 The Project Lombok Authors."); + out.println("Copyright (C) 2009-2018 The Project Lombok Authors."); out.println("Run 'lombok license' to see the lombok license agreement."); out.println(); out.println("Run lombok without any parameters to start the graphical installer."); diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index 09765efc..89cf81e0 100644 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -25,6 +25,7 @@ import static lombok.eclipse.Eclipse.*; import static lombok.core.handlers.HandlerUtil.*; import static lombok.eclipse.handlers.EclipseHandlerUtil.*; +import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -46,6 +47,7 @@ import org.eclipse.jdt.internal.compiler.ast.FalseLiteral; import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration; import org.eclipse.jdt.internal.compiler.ast.FieldReference; import org.eclipse.jdt.internal.compiler.ast.IfStatement; +import org.eclipse.jdt.internal.compiler.ast.LocalDeclaration; import org.eclipse.jdt.internal.compiler.ast.MessageSend; import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; import org.eclipse.jdt.internal.compiler.ast.NullLiteral; @@ -443,6 +445,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> { cleanDecl.declarationSourceEnd = -1; cleanDecl.modifiers = ClassFileConstants.AccPrivate; cleanDecl.type = TypeReference.baseTypeReference(TypeIds.T_boolean, 0); + cleanDecl.traverse(new SetGeneratedByVisitor(ast), (MethodScope) null); injectFieldAndMarkGenerated(builderType, cleanDecl); } @@ -502,15 +505,12 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> { } } - private static final char[] EMPTY_LIST = "emptyList".toCharArray(); + private static final char[] BUILDER_TEMP_VAR = {'b', 'u', 'i', 'l', 'd', 'e', 'r'}; private MethodDeclaration generateToBuilderMethod(String methodName, String builderClassName, EclipseNode type, TypeParameter[] typeParams, List<BuilderFieldData> builderFields, boolean fluent, ASTNode source) { - // return new ThingieBuilder<A, B>().setA(this.a).setB(this.b); - int pS = source.sourceStart, pE = source.sourceEnd; long p = (long) pS << 32 | pE; - MethodDeclaration out = new MethodDeclaration( - ((CompilationUnitDeclaration) type.top().get()).compilationResult); + MethodDeclaration out = new MethodDeclaration(((CompilationUnitDeclaration) type.top().get()).compilationResult); out.selector = methodName.toCharArray(); out.modifiers = ClassFileConstants.AccPublic; out.bits |= ECLIPSE_DO_NOT_TOUCH_FLAG; @@ -519,6 +519,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> { invoke.type = namePlusTypeParamsToTypeReference(builderClassName.toCharArray(), typeParams, p); Expression receiver = invoke; + List<Statement> statements = null; for (BuilderFieldData bfd : builderFields) { char[] setterName = fluent ? bfd.name : HandlerUtil.buildAccessorName("set", new String(bfd.name)).toCharArray(); MessageSend ms = new MessageSend(); @@ -542,22 +543,34 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> { tgt[i] = obtainExpr; } } + + ms.selector = setterName; if (bfd.singularData == null) { ms.arguments = tgt; + ms.receiver = receiver; + receiver = ms; } else { - Expression ifNull = new EqualExpression(tgt[0], new NullLiteral(0, 0), OperatorIds.EQUAL_EQUAL); - MessageSend emptyList = new MessageSend(); - emptyList.receiver = generateQualifiedNameRef(source, TypeConstants.JAVA, TypeConstants.UTIL, "Collections".toCharArray()); - emptyList.selector = EMPTY_LIST; - emptyList.typeArguments = copyTypes(bfd.singularData.getTypeArgs().toArray(new TypeReference[0])); - ms.arguments = new Expression[] {new ConditionalExpression(ifNull, emptyList, tgt[1])}; + ms.arguments = new Expression[] {tgt[1]}; + ms.receiver = new SingleNameReference(BUILDER_TEMP_VAR, p); + EqualExpression isNotNull = new EqualExpression(tgt[0], new NullLiteral(pS, pE), OperatorIds.NOT_EQUAL); + if (statements == null) statements = new ArrayList<Statement>(); + statements.add(new IfStatement(isNotNull, ms, pS, pE)); } - ms.receiver = receiver; - ms.selector = setterName; - receiver = ms; } - out.statements = new Statement[] {new ReturnStatement(receiver, pS, pE)}; + if (statements != null) { + out.statements = new Statement[statements.size() + 2]; + for (int i = 0; i < statements.size(); i++) out.statements[i + 1] = statements.get(i); + LocalDeclaration b = new LocalDeclaration(BUILDER_TEMP_VAR, pS, pE); + out.statements[0] = b; + b.modifiers |= Modifier.FINAL; + b.type = namePlusTypeParamsToTypeReference(builderClassName.toCharArray(), typeParams, p); + b.type.sourceStart = pS; b.type.sourceEnd = pE; + b.initialization = receiver; + out.statements[out.statements.length - 1] = new ReturnStatement(new SingleNameReference(BUILDER_TEMP_VAR, p), pS, pE); + } else { + out.statements = new Statement[] {new ReturnStatement(receiver, pS, pE)}; + } out.traverse(new SetGeneratedByVisitor(source), ((TypeDeclaration) type.get()).scope); return out; @@ -617,7 +630,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> { inv.typeArguments = typeParameterNames(((TypeDeclaration) type.get()).typeParameters); args.add(new ConditionalExpression( - new SingleNameReference(bfd.nameOfSetFlag, 0L), + new SingleNameReference(bfd.nameOfSetFlag, 0L), new SingleNameReference(bfd.name, 0L), inv)); } else { diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java index cb07115a..82859e4b 100644 --- a/src/core/lombok/eclipse/handlers/HandleConstructor.java +++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java @@ -484,6 +484,7 @@ public class HandleConstructor { for (EclipseNode node : type.down()) { if (node.getKind() != Kind.FIELD) continue top; FieldDeclaration fd = (FieldDeclaration) node.get(); + if (fd.initialization != null) continue top; if ((fd.modifiers & ClassFileConstants.AccFinal) == 0) continue top; if ((fd.modifiers & ClassFileConstants.AccStatic) != 0) continue top; for (EclipseNode ftp : fieldsToParam) if (node == ftp) continue top; diff --git a/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java b/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java index 17fc5e09..4b094a9f 100644 --- a/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java +++ b/src/core/lombok/eclipse/handlers/singulars/EclipseGuavaSingularizer.java @@ -94,6 +94,7 @@ abstract class EclipseGuavaSingularizer extends EclipseSingularizer { buildField.modifiers = ClassFileConstants.AccPrivate; buildField.declarationSourceEnd = -1; buildField.type = type; + data.setGeneratedByRecursive(buildField); return Collections.singletonList(injectFieldAndMarkGenerated(builderType, buildField)); } @@ -117,6 +118,7 @@ abstract class EclipseGuavaSingularizer extends EclipseSingularizer { md.returnType = returnType; md.annotations = deprecate ? new Annotation[] { generateDeprecatedAnnotation(data.getSource()) } : null; + data.setGeneratedByRecursive(md); injectMethod(builderType, md); } diff --git a/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java b/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java index c7315790..11314bd3 100644 --- a/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java +++ b/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java @@ -85,6 +85,7 @@ abstract class EclipseJavaUtilListSetSingularizer extends EclipseJavaUtilSingula buildField.modifiers = ClassFileConstants.AccPrivate; buildField.declarationSourceEnd = -1; buildField.type = type; + data.setGeneratedByRecursive(buildField); return Collections.singletonList(injectFieldAndMarkGenerated(builderType, buildField)); } @@ -117,6 +118,8 @@ abstract class EclipseJavaUtilListSetSingularizer extends EclipseJavaUtilSingula md.statements = returnStatement != null ? new Statement[] {clearStatement, returnStatement} : new Statement[] {clearStatement}; md.returnType = returnType; md.annotations = deprecate ? new Annotation[] { generateDeprecatedAnnotation(data.getSource()) } : null; + + data.setGeneratedByRecursive(md); injectMethod(builderType, md); } @@ -149,7 +152,6 @@ abstract class EclipseJavaUtilListSetSingularizer extends EclipseJavaUtilSingula md.annotations = deprecate ? new Annotation[] { generateDeprecatedAnnotation(data.getSource()) } : null; data.setGeneratedByRecursive(md); - HandleNonNull.INSTANCE.fix(injectMethod(builderType, md)); } diff --git a/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilMapSingularizer.java b/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilMapSingularizer.java index 174cd5fc..55f6cadd 100644 --- a/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilMapSingularizer.java +++ b/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilMapSingularizer.java @@ -127,6 +127,7 @@ public class EclipseJavaUtilMapSingularizer extends EclipseJavaUtilSingularizer buildValueField.declarationSourceEnd = -1; buildValueField.type = type; } + data.setGeneratedByRecursive(buildKeyField); data.setGeneratedByRecursive(buildValueField); EclipseNode keyFieldNode = injectFieldAndMarkGenerated(builderType, buildKeyField); @@ -174,6 +175,7 @@ public class EclipseJavaUtilMapSingularizer extends EclipseJavaUtilSingularizer md.returnType = returnType; md.annotations = deprecate ? new Annotation[] { generateDeprecatedAnnotation(data.getSource()) } : null; + data.setGeneratedByRecursive(md); injectMethod(builderType, md); } diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java index bc1a8072..c5c1e1ca 100644 --- a/src/core/lombok/javac/handlers/HandleBuilder.java +++ b/src/core/lombok/javac/handlers/HandleBuilder.java @@ -484,6 +484,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> { sb.append("__ERR__"); } + private static final String BUILDER_TEMP_VAR = "builder"; private JCMethodDecl generateToBuilderMethod(String toBuilderMethodName, String builderClassName, JavacNode type, List<JCTypeParameter> typeParams, java.util.List<BuilderFieldData> builderFields, boolean fluent, JCAnnotation ast) { // return new ThingieBuilder<A, B>().setA(this.a).setB(this.b); JavacTreeMaker maker = type.getTreeMaker(); @@ -495,6 +496,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> { JCExpression call = maker.NewClass(null, List.<JCExpression>nil(), namePlusTypeParamsToTypeReference(maker, type.toName(builderClassName), typeParams), List.<JCExpression>nil(), null); JCExpression invoke = call; + ListBuffer<JCStatement> statements = new ListBuffer<JCStatement>(); for (BuilderFieldData bfd : builderFields) { Name setterName = fluent ? bfd.name : type.toName(HandlerUtil.buildAccessorName("set", bfd.name.toString())); JCExpression[] tgt = new JCExpression[bfd.singularData == null ? 1 : 2]; @@ -519,18 +521,21 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> { JCExpression arg; if (bfd.singularData == null) { arg = tgt[0]; + invoke = maker.Apply(List.<JCExpression>nil(), maker.Select(invoke, setterName), List.of(arg)); } else { - JCExpression eqNull = maker.Binary(CTC_EQUAL, tgt[0], maker.Literal(CTC_BOT, null)); - List<JCExpression> tas = cloneTypes(maker, bfd.singularData.getTypeArgs(), ast, type.getContext()); - JCExpression emptyList = maker.Apply(tas, chainDots(type, "java", "util", "Collections", "emptyList"), List.<JCExpression>nil()); - arg = maker.Conditional(eqNull, emptyList, tgt[1]); + JCExpression isNotNull = maker.Binary(CTC_NOT_EQUAL, tgt[0], maker.Literal(CTC_BOT, null)); + JCExpression invokeBuilder = maker.Apply(List.<JCExpression>nil(), maker.Select(maker.Ident(type.toName(BUILDER_TEMP_VAR)), setterName), List.<JCExpression>of(tgt[1])); + statements.append(maker.If(isNotNull, maker.Exec(invokeBuilder), null)); } - - invoke = maker.Apply(List.<JCExpression>nil(), maker.Select(invoke, setterName), List.of(arg)); } - JCStatement statement = maker.Return(invoke); - - JCBlock body = maker.Block(0, List.<JCStatement>of(statement)); + if (!statements.isEmpty()) { + JCExpression tempVarType = namePlusTypeParamsToTypeReference(maker, type.toName(builderClassName), typeParams); + statements.prepend(maker.VarDef(maker.Modifiers(Flags.FINAL), type.toName(BUILDER_TEMP_VAR), tempVarType, invoke)); + statements.append(maker.Return(maker.Ident(type.toName(BUILDER_TEMP_VAR)))); + } else { + statements.append(maker.Return(invoke)); + } + JCBlock body = maker.Block(0, statements.toList()); return maker.MethodDef(maker.Modifiers(Flags.PUBLIC), type.toName(toBuilderMethodName), namePlusTypeParamsToTypeReference(maker, type.toName(builderClassName), typeParams), List.<JCTypeParameter>nil(), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null); } diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java index f5372fbb..0b97b4be 100644 --- a/src/delombok/lombok/delombok/Delombok.java +++ b/src/delombok/lombok/delombok/Delombok.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 The Project Lombok Authors. + * Copyright (C) 2009-2018 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 @@ -26,14 +26,18 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintStream; +import java.io.UnsupportedEncodingException; import java.io.Writer; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URI; +import java.net.URLDecoder; import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; import java.util.ArrayList; @@ -88,7 +92,7 @@ public class Delombok { private boolean noCopy; private boolean onlyChanged; private boolean force = false; - private String classpath, sourcepath, bootclasspath; + private String classpath, sourcepath, bootclasspath, modulepath; private LinkedHashMap<File, File> fileToBase = new LinkedHashMap<File, File>(); private List<File> filesToParse = new ArrayList<File>(); private Map<String, String> formatPrefs = new HashMap<String, String>(); @@ -138,6 +142,10 @@ public class Delombok { @Description("override Bootclasspath (analogous to javac -bootclasspath option)") private String bootclasspath; + @Description("Module path (analogous to javac --module-path option)") + @FullName("module-path") + private String modulepath; + @Description("Files to delombok. Provide either a file, or a directory. If you use a directory, all files in it (recursive) are delombok-ed") @Sequential private List<String> input = new ArrayList<String>(); @@ -182,21 +190,50 @@ public class Delombok { return out.toString(); } + static String getPathOfSelf() { + String url = Delombok.class.getResource("Delombok.class").toString(); + if (url.endsWith("lombok/delombok/Delombok.class")) { + url = urlDecode(url.substring(0, url.length() - "lombok/delombok/Delombok.class".length())); + } else if (url.endsWith("lombok/delombok/Delombok.SCL.lombok")) { + url = urlDecode(url.substring(0, url.length() - "lombok/delombok/Delombok.SCL.lombok".length())); + } else { + return null; + } + if (url.startsWith("jar:file:") && url.endsWith("!/")) return url.substring(9, url.length() - 2); + if (url.startsWith("file:")) return url.substring(5); + return null; + } + + private static String urlDecode(String in) { + try { + return URLDecoder.decode(in, "UTF-8"); + } catch (UnsupportedEncodingException e) { + throw new InternalError("UTF-8 not supported"); + } + } + public static void main(String[] rawArgs) { + try { + rawArgs = fileExpand(rawArgs); + } catch (IOException e) { + System.out.println(e.getMessage()); + System.exit(1); + } + CmdReader<CmdArgs> reader = CmdReader.of(CmdArgs.class); CmdArgs args; try { args = reader.make(rawArgs); } catch (InvalidCommandLineException e) { System.err.println("ERROR: " + e.getMessage()); - System.err.println(reader.generateCommandLineHelp("delombok")); + System.err.println(cmdHelp(reader)); System.exit(1); return; } if (args.help || (args.input.isEmpty() && !args.formatHelp)) { if (!args.help) System.err.println("ERROR: no files or directories to delombok specified."); - System.err.println(reader.generateCommandLineHelp("delombok")); + System.err.println(cmdHelp(reader)); System.exit(args.help ? 0 : 1); return; } @@ -253,6 +290,7 @@ public class Delombok { if (args.classpath != null) delombok.setClasspath(args.classpath); if (args.sourcepath != null) delombok.setSourcepath(args.sourcepath); if (args.bootclasspath != null) delombok.setBootclasspath(args.bootclasspath); + if (args.modulepath != null) delombok.setModulepath(args.modulepath); try { for (String in : args.input) { @@ -273,15 +311,123 @@ public class Delombok { if (!args.quiet) { String msg = e.getMessage(); if (msg != null && msg.startsWith("DELOMBOK: ")) System.err.println(msg.substring("DELOMBOK: ".length())); - else { - e.printStackTrace(); - } + else e.printStackTrace(); System.exit(1); return; } } } + private static String cmdHelp(CmdReader<CmdArgs> reader) { + String x = reader.generateCommandLineHelp("delombok"); + int idx = x.indexOf('\n'); + return x.substring(0, idx) + "\n You can use @filename.args to read arguments from the file 'filename.args'.\n" + x.substring(idx); + } + + private static String[] fileExpand(String[] rawArgs) throws IOException { + String[] out = rawArgs; + int offset = 0; + for (int i = 0; i < rawArgs.length; i++) { + if (rawArgs[i].length() > 0 && rawArgs[i].charAt(0) == '@') { + String[] parts = readArgsFromFile(rawArgs[i].substring(1)); + String[] newOut = new String[out.length + parts.length - 1]; + System.arraycopy(out, 0, newOut, 0, i + offset); + System.arraycopy(parts, 0, newOut, i + offset, parts.length); + System.arraycopy(out, i + offset + 1, newOut, i + offset + parts.length, out.length - (i + offset + 1)); + offset += parts.length - 1; + out = newOut; + } + } + + return out; + } + + private static String[] readArgsFromFile(String file) throws IOException { + InputStream in = new FileInputStream(file); + StringBuilder s = new StringBuilder(); + try { + InputStreamReader isr = new InputStreamReader(in, "UTF-8"); + char[] c = new char[4096]; + while (true) { + int r = isr.read(c); + if (r == -1) break; + s.append(c, 0, r); + } + } finally { + in.close(); + } + + List<String> x = new ArrayList<String>(); + StringBuilder a = new StringBuilder(); + int state = 1; + for (int i = 0; i < s.length(); i++) { + char c = s.charAt(i); + if (state < 0) { + state = -state; + if (c != '\n') a.append(c); + continue; + } + if (state == 1) { + if (c == '\\') { + state = -1; + continue; + } + if (c == '"') { + state = 2; + continue; + } + if (c == '\'') { + state = 3; + continue; + } + if (Character.isWhitespace(c)) { + String aa = a.toString(); + if (!aa.isEmpty()) x.add(aa); + a.setLength(0); + continue; + } + a.append(c); + continue; + } + if (state == 2) { + if (c == '\\') { + state = -2; + continue; + } + if (c == '"') { + state = 1; + x.add(a.toString()); + a.setLength(0); + continue; + } + a.append(c); + continue; + } + if (state == 3) { + if (c == '\'') { + state = 1; + x.add(a.toString()); + a.setLength(0); + continue; + } + a.append(c); + continue; + } + } + if (state == 1) { + String aa = a.toString(); + if (!aa.isEmpty()) x.add(aa); + } else if (state < 0) { + throw new IOException("Unclosed backslash escape in @ file"); + } else if (state == 2) { + throw new IOException("Unclosed \" in @ file"); + } else if (state == 3) { + throw new IOException("Unclosed ' in @ file"); + } + + return x.toArray(new String[x.size()]); + } + public static class InvalidFormatOptionException extends Exception { public InvalidFormatOptionException(String msg) { super(msg); @@ -385,6 +531,10 @@ public class Delombok { this.output = null; } + public void setModulepath(String modulepath) { + this.modulepath = modulepath; + } + public void addDirectory(File base) throws IOException { addDirectory0(false, base, "", 0); } @@ -525,8 +675,19 @@ public class Delombok { argsList.add("-encoding"); argsList.add(charset.name()); } + String pathToSelfJar = getPathOfSelf(); + if (pathToSelfJar != null) { + argsList.add("--module-path"); + argsList.add((modulepath == null || modulepath.isEmpty()) ? pathToSelfJar : (pathToSelfJar + File.pathSeparator + modulepath)); + } else if (modulepath != null && !modulepath.isEmpty()) { + argsList.add("--module-path"); + argsList.add(modulepath); + } String[] argv = argsList.toArray(new String[0]); args.init("javac", argv); + options.put("diags.legacy", "TRUE"); + } else { + if (modulepath != null && !modulepath.isEmpty()) throw new IllegalStateException("DELOMBOK: Option --module-path requires usage of JDK9 or higher."); } CommentCatcher catcher = CommentCatcher.create(context); diff --git a/src/delombok/lombok/delombok/ant/DelombokTask.java b/src/delombok/lombok/delombok/ant/DelombokTask.java index 06bbe3e0..adaf43dd 100644 --- a/src/delombok/lombok/delombok/ant/DelombokTask.java +++ b/src/delombok/lombok/delombok/ant/DelombokTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 The Project Lombok Authors. + * Copyright (C) 2009-2018 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 @@ -78,6 +78,7 @@ class Tasks { private File fromDir, toDir; private Path classpath; private Path sourcepath; + private Path modulepath; private boolean verbose; private String encoding; private Path path; @@ -92,9 +93,7 @@ class Tasks { } public Path createClasspath() { - if (classpath == null) { - classpath = new Path(getProject()); - } + if (classpath == null) classpath = new Path(getProject()); return classpath.createPath(); } @@ -111,9 +110,7 @@ class Tasks { } public Path createSourcepath() { - if (sourcepath == null) { - sourcepath = new Path(getProject()); - } + if (sourcepath == null) sourcepath = new Path(getProject()); return sourcepath.createPath(); } @@ -121,6 +118,23 @@ class Tasks { createSourcepath().setRefid(r); } + public void setModulepath(Path modulepath) { + if (this.modulepath == null) { + this.modulepath = modulepath; + } else { + this.modulepath.append(modulepath); + } + } + + public Path createModulepath() { + if (modulepath == null) modulepath = new Path(getProject()); + return modulepath.createPath(); + } + + public void setModulepathRef(Reference r) { + createModulepath().setRefid(r); + } + public void setFrom(File dir) { this.fromDir = dir; } @@ -180,7 +194,7 @@ class Tasks { try { Object instance = shadowLoadClass("lombok.delombok.ant.DelombokTaskImpl").newInstance(); - for(Field selfField : getClass().getDeclaredFields()) { + for (Field selfField : getClass().getDeclaredFields()) { if (selfField.isSynthetic() || Modifier.isStatic(selfField.getModifiers())) continue; Field otherField = instance.getClass().getDeclaredField(selfField.getName()); otherField.setAccessible(true); diff --git a/src/delombok/lombok/delombok/ant/DelombokTaskImpl.java b/src/delombok/lombok/delombok/ant/DelombokTaskImpl.java index 470819cd..bd2f93e7 100644 --- a/src/delombok/lombok/delombok/ant/DelombokTaskImpl.java +++ b/src/delombok/lombok/delombok/ant/DelombokTaskImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 The Project Lombok Authors. + * Copyright (C) 2009-2018 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 @@ -40,6 +40,7 @@ public class DelombokTaskImpl { private File fromDir, toDir; private Path classpath; private Path sourcepath; + private Path modulepath; private boolean verbose; private String encoding; private Path path; @@ -60,6 +61,7 @@ public class DelombokTaskImpl { if (classpath != null) delombok.setClasspath(classpath.toString()); if (sourcepath != null) delombok.setSourcepath(sourcepath.toString()); + if (modulepath != null) delombok.setModulepath(modulepath.toString()); try { delombok.setFormatPreferences(Delombok.formatOptionsToMap(formatOptions)); diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java index f93fbe27..fc05aea2 100644 --- a/test/core/src/lombok/AbstractRunTests.java +++ b/test/core/src/lombok/AbstractRunTests.java @@ -197,7 +197,7 @@ public abstract class AbstractRunTests { } } - @SuppressWarnings("null") /* eclipse bug; it falsely thinks stuffAc will always be null or some such hogwash. */ + @SuppressWarnings("null") /* eclipse bug workaround; it falsely thinks stuffAc will always be null. */ private static void compareMessages(String name, LombokImmutableList<CompilerMessageMatcher> expected, LinkedHashSet<CompilerMessage> actual) { Iterator<CompilerMessageMatcher> expectedIterator = expected.iterator(); Iterator<CompilerMessage> actualIterator = actual.iterator(); diff --git a/test/core/src/lombok/CompilerMessageMatcher.java b/test/core/src/lombok/CompilerMessageMatcher.java index 0d6c0889..49c81b70 100644 --- a/test/core/src/lombok/CompilerMessageMatcher.java +++ b/test/core/src/lombok/CompilerMessageMatcher.java @@ -67,7 +67,8 @@ public class CompilerMessageMatcher { public boolean matches(CompilerMessage message) { outer: for (int i = 0; i < lineNumbers.size(); i++) { - if (message.getLine() != lineNumbers.get(i)) continue; + //Allow an off-by-1 in line numbers; when running tests that sometimes happens for as yet unknown reasons. + if (message.getLine() != lineNumbers.get(i) && message.getLine() -1 != lineNumbers.get(i)) continue; for (String token : messages.get(i)) { if (!message.getMessage().contains(token)) continue outer; } diff --git a/test/manual/about.txt b/test/manual/about.txt new file mode 100644 index 00000000..280f491a --- /dev/null +++ b/test/manual/about.txt @@ -0,0 +1 @@ +This directory contains test cases which must be manually run. The aim is to get these automated as unit tests, but, walk before you can run. diff --git a/test/manual/moduleBasedMultiProject/.gitignore b/test/manual/moduleBasedMultiProject/.gitignore new file mode 100644 index 00000000..e2e7327c --- /dev/null +++ b/test/manual/moduleBasedMultiProject/.gitignore @@ -0,0 +1 @@ +/out diff --git a/test/manual/moduleBasedMultiProject/projA/module-info.java b/test/manual/moduleBasedMultiProject/projA/module-info.java new file mode 100644 index 00000000..1ae75d49 --- /dev/null +++ b/test/manual/moduleBasedMultiProject/projA/module-info.java @@ -0,0 +1,4 @@ +module projA { + requires static lombok; + exports pkgA; +} diff --git a/test/manual/moduleBasedMultiProject/projA/pkgA/ClassA.java b/test/manual/moduleBasedMultiProject/projA/pkgA/ClassA.java new file mode 100644 index 00000000..2e17e142 --- /dev/null +++ b/test/manual/moduleBasedMultiProject/projA/pkgA/ClassA.java @@ -0,0 +1,5 @@ +package pkgA; + +public class ClassA { + @lombok.Getter private String hello = "hello"; +} diff --git a/test/manual/moduleBasedMultiProject/projB/module-info.java b/test/manual/moduleBasedMultiProject/projB/module-info.java new file mode 100644 index 00000000..7b82f362 --- /dev/null +++ b/test/manual/moduleBasedMultiProject/projB/module-info.java @@ -0,0 +1,5 @@ +module projB { + requires static lombok; + requires projA; +} + diff --git a/test/manual/moduleBasedMultiProject/projB/pkgB/ClassB.java b/test/manual/moduleBasedMultiProject/projB/pkgB/ClassB.java new file mode 100644 index 00000000..3f57f31e --- /dev/null +++ b/test/manual/moduleBasedMultiProject/projB/pkgB/ClassB.java @@ -0,0 +1,10 @@ +import lombok.Getter; +import pkgA.ClassA; + +public class ClassB { + @Getter private String world = "world"; + public void test() { + new ClassA().getHello(); + getWorld(); + } +} diff --git a/test/manual/moduleBasedMultiProject/runTests b/test/manual/moduleBasedMultiProject/runTests new file mode 100755 index 00000000..48557b43 --- /dev/null +++ b/test/manual/moduleBasedMultiProject/runTests @@ -0,0 +1,10 @@ +#!/bin/sh +echo 'This will build, module-style, 2 modules with lombok dependencies. If the compilation works without error or warning, lombok is working as designed.' +mkdir -p out/projA +mkdir -p out/projB +javac --processor-path ../../../dist/lombok.jar -p ../../../dist/lombok.jar -d out/projA projA/module-info.java projA/pkgA/ClassA.java +javac --processor-path ../../../dist/lombok.jar -p ../../../dist/lombok.jar:out/projA -d out/projB projB/module-info.java projB/pkgB/ClassB.java + +echo Now we try to delombok and see if it works as designed. + +java -jar ../../../dist/lombok.jar delombok -p --module-path out/projA projB/pkgB/ClassB.java projB/module-info.java diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java index b0563858..96ffd2dc 100644 --- a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java +++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java @@ -58,6 +58,8 @@ class BuilderSingularToBuilderWithNull { } @java.lang.SuppressWarnings("all") public BuilderSingularToBuilderWithNullBuilder toBuilder() { - return new BuilderSingularToBuilderWithNullBuilder().elems(this.elems == null ? java.util.Collections.<String>emptyList() : this.elems); + final BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNullBuilder(); + if (this.elems != null) builder.elems(this.elems); + return builder; } } diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java index 8615a40b..53256107 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java +++ b/test/transform/resource/after-delombok/BuilderWithToBuilder.java @@ -86,7 +86,9 @@ class BuilderWithToBuilder<T> { } @java.lang.SuppressWarnings("all") public BuilderWithToBuilderBuilder<T> toBuilder() { - return new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(this.bars == null ? java.util.Collections.<T>emptyList() : this.bars); + final BuilderWithToBuilderBuilder<T> builder = new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)); + if (this.bars != null) builder.bars(this.bars); + return builder; } } class ConstructorWithToBuilder<T> { @@ -94,15 +96,17 @@ class ConstructorWithToBuilder<T> { private String mTwo; private T foo; @lombok.Singular - private List<T> bars; - public ConstructorWithToBuilder(String mOne, T bar) { + private com.google.common.collect.ImmutableList<T> bars; + public ConstructorWithToBuilder(String mOne, T baz, com.google.common.collect.ImmutableList<T> bars) { } @java.lang.SuppressWarnings("all") public static class ConstructorWithToBuilderBuilder<T> { @java.lang.SuppressWarnings("all") private String mOne; @java.lang.SuppressWarnings("all") - private T bar; + private T baz; + @java.lang.SuppressWarnings("all") + private com.google.common.collect.ImmutableList<T> bars; @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder() { } @@ -112,18 +116,23 @@ class ConstructorWithToBuilder<T> { return this; } @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderBuilder<T> bar(final T bar) { - this.bar = bar; + public ConstructorWithToBuilderBuilder<T> baz(final T baz) { + this.baz = baz; + return this; + } + @java.lang.SuppressWarnings("all") + public ConstructorWithToBuilderBuilder<T> bars(final com.google.common.collect.ImmutableList<T> bars) { + this.bars = bars; return this; } @java.lang.SuppressWarnings("all") public ConstructorWithToBuilder<T> build() { - return new ConstructorWithToBuilder<T>(mOne, bar); + return new ConstructorWithToBuilder<T>(mOne, baz, bars); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne + ", bar=" + this.bar + ")"; + return "ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne + ", baz=" + this.baz + ", bars=" + this.bars + ")"; } } @java.lang.SuppressWarnings("all") @@ -132,54 +141,6 @@ class ConstructorWithToBuilder<T> { } @java.lang.SuppressWarnings("all") public ConstructorWithToBuilderBuilder<T> toBuilder() { - return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); + return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).baz(this.foo).bars(this.bars); } -} -class StaticWithToBuilder<T, K> { - private String mOne; - private String mTwo; - private T foo; - private K bar; - @lombok.Singular - private List<T> bars; - public static <Z> StaticWithToBuilder<Z, String> test(String mOne, Z bar) { - return new StaticWithToBuilder<Z, String>(); - } - @java.lang.SuppressWarnings("all") - public static class StaticWithToBuilderBuilder<Z> { - @java.lang.SuppressWarnings("all") - private String mOne; - @java.lang.SuppressWarnings("all") - private Z bar; - @java.lang.SuppressWarnings("all") - StaticWithToBuilderBuilder() { - } - @java.lang.SuppressWarnings("all") - public StaticWithToBuilderBuilder<Z> mOne(final String mOne) { - this.mOne = mOne; - return this; - } - @java.lang.SuppressWarnings("all") - public StaticWithToBuilderBuilder<Z> bar(final Z bar) { - this.bar = bar; - return this; - } - @java.lang.SuppressWarnings("all") - public StaticWithToBuilder<Z, String> build() { - return StaticWithToBuilder.<Z>test(mOne, bar); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "StaticWithToBuilder.StaticWithToBuilderBuilder(mOne=" + this.mOne + ", bar=" + this.bar + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static <Z> StaticWithToBuilderBuilder<Z> builder() { - return new StaticWithToBuilderBuilder<Z>(); - } - @java.lang.SuppressWarnings("all") - public StaticWithToBuilderBuilder<T> toBuilder() { - return new StaticWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); - } -} +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java new file mode 100644 index 00000000..7de3d5fe --- /dev/null +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeExplicitInclude.java @@ -0,0 +1,22 @@ +class EqualsAndHashCodeExplicitInclude { + int x; + @java.lang.Override + @java.lang.SuppressWarnings("all") + public boolean equals(final java.lang.Object o) { + if (o == this) return true; + if (!(o instanceof EqualsAndHashCodeExplicitInclude)) return false; + final EqualsAndHashCodeExplicitInclude other = (EqualsAndHashCodeExplicitInclude) o; + if (!other.canEqual((java.lang.Object) this)) return false; + return true; + } + @java.lang.SuppressWarnings("all") + protected boolean canEqual(final java.lang.Object other) { + return other instanceof EqualsAndHashCodeExplicitInclude; + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public int hashCode() { + int result = 1; + return result; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/NoArgsConstructorForce.java b/test/transform/resource/after-delombok/NoArgsConstructorForce.java index 3336ca19..d4bfcda2 100644 --- a/test/transform/resource/after-delombok/NoArgsConstructorForce.java +++ b/test/transform/resource/after-delombok/NoArgsConstructorForce.java @@ -3,6 +3,7 @@ public class NoArgsConstructorForce { private final int[] i; private final Object[] o; private final java.util.List<?>[] fullQualifiedList; + private final String alreadyInitialized = "yes"; @java.lang.SuppressWarnings("all") public NoArgsConstructorForce() { diff --git a/test/transform/resource/after-delombok/ToStringExplicitInclude.java b/test/transform/resource/after-delombok/ToStringExplicitInclude.java new file mode 100644 index 00000000..e6b4c09a --- /dev/null +++ b/test/transform/resource/after-delombok/ToStringExplicitInclude.java @@ -0,0 +1,8 @@ +class ToStringExplicitInclude { + int x; + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "ToStringExplicitInclude()"; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java index bbbf9268..ccd6335a 100644 --- a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java +++ b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNull.java @@ -52,6 +52,9 @@ import lombok.Singular; return new BuilderSingularToBuilderWithNullBuilder(); } public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder toBuilder() { - return new BuilderSingularToBuilderWithNullBuilder().elems(((this.elems == null) ? java.util.Collections.<String>emptyList() : this.elems)); + final BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNullBuilder(); + if ((this.elems != null)) + builder.elems(this.elems); + return builder; } -} +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilder.java b/test/transform/resource/after-ecj/BuilderWithToBuilder.java index 636dc42d..420f1583 100644 --- a/test/transform/resource/after-ecj/BuilderWithToBuilder.java +++ b/test/transform/resource/after-ecj/BuilderWithToBuilder.java @@ -74,13 +74,17 @@ import lombok.Builder; return new BuilderWithToBuilderBuilder<T>(); } public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> toBuilder() { - return new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)).bars(((this.bars == null) ? java.util.Collections.<T>emptyList() : this.bars)); + final BuilderWithToBuilderBuilder<T> builder = new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.rrr(this)); + if ((this.bars != null)) + builder.bars(this.bars); + return builder; } } @lombok.experimental.Accessors(prefix = "m") class ConstructorWithToBuilder<T> { public static @java.lang.SuppressWarnings("all") class ConstructorWithToBuilderBuilder<T> { private @java.lang.SuppressWarnings("all") String mOne; - private @java.lang.SuppressWarnings("all") T bar; + private @java.lang.SuppressWarnings("all") T baz; + private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList<T> bars; @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder() { super(); } @@ -88,68 +92,32 @@ import lombok.Builder; this.mOne = mOne; return this; } - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder<T> bar(final T bar) { - this.bar = bar; + public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder<T> baz(final T baz) { + this.baz = baz; + return this; + } + public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder<T> bars(final com.google.common.collect.ImmutableList<T> bars) { + this.bars = bars; return this; } public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder<T> build() { - return new ConstructorWithToBuilder<T>(mOne, bar); + return new ConstructorWithToBuilder<T>(mOne, baz, bars); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((("ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne) + ", bar=") + this.bar) + ")"); + return (((((("ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne) + ", baz=") + this.baz) + ", bars=") + this.bars) + ")"); } } private String mOne; private String mTwo; private T foo; - private @lombok.Singular List<T> bars; - public @Builder(toBuilder = true) ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T bar) { + private @lombok.Singular com.google.common.collect.ImmutableList<T> bars; + public @Builder(toBuilder = true) ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T baz, com.google.common.collect.ImmutableList<T> bars) { super(); } public static @java.lang.SuppressWarnings("all") <T>ConstructorWithToBuilderBuilder<T> builder() { return new ConstructorWithToBuilderBuilder<T>(); } public @java.lang.SuppressWarnings("all") 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") class StaticWithToBuilderBuilder<Z> { - private @java.lang.SuppressWarnings("all") String mOne; - private @java.lang.SuppressWarnings("all") Z bar; - @java.lang.SuppressWarnings("all") StaticWithToBuilderBuilder() { - super(); - } - public @java.lang.SuppressWarnings("all") StaticWithToBuilderBuilder<Z> mOne(final String mOne) { - this.mOne = mOne; - return this; - } - public @java.lang.SuppressWarnings("all") StaticWithToBuilderBuilder<Z> bar(final Z bar) { - this.bar = bar; - return this; - } - public @java.lang.SuppressWarnings("all") StaticWithToBuilder<Z, String> build() { - return StaticWithToBuilder.<Z>test(mOne, bar); - } - public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((("StaticWithToBuilder.StaticWithToBuilderBuilder(mOne=" + this.mOne) + ", bar=") + this.bar) + ")"); - } - } - private String mOne; - private String mTwo; - private T foo; - private K bar; - private @lombok.Singular List<T> bars; - StaticWithToBuilder() { - super(); - } - 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") <Z>StaticWithToBuilderBuilder<Z> builder() { - return new StaticWithToBuilderBuilder<Z>(); - } - public @java.lang.SuppressWarnings("all") StaticWithToBuilderBuilder<T> toBuilder() { - return new StaticWithToBuilderBuilder<T>().mOne(this.mOne).bar(this.foo); + return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).baz(this.foo).bars(this.bars); } } diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java new file mode 100644 index 00000000..01d1526c --- /dev/null +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeExplicitInclude.java @@ -0,0 +1,23 @@ +@lombok.EqualsAndHashCode(onlyExplicitlyIncluded = true) class EqualsAndHashCodeExplicitInclude { + int x; + EqualsAndHashCodeExplicitInclude() { + super(); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) { + if ((o == this)) + return true; + if ((! (o instanceof EqualsAndHashCodeExplicitInclude))) + return false; + final EqualsAndHashCodeExplicitInclude other = (EqualsAndHashCodeExplicitInclude) o; + if ((! other.canEqual((java.lang.Object) this))) + return false; + return true; + } + protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { + return (other instanceof EqualsAndHashCodeExplicitInclude); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + int result = 1; + return result; + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/NoArgsConstructorForce.java b/test/transform/resource/after-ecj/NoArgsConstructorForce.java index 850aa8a5..59713673 100644 --- a/test/transform/resource/after-ecj/NoArgsConstructorForce.java +++ b/test/transform/resource/after-ecj/NoArgsConstructorForce.java @@ -3,6 +3,7 @@ public @NoArgsConstructor(force = true) class NoArgsConstructorForce { private final int[] i; private final Object[] o; private final java.util.List<?>[] fullQualifiedList; + private final String alreadyInitialized = "yes"; public @java.lang.SuppressWarnings("all") NoArgsConstructorForce() { super(); this.i = null; diff --git a/test/transform/resource/after-ecj/ToStringExplicitInclude.java b/test/transform/resource/after-ecj/ToStringExplicitInclude.java new file mode 100644 index 00000000..adb3109e --- /dev/null +++ b/test/transform/resource/after-ecj/ToStringExplicitInclude.java @@ -0,0 +1,9 @@ +@lombok.ToString(onlyExplicitlyIncluded = true) class ToStringExplicitInclude { + int x; + ToStringExplicitInclude() { + super(); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + return "ToStringExplicitInclude()"; + } +} diff --git a/test/transform/resource/before/BuilderWithToBuilder.java b/test/transform/resource/before/BuilderWithToBuilder.java index 63e16ae8..50938ab2 100644 --- a/test/transform/resource/before/BuilderWithToBuilder.java +++ b/test/transform/resource/before/BuilderWithToBuilder.java @@ -13,19 +13,8 @@ class BuilderWithToBuilder<T> { class ConstructorWithToBuilder<T> { private String mOne, mTwo; private T foo; - @lombok.Singular private List<T> bars; - @Builder(toBuilder = true) - public ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T bar) { - } -} -@lombok.experimental.Accessors(prefix = "m") -class StaticWithToBuilder<T, K> { - private String mOne, mTwo; - private T foo; - private K bar; - @lombok.Singular private List<T> bars; + @lombok.Singular private com.google.common.collect.ImmutableList<T> bars; @Builder(toBuilder = true) - public static <Z> StaticWithToBuilder<Z, String> test(String mOne, @Builder.ObtainVia(field = "foo") Z bar) { - return new StaticWithToBuilder<Z, String>(); + public ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T baz, com.google.common.collect.ImmutableList<T> bars) { } } diff --git a/test/transform/resource/before/EqualsAndHashCodeExplicitInclude.java b/test/transform/resource/before/EqualsAndHashCodeExplicitInclude.java new file mode 100644 index 00000000..06b77f14 --- /dev/null +++ b/test/transform/resource/before/EqualsAndHashCodeExplicitInclude.java @@ -0,0 +1,4 @@ +@lombok.EqualsAndHashCode(onlyExplicitlyIncluded = true) +class EqualsAndHashCodeExplicitInclude { + int x; +} diff --git a/test/transform/resource/before/NoArgsConstructorForce.java b/test/transform/resource/before/NoArgsConstructorForce.java index 48df1a37..6193eb0a 100644 --- a/test/transform/resource/before/NoArgsConstructorForce.java +++ b/test/transform/resource/before/NoArgsConstructorForce.java @@ -5,4 +5,5 @@ public class NoArgsConstructorForce { private final int[] i; private final Object[] o; private final java.util.List<?>[] fullQualifiedList; + private final String alreadyInitialized = "yes"; }
\ No newline at end of file diff --git a/test/transform/resource/before/ToStringExplicitInclude.java b/test/transform/resource/before/ToStringExplicitInclude.java new file mode 100644 index 00000000..31687bc6 --- /dev/null +++ b/test/transform/resource/before/ToStringExplicitInclude.java @@ -0,0 +1,4 @@ +@lombok.ToString(onlyExplicitlyIncluded = true) +class ToStringExplicitInclude { + int x; +} diff --git a/test/transform/resource/before/VarComplex.java b/test/transform/resource/before/VarComplex.java index c93e177a..0f2afb2a 100644 --- a/test/transform/resource/before/VarComplex.java +++ b/test/transform/resource/before/VarComplex.java @@ -1,3 +1,4 @@ +//version :9 import lombok.var; public class VarComplex { diff --git a/test/transform/resource/before/VarInFor.java b/test/transform/resource/before/VarInFor.java index 7f7bb7a7..0c54921e 100644 --- a/test/transform/resource/before/VarInFor.java +++ b/test/transform/resource/before/VarInFor.java @@ -1,3 +1,4 @@ +//version :9 import lombok.var; public class VarInFor { diff --git a/test/transform/resource/before/VarInForOld.java b/test/transform/resource/before/VarInForOld.java index 99e83b57..a6e1333d 100644 --- a/test/transform/resource/before/VarInForOld.java +++ b/test/transform/resource/before/VarInForOld.java @@ -1,3 +1,4 @@ +//version :9 import lombok.var; public class VarInForOld { diff --git a/test/transform/resource/before/VarInForOldMulti.java b/test/transform/resource/before/VarInForOldMulti.java index e2ea9682..417076d0 100644 --- a/test/transform/resource/before/VarInForOldMulti.java +++ b/test/transform/resource/before/VarInForOldMulti.java @@ -1,3 +1,4 @@ +//version :9 //skip compare contents import lombok.var; diff --git a/test/transform/resource/before/VarModifier.java b/test/transform/resource/before/VarModifier.java index 5c68caa7..22d8f2ad 100644 --- a/test/transform/resource/before/VarModifier.java +++ b/test/transform/resource/before/VarModifier.java @@ -1,3 +1,4 @@ +//version :9 import lombok.experimental.var; public class VarModifier { diff --git a/test/transform/resource/before/VarNullInit.java b/test/transform/resource/before/VarNullInit.java index f9bb53a3..08eb4dda 100644 --- a/test/transform/resource/before/VarNullInit.java +++ b/test/transform/resource/before/VarNullInit.java @@ -1,3 +1,4 @@ +//version :9 import lombok.var; public class VarNullInit { diff --git a/test/transform/resource/before/VarWarning.java b/test/transform/resource/before/VarWarning.java index 90464d30..47b7ad3c 100644 --- a/test/transform/resource/before/VarWarning.java +++ b/test/transform/resource/before/VarWarning.java @@ -1,3 +1,4 @@ +//version :9 //CONF: lombok.var.flagUsage = WARNING import lombok.var; diff --git a/website/templates/features/GetterLazy.html b/website/templates/features/GetterLazy.html index b1f374a8..e921712c 100644 --- a/website/templates/features/GetterLazy.html +++ b/website/templates/features/GetterLazy.html @@ -9,6 +9,9 @@ <p> You can let lombok generate a getter which will calculate a value once, the first time this getter is called, and cache it from then on. This can be useful if calculating the value takes a lot of CPU, or the value takes a lot of memory. To use this feature, create a <code>private final</code> variable, initialize it with the expression that's expensive to run, and annotate your field with <code>@Getter(lazy=true)</code>. The field will be hidden from the rest of your code, and the expression will be evaluated no more than once, when the getter is first called. There are no magic marker values (i.e. even if the result of your expensive calculation is <code>null</code>, the result is cached) and your expensive calculation need not be thread-safe, as lombok takes care of locking. </p> + <p> + If the initialization expression is complex, or contains generics, we recommend moving the code to a private (if possible static) method, and call that instead. + </p> </@f.overview> <@f.snippets name="GetterLazy" /> diff --git a/website/templates/features/constructor.html b/website/templates/features/constructor.html index fc0be1c6..b1f25321 100644 --- a/website/templates/features/constructor.html +++ b/website/templates/features/constructor.html @@ -17,7 +17,7 @@ </p><p> To put annotations on the generated constructor, you can use <code>onConstructor=@__({@AnnotationsHere})</code>, but be careful; this is an experimental feature. For more details see the documentation on the <a href="/features/experimental/onX">onX</a> feature. </p><p> - Static fields are skipped by these annotations. Also, a <code>@java.beans.ConstructorProperties</code> annotation is added for all constructors with at least 1 argument, which allows bean editor tools to call the generated constructors. <code>@ConstructorProperties</code> is new in Java 1.6, which means that if your code is intended for compilation on Java 1.5, a compiler error will occur. <em>Running</em> on a JVM 1.5 should be no problem (the annotation will be ignored). To suppress the generation of the <code>@ConstructorProperties</code> annotation, add a parameter to your annotation: <code>@AllArgsConstructor(suppressConstructorProperties=true)</code>. However, as java 1.5, which has already been end-of-lifed, fades into obscurity, this parameter will eventually be removed. It has also been marked deprecated for this reason. + Static fields are skipped by these annotations. </p><p> Unlike most other lombok annotations, the existence of an explicit constructor does not stop these annotations from generating their own constructor. This means you can write your own specialized constructor, and let lombok generate the boilerplate ones as well. If a conflict arises (one of your constructors ends up with the same signature as one that lombok generates), a compiler error will occur. </p> @@ -27,9 +27,9 @@ <@f.confKeys> <dt> - <code>lombok.anyConstructor.suppressConstructorProperties</code> = [<code>true</code> | <code>false</code>] (default: <code>false</code>) + <code>lombok.anyConstructor.addConstructorProperties</code> = [<code>true</code> | <code>false</code>] (default: <code>false</code>) </dt><dd> - If set to <code>true</code>, then lombok will skip adding a <code>@java.beans.ConstructorProperties</code> to generated constructors. This is useful in android and GWT development where that annotation is not usually available. + If set to <code>true</code>, then lombok will add a <code>@java.beans.ConstructorProperties</code> to generated constructors. </dd><dt> <code>lombok.</code>[<code>allArgsConstructor</code>|<code>requiredArgsConstructor</code>|<code>noArgsConstructor</code>]<code>.flagUsage</code> = [<code>warning</code> | <code>error</code>] (default: not set) </dt><dd> @@ -49,8 +49,6 @@ </p><p> <code>@XArgsConstructor</code> can also be used on an enum definition. The generated constructor will always be private, because non-private constructors aren't legal in enums. You don't have to specify <code>AccessLevel.PRIVATE</code>. </p><p> - While <code>suppressConstructorProperties</code> has been marked deprecated in anticipation of a world where all java environments have the <code>@ConstructorProperties</code> annotation available, first GWT 2.2 and Android 2.3.3, which do not (yet) have this annotation, will have to be ancient history before this annotation parameter will be removed. - </p><p> Various well known annotations about nullity cause null checks to be inserted and will be copied to the parameter. See <a href="/features/GetterSetter">Getter/Setter</a> documentation's small print for more information. </p><p> The <code>flagUsage</code> configuration keys do not trigger when a constructor is generated by <code>@Data</code>, <code>@Value</code> or any other lombok annotation. diff --git a/website/templates/features/delombok.html b/website/templates/features/delombok.html index 56b02f7d..75178740 100644 --- a/website/templates/features/delombok.html +++ b/website/templates/features/delombok.html @@ -23,6 +23,8 @@ </p><p> To let delombok print the transformation result of a single java file directly to standard output, you can use: <pre>java -jar lombok.jar delombok -p MyJavaFile.java</pre> + </p><p> + The <code>-classpath</code>, <code>-sourcepath</code>, and <code>--module-path</code> options of javac are replicated as <code>--classpath</code>, <code>--sourcepath</code>, and <code>--module-path</code> in delombok. </p> <@f.main.h3 title="Running delombok in ant" /> @@ -39,7 +41,7 @@ <javadoc sourcepath="build/src-delomboked" defaultexcludes="yes" destdir="build/api" /> </target></pre> <br /> - Instead of a <code>from</code> attribute, you can also nest <code><fileset></code> nodes. + Instead of a <code>from</code> attribute, you can also nest <code><fileset></code> nodes. The <code>delombok</code> supports <code>sourcepath</code>, <code>classpath</code>, and <code>modulepath</code> as parameter or as nested element, or as nested refid element, similar to the <code>javac</code> task. </p> <@f.main.h3 title="Running delombok in maven" /> diff --git a/website/templates/setup/gwt.html b/website/templates/setup/gwt.html index 142362ac..ce45fe7f 100644 --- a/website/templates/setup/gwt.html +++ b/website/templates/setup/gwt.html @@ -13,4 +13,22 @@ java <strong>-javaagent:lombok.jar=ECJ</strong> <em>(rest of arguments)</em> Thanks to Stephen Haberman for figuring this out. </p> </@s.introduction> + + <@s.section title="GWT plugin in Eclipse"> + <p> + To use the GWT plugin in eclipse together with Lombok:<br /> + Install lombok into eclipse as normal (start <code>lombok.jar</code> as an application).<br /> + Download the JDT variant that GWT uses. For GWT v2.8.2 you'll need <a href="https://github.com/gwtproject/tools/raw/master/lib/eclipse/org.eclipse.jdt.core_3.11.2-CUSTOM-GWT-2.8-20160205.jar">org.eclipse.jdt.core 3.11.2</a>; for the current GWT development snapshot, this is <a href="https://github.com/gwtproject/tools/raw/master/lib/eclipse/org.eclipse.jdt.core_3.13.50-CUSTOM-GWT-20171215.jar">org.eclipse.jdt.core 3.13.50</a>. For more versions, search for jar files matching 'org.eclipse.jdt.core-{VERSION}-CUSTOM-GWT-{date}.jar in the <a href="https://github.com/gwtproject/tools/tree/master/lib/eclipse">lib/eclipse section GWT's github page</a>.<br /> + Configure the 'GWT/Compile' option in the eclipse GWT plugin; in the advanced section, add the following VM arguments:<br /> +<pre>-javaagent:/path/to/lombok.jar=ECJ +-Xbootclasspath/p:/path/to/lombok.jar:/path/to/org.eclipse.jdt.core_fromPreviousStep.jar</pre> +Where the colon should be replaced with a semicolon on windows.<br /> + GWT Dev Mode needs a similar configuration: In the VM arguments section ('Arguments' tab), add: +<pre>-javaagent:/path/to/lombok.jar=ECJ</pre> + and in the 'Classpath' tab, add both lombok.jar and the org.eclipse.jdt.core file you downloaded. + </p> + <p> + The above instructions are contributed by Stas via the forum. Let us know if they work, or if you run into issues. Thanks and have fun! + </p> + </@s.section> </@s.scaffold> diff --git a/website/usageExamples/experimental/UtilityClassExample_post.jpage b/website/usageExamples/experimental/UtilityClassExample_post.jpage index 70810230..ad6cf583 100644 --- a/website/usageExamples/experimental/UtilityClassExample_post.jpage +++ b/website/usageExamples/experimental/UtilityClassExample_post.jpage @@ -5,7 +5,7 @@ public final class UtilityClassExample { throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated"); } - public static void addSomething(int in) { + public static int addSomething(int in) { return in + CONSTANT; } } diff --git a/website/usageExamples/experimental/UtilityClassExample_pre.jpage b/website/usageExamples/experimental/UtilityClassExample_pre.jpage index 85731b81..3c33a7c6 100644 --- a/website/usageExamples/experimental/UtilityClassExample_pre.jpage +++ b/website/usageExamples/experimental/UtilityClassExample_pre.jpage @@ -4,7 +4,7 @@ import lombok.experimental.UtilityClass; public class UtilityClassExample { private final int CONSTANT = 5; - public void addSomething(int in) { + public int addSomething(int in) { return in + CONSTANT; } } |