From 7a575e1e5d1c78fa5be1deca7fc308bd9eb390dd Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Mon, 28 May 2018 13:32:49 -0400 Subject: Copy all field annotations to the corresponding builder parameter. Maybe some filtering is necessary and should be added later. --- src/core/lombok/javac/handlers/HandleBuilder.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java index 1a471029..335dee1a 100644 --- a/src/core/lombok/javac/handlers/HandleBuilder.java +++ b/src/core/lombok/javac/handlers/HandleBuilder.java @@ -85,6 +85,7 @@ public class HandleBuilder extends JavacAnnotationHandler { } private static class BuilderFieldData { + List annotations; JCExpression type; Name rawName; Name name; @@ -151,6 +152,7 @@ public class HandleBuilder extends JavacAnnotationHandler { BuilderFieldData bfd = new BuilderFieldData(); bfd.rawName = fd.name; bfd.name = removePrefixFromField(fieldNode); + bfd.annotations = fd.mods.annotations; bfd.type = fd.vartype; bfd.singularData = getSingularData(fieldNode); bfd.originalFieldNode = fieldNode; @@ -329,6 +331,7 @@ public class HandleBuilder extends JavacAnnotationHandler { JCVariableDecl raw = (JCVariableDecl) param.get(); bfd.name = raw.name; bfd.rawName = raw.name; + bfd.annotations = raw.mods.annotations; bfd.type = raw.vartype; bfd.singularData = getSingularData(param); bfd.originalFieldNode = param; @@ -678,13 +681,13 @@ public class HandleBuilder extends JavacAnnotationHandler { public void makeSetterMethodsForBuilder(JavacNode builderType, BuilderFieldData fieldNode, JavacNode source, boolean fluent, boolean chain) { boolean deprecate = isFieldDeprecated(fieldNode.originalFieldNode); if (fieldNode.singularData == null || fieldNode.singularData.getSingularizer() == null) { - makeSimpleSetterMethodForBuilder(builderType, deprecate, fieldNode.createdFields.get(0), fieldNode.nameOfSetFlag, source, fluent, chain); + makeSimpleSetterMethodForBuilder(builderType, deprecate, fieldNode.createdFields.get(0), fieldNode.nameOfSetFlag, source, fluent, chain, fieldNode.annotations); } else { fieldNode.singularData.getSingularizer().generateMethods(fieldNode.singularData, deprecate, builderType, source.get(), fluent, chain); } } - private void makeSimpleSetterMethodForBuilder(JavacNode builderType, boolean deprecate, JavacNode fieldNode, Name nameOfSetFlag, JavacNode source, boolean fluent, boolean chain) { + private void makeSimpleSetterMethodForBuilder(JavacNode builderType, boolean deprecate, JavacNode fieldNode, Name nameOfSetFlag, JavacNode source, boolean fluent, boolean chain, List annosOnParam) { Name fieldName = ((JCVariableDecl) fieldNode.get()).name; for (JavacNode child : builderType.down()) { @@ -698,7 +701,7 @@ public class HandleBuilder extends JavacAnnotationHandler { JavacTreeMaker maker = fieldNode.getTreeMaker(); - JCMethodDecl newMethod = HandleSetter.createSetter(Flags.PUBLIC, deprecate, fieldNode, maker, setterName, nameOfSetFlag, chain, source, List.nil(), List.nil()); + JCMethodDecl newMethod = HandleSetter.createSetter(Flags.PUBLIC, deprecate, fieldNode, maker, setterName, nameOfSetFlag, chain, source, List.nil(), annosOnParam); injectMethod(builderType, newMethod); } -- cgit From 79bfcc4f7ae4bcd61f7f942bfefb940c77927b71 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Mon, 27 Aug 2018 18:36:13 -0400 Subject: Add configuration key, handle whereever NULLABLE is handled, support Eclipse. --- src/core/lombok/ConfigurationKeys.java | 8 ++++++++ src/core/lombok/core/handlers/HandlerUtil.java | 5 +++++ src/core/lombok/eclipse/handlers/HandleBuilder.java | 12 +++++++++--- .../lombok/eclipse/handlers/HandleConstructor.java | 3 ++- src/core/lombok/eclipse/handlers/HandleGetter.java | 1 + src/core/lombok/eclipse/handlers/HandleSetter.java | 3 ++- src/core/lombok/eclipse/handlers/HandleWither.java | 3 ++- src/core/lombok/javac/handlers/HandleBuilder.java | 7 ++++++- src/core/lombok/javac/handlers/HandleConstructor.java | 3 ++- src/core/lombok/javac/handlers/HandleGetter.java | 3 ++- src/core/lombok/javac/handlers/HandleSetter.java | 3 ++- src/core/lombok/javac/handlers/HandleWither.java | 3 ++- src/core/lombok/javac/handlers/JavacHandlerUtil.java | 17 +++++++++++++++++ src/utils/lombok/eclipse/Eclipse.java | 18 ++++++++++++++++++ 14 files changed, 78 insertions(+), 11 deletions(-) diff --git a/src/core/lombok/ConfigurationKeys.java b/src/core/lombok/ConfigurationKeys.java index 184ded27..beb0d1e0 100644 --- a/src/core/lombok/ConfigurationKeys.java +++ b/src/core/lombok/ConfigurationKeys.java @@ -563,4 +563,12 @@ public class ConfigurationKeys { * If set to {@code true}, no further {@code lombok.config} files will be checked. */ public static final ConfigurationKey STOP_BUBBLING = new ConfigurationKey("config.stopBubbling", "Tell the configuration system it should stop looking for other configuration files (default: false).") {}; + + /** + * lombok configuration: {@code lombok.copyAnnotations} += <String: fully-qualified annotation class name>. + * + * Copy these annotations to getters, setters, etc. + */ + public static final ConfigurationKey> COPY_ANNOTATIONS = new ConfigurationKey>("lombok.copyAnnotations", "Copy these annotations to getters, setters, etc.") {}; + } diff --git a/src/core/lombok/core/handlers/HandlerUtil.java b/src/core/lombok/core/handlers/HandlerUtil.java index 0d64c550..48c48c20 100644 --- a/src/core/lombok/core/handlers/HandlerUtil.java +++ b/src/core/lombok/core/handlers/HandlerUtil.java @@ -230,6 +230,11 @@ public class HandlerUtil { public static final String DEFAULT_EXCEPTION_FOR_NON_NULL = "java.lang.NullPointerException"; + /** Returns the configuration value for ConfigurationKeys.COPY_ANNOTATIONS. */ + public static List copyAnnotationNames(AST ast) { + return ast.readConfiguration(ConfigurationKeys.COPY_ANNOTATIONS); + } + /** * Generates a getter name from a given field name. * diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index 4d20f052..77c29634 100644 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -106,6 +106,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { } private static class BuilderFieldData { + Annotation[] annotations; TypeReference type; char[] rawName; char[] name; @@ -199,9 +200,14 @@ public class HandleBuilder extends EclipseAnnotationHandler { EclipseNode isDefault = findAnnotation(Builder.Default.class, fieldNode); boolean isFinal = ((fd.modifiers & ClassFileConstants.AccFinal) != 0) || (valuePresent && !hasAnnotation(NonFinal.class, fieldNode)); + Annotation[] nonNulls = findAnnotations(fd, NON_NULL_PATTERN); + Annotation[] nullables = findAnnotations(fd, NULLABLE_PATTERN); + Annotation[] copyAnnotations = findExactAnnotations(fd, copyAnnotationNames(fieldNode.getAst())); + BuilderFieldData bfd = new BuilderFieldData(); bfd.rawName = fieldNode.getName().toCharArray(); bfd.name = removePrefixFromField(fieldNode); + bfd.annotations = copyAnnotations(fd, nonNulls, nullables, copyAnnotations); bfd.type = fd.type; bfd.singularData = getSingularData(fieldNode, ast); bfd.originalFieldNode = fieldNode; @@ -744,13 +750,13 @@ public class HandleBuilder extends EclipseAnnotationHandler { public void makeSetterMethodsForBuilder(EclipseNode builderType, BuilderFieldData bfd, EclipseNode sourceNode, boolean fluent, boolean chain) { boolean deprecate = isFieldDeprecated(bfd.originalFieldNode); if (bfd.singularData == null || bfd.singularData.getSingularizer() == null) { - makeSimpleSetterMethodForBuilder(builderType, deprecate, bfd.createdFields.get(0), bfd.nameOfSetFlag, sourceNode, fluent, chain); + makeSimpleSetterMethodForBuilder(builderType, deprecate, bfd.createdFields.get(0), bfd.nameOfSetFlag, sourceNode, fluent, chain, bfd.annotations); } else { bfd.singularData.getSingularizer().generateMethods(bfd.singularData, deprecate, builderType, fluent, chain); } } - private void makeSimpleSetterMethodForBuilder(EclipseNode builderType, boolean deprecate, EclipseNode fieldNode, char[] nameOfSetFlag, EclipseNode sourceNode, boolean fluent, boolean chain) { + private void makeSimpleSetterMethodForBuilder(EclipseNode builderType, boolean deprecate, EclipseNode fieldNode, char[] nameOfSetFlag, EclipseNode sourceNode, boolean fluent, boolean chain, Annotation[] annotations) { TypeDeclaration td = (TypeDeclaration) builderType.get(); AbstractMethodDeclaration[] existing = td.methods; if (existing == null) existing = EMPTY; @@ -767,7 +773,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { String setterName = fluent ? fieldNode.getName() : HandlerUtil.buildAccessorName("set", fieldNode.getName()); MethodDeclaration setter = HandleSetter.createSetter(td, deprecate, fieldNode, setterName, nameOfSetFlag, chain, ClassFileConstants.AccPublic, - sourceNode, Collections.emptyList(), Collections.emptyList()); + sourceNode, Collections.emptyList(), Arrays.asList(annotations)); injectMethod(builderType, setter); } diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java index 6c7b4caf..cb9c2b4b 100644 --- a/src/core/lombok/eclipse/handlers/HandleConstructor.java +++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java @@ -405,11 +405,12 @@ public class HandleConstructor { Argument parameter = new Argument(fieldName, fieldPos, copyType(field.type, source), Modifier.FINAL); Annotation[] nonNulls = findAnnotations(field, NON_NULL_PATTERN); Annotation[] nullables = findAnnotations(field, NULLABLE_PATTERN); + Annotation[] copyAnnotations = findExactAnnotations(field, copyAnnotationNames(fieldNode.getAst())); if (nonNulls.length != 0) { Statement nullCheck = generateNullCheck(parameter, sourceNode); if (nullCheck != null) nullChecks.add(nullCheck); } - parameter.annotations = copyAnnotations(source, nonNulls, nullables); + parameter.annotations = copyAnnotations(source, nonNulls, nullables, copyAnnotations); params.add(parameter); } diff --git a/src/core/lombok/eclipse/handlers/HandleGetter.java b/src/core/lombok/eclipse/handlers/HandleGetter.java index d0c2cc23..45ddb2cc 100644 --- a/src/core/lombok/eclipse/handlers/HandleGetter.java +++ b/src/core/lombok/eclipse/handlers/HandleGetter.java @@ -274,6 +274,7 @@ public class HandleGetter extends EclipseAnnotationHandler { onMethod.toArray(new Annotation[0]), findAnnotations(field, NON_NULL_PATTERN), findAnnotations(field, NULLABLE_PATTERN), + findExactAnnotations(field, copyAnnotationNames(fieldNode.getAst())), findDelegatesAndMarkAsHandled(fieldNode), deprecated); } diff --git a/src/core/lombok/eclipse/handlers/HandleSetter.java b/src/core/lombok/eclipse/handlers/HandleSetter.java index d4df0deb..bd34b313 100644 --- a/src/core/lombok/eclipse/handlers/HandleSetter.java +++ b/src/core/lombok/eclipse/handlers/HandleSetter.java @@ -238,6 +238,7 @@ public class HandleSetter extends EclipseAnnotationHandler { Annotation[] nonNulls = findAnnotations(field, NON_NULL_PATTERN); Annotation[] nullables = findAnnotations(field, NULLABLE_PATTERN); + Annotation[] copyAnnotations = findExactAnnotations(field, copyAnnotationNames(fieldNode.getAst())); List statements = new ArrayList(5); if (nonNulls.length == 0) { statements.add(assignment); @@ -255,7 +256,7 @@ public class HandleSetter extends EclipseAnnotationHandler { statements.add(returnStatement); } method.statements = statements.toArray(new Statement[0]); - param.annotations = copyAnnotations(source, nonNulls, nullables, onParam.toArray(new Annotation[0])); + param.annotations = copyAnnotations(source, nonNulls, nullables, copyAnnotations, onParam.toArray(new Annotation[0])); method.traverse(new SetGeneratedByVisitor(source), parent.scope); return method; diff --git a/src/core/lombok/eclipse/handlers/HandleWither.java b/src/core/lombok/eclipse/handlers/HandleWither.java index c035fc26..e9831ce1 100644 --- a/src/core/lombok/eclipse/handlers/HandleWither.java +++ b/src/core/lombok/eclipse/handlers/HandleWither.java @@ -242,6 +242,7 @@ public class HandleWither extends EclipseAnnotationHandler { Annotation[] nonNulls = findAnnotations(field, NON_NULL_PATTERN); Annotation[] nullables = findAnnotations(field, NULLABLE_PATTERN); + Annotation[] copyAnnotations = findExactAnnotations(field, copyAnnotationNames(fieldNode.getAst())); if (!makeAbstract) { List args = new ArrayList(); @@ -285,7 +286,7 @@ public class HandleWither extends EclipseAnnotationHandler { method.statements = statements.toArray(new Statement[0]); } - param.annotations = copyAnnotations(source, nonNulls, nullables, onParam.toArray(new Annotation[0])); + param.annotations = copyAnnotations(source, nonNulls, nullables, copyAnnotations, onParam.toArray(new Annotation[0])); method.traverse(new SetGeneratedByVisitor(source), parent.scope); return method; diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java index 335dee1a..75bfb01c 100644 --- a/src/core/lombok/javac/handlers/HandleBuilder.java +++ b/src/core/lombok/javac/handlers/HandleBuilder.java @@ -149,10 +149,15 @@ public class HandleBuilder extends JavacAnnotationHandler { JCVariableDecl fd = (JCVariableDecl) fieldNode.get(); JavacNode isDefault = findAnnotation(Builder.Default.class, fieldNode, false); boolean isFinal = (fd.mods.flags & Flags.FINAL) != 0 || (valuePresent && !hasAnnotation(NonFinal.class, fieldNode)); + + List nonNulls = findAnnotations(fieldNode, NON_NULL_PATTERN); + List nullables = findAnnotations(fieldNode, NULLABLE_PATTERN); + List copyAnnotations = findExactAnnotations(fieldNode, copyAnnotationNames(fieldNode.getAst())); + BuilderFieldData bfd = new BuilderFieldData(); bfd.rawName = fd.name; bfd.name = removePrefixFromField(fieldNode); - bfd.annotations = fd.mods.annotations; + bfd.annotations = nonNulls.appendList(nullables).appendList(copyAnnotations); bfd.type = fd.vartype; bfd.singularData = getSingularData(fieldNode); bfd.originalFieldNode = fieldNode; diff --git a/src/core/lombok/javac/handlers/HandleConstructor.java b/src/core/lombok/javac/handlers/HandleConstructor.java index 76caaffe..b0fa3d29 100644 --- a/src/core/lombok/javac/handlers/HandleConstructor.java +++ b/src/core/lombok/javac/handlers/HandleConstructor.java @@ -331,8 +331,9 @@ public class HandleConstructor { Name rawName = field.name; List nonNulls = findAnnotations(fieldNode, NON_NULL_PATTERN); List nullables = findAnnotations(fieldNode, NULLABLE_PATTERN); + List copyAnnotations = findExactAnnotations(fieldNode, copyAnnotationNames(fieldNode.getAst())); long flags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, typeNode.getContext()); - JCVariableDecl param = maker.VarDef(maker.Modifiers(flags, nonNulls.appendList(nullables)), fieldName, field.vartype, null); + JCVariableDecl param = maker.VarDef(maker.Modifiers(flags, nonNulls.appendList(nullables).appendList(copyAnnotations)), fieldName, field.vartype, null); params.append(param); if (!nonNulls.isEmpty()) { JCStatement nullCheck = generateNullCheck(maker, fieldNode, param, source); diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index 4fc6155c..6e4b2685 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.java @@ -245,10 +245,11 @@ public class HandleGetter extends JavacAnnotationHandler { List nonNulls = findAnnotations(field, NON_NULL_PATTERN); List nullables = findAnnotations(field, NULLABLE_PATTERN); + List copyAnnotations = findExactAnnotations(field, copyAnnotationNames(field.getAst())); List delegates = findDelegatesAndRemoveFromField(field); - List annsOnMethod = copyAnnotations(onMethod).appendList(nonNulls).appendList(nullables); + List annsOnMethod = copyAnnotations(onMethod).appendList(nonNulls).appendList(nullables).appendList(copyAnnotations); if (isFieldDeprecated(field)) { annsOnMethod = annsOnMethod.prepend(treeMaker.Annotation(genJavaLangTypeRef(field, "Deprecated"), List.nil())); } diff --git a/src/core/lombok/javac/handlers/HandleSetter.java b/src/core/lombok/javac/handlers/HandleSetter.java index 0ddaa7d7..631ea193 100644 --- a/src/core/lombok/javac/handlers/HandleSetter.java +++ b/src/core/lombok/javac/handlers/HandleSetter.java @@ -228,9 +228,10 @@ public class HandleSetter extends JavacAnnotationHandler { ListBuffer statements = new ListBuffer(); List nonNulls = findAnnotations(field, NON_NULL_PATTERN); List nullables = findAnnotations(field, NULLABLE_PATTERN); + List copyAnnotations = findExactAnnotations(field, copyAnnotationNames(field.getAst())); Name methodName = field.toName(setterName); - List annsOnParam = copyAnnotations(onParam).appendList(nonNulls).appendList(nullables); + List annsOnParam = copyAnnotations(onParam).appendList(nonNulls).appendList(nullables).appendList(copyAnnotations); long flags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, field.getContext()); JCVariableDecl param = treeMaker.VarDef(treeMaker.Modifiers(flags, annsOnParam), fieldDecl.name, fieldDecl.vartype, null); diff --git a/src/core/lombok/javac/handlers/HandleWither.java b/src/core/lombok/javac/handlers/HandleWither.java index 87f3c16a..e6fc2d02 100644 --- a/src/core/lombok/javac/handlers/HandleWither.java +++ b/src/core/lombok/javac/handlers/HandleWither.java @@ -224,6 +224,7 @@ public class HandleWither extends JavacAnnotationHandler { List nonNulls = findAnnotations(field, NON_NULL_PATTERN); List nullables = findAnnotations(field, NULLABLE_PATTERN); + List copyAnnotations = findExactAnnotations(field, copyAnnotationNames(field.getAst())); Name methodName = field.toName(witherName); @@ -231,7 +232,7 @@ public class HandleWither extends JavacAnnotationHandler { JCBlock methodBody = null; long flags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, field.getContext()); - List annsOnParam = copyAnnotations(onParam).appendList(nonNulls).appendList(nullables); + List annsOnParam = copyAnnotations(onParam).appendList(nonNulls).appendList(nullables).appendList(copyAnnotations); JCVariableDecl param = maker.VarDef(maker.Modifiers(flags, annsOnParam), fieldDecl.name, fieldDecl.vartype, null); diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index 92c642d4..cb729183 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -1335,6 +1335,23 @@ public class JavacHandlerUtil { return result.toList(); } + /** + * Searches the given field node for annotations and returns each one that matches the provided list of names. + */ + public static List findExactAnnotations(JavacNode fieldNode, java.util.List names) { + ListBuffer result = new ListBuffer(); + for (JavacNode child : fieldNode.down()) { + if (child.getKind() == Kind.ANNOTATION) { + JCAnnotation annotation = (JCAnnotation) child.get(); + String annoname = annotation.annotationType.toString(); + if (names.contains(annoname)) { + result.append(annotation); + } + } + } + return result.toList(); + } + /** * Generates a new statement that checks if the given variable is null, and if so, throws a configured exception with the * variable name as message. diff --git a/src/utils/lombok/eclipse/Eclipse.java b/src/utils/lombok/eclipse/Eclipse.java index 5dbe3e2d..42adeeac 100644 --- a/src/utils/lombok/eclipse/Eclipse.java +++ b/src/utils/lombok/eclipse/Eclipse.java @@ -155,6 +155,24 @@ public class Eclipse { return result.toArray(EMPTY_ANNOTATIONS_ARRAY); } + /** + * Searches the given field node for annotations and returns each one that matches the provided list of names. + */ + public static Annotation[] findExactAnnotations(FieldDeclaration field, List names) { + List result = new ArrayList(); + if (field.annotations == null) return EMPTY_ANNOTATIONS_ARRAY; + for (Annotation annotation : field.annotations) { + TypeReference typeRef = annotation.type; + if (typeRef != null && typeRef.getTypeName() != null) { + String annoname = toQualifiedName(typeRef.getTypeName()); + if (names.contains(annoname)) { + result.add(annotation); + } + } + } + return result.toArray(EMPTY_ANNOTATIONS_ARRAY); + } + /** Matches any of the 8 primitive names, such as {@code boolean}. */ private static final Pattern PRIMITIVE_TYPE_NAME_PATTERN = Pattern.compile( "^(boolean|byte|short|int|long|float|double|char)$"); -- cgit From fc35839c793dfe2e3294c0f526dcc4cb5741533b Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Mon, 27 Aug 2018 18:56:16 -0400 Subject: Copy annotations in Eclipse HandleBuilder. --- src/core/lombok/eclipse/handlers/HandleBuilder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index 77c29634..167d1ba0 100644 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -382,6 +382,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { Argument arg = (Argument) param.get(); bfd.rawName = arg.name; bfd.name = arg.name; + bfd.annotations = arg.annotations; bfd.type = arg.type; bfd.singularData = getSingularData(param, ast); bfd.originalFieldNode = param; -- cgit From 859cb5cf8c4b8beb7a93336b5484414c7ee42c05 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Thu, 30 Aug 2018 00:09:09 -0400 Subject: First attempt at adding Getter test cases. --- .../resource/after-delombok/GetterTypeAnnosCopy.java | 18 ++++++++++++++++++ .../resource/after-delombok/GetterTypeAnnosNoCopy.java | 17 +++++++++++++++++ .../transform/resource/before/GetterTypeAnnosCopy.java | 16 ++++++++++++++++ .../resource/before/GetterTypeAnnosNoCopy.java | 14 ++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 test/transform/resource/after-delombok/GetterTypeAnnosCopy.java create mode 100644 test/transform/resource/after-delombok/GetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/before/GetterTypeAnnosCopy.java create mode 100644 test/transform/resource/before/GetterTypeAnnosNoCopy.java diff --git a/test/transform/resource/after-delombok/GetterTypeAnnosCopy.java b/test/transform/resource/after-delombok/GetterTypeAnnosCopy.java new file mode 100644 index 00000000..cde6cbdd --- /dev/null +++ b/test/transform/resource/after-delombok/GetterTypeAnnosCopy.java @@ -0,0 +1,18 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class GetterTypeAnnos { + @TA + List<@TA String> foo; + + @TA + @java.lang.SuppressWarnings("all") + public List<@TA String> getFoo() { + return this.foo; + } +} diff --git a/test/transform/resource/after-delombok/GetterTypeAnnosNoCopy.java b/test/transform/resource/after-delombok/GetterTypeAnnosNoCopy.java new file mode 100644 index 00000000..58054de6 --- /dev/null +++ b/test/transform/resource/after-delombok/GetterTypeAnnosNoCopy.java @@ -0,0 +1,17 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class GetterTypeAnnos { + @TA + List<@TA String> foo; + + @java.lang.SuppressWarnings("all") + public List<@TA String> getFoo() { + return this.foo; + } +} diff --git a/test/transform/resource/before/GetterTypeAnnosCopy.java b/test/transform/resource/before/GetterTypeAnnosCopy.java new file mode 100644 index 00000000..69152e1f --- /dev/null +++ b/test/transform/resource/before/GetterTypeAnnosCopy.java @@ -0,0 +1,16 @@ +//CONF: lombok.copyAnnotations += TA + +import lombok.Getter; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class GetterTypeAnnos { + @Getter + @TA List<@TA String> foo; +} diff --git a/test/transform/resource/before/GetterTypeAnnosNoCopy.java b/test/transform/resource/before/GetterTypeAnnosNoCopy.java new file mode 100644 index 00000000..48513f32 --- /dev/null +++ b/test/transform/resource/before/GetterTypeAnnosNoCopy.java @@ -0,0 +1,14 @@ +import lombok.Getter; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class GetterTypeAnnos { + @Getter + @TA List<@TA String> foo; +} -- cgit From ced71c5468310c389e23ccee66420b255278be03 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Thu, 30 Aug 2018 12:22:03 -0400 Subject: Fix whitespace. --- test/transform/resource/before/GetterTypeAnnosCopy.java | 2 +- test/transform/resource/before/GetterTypeAnnosNoCopy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/transform/resource/before/GetterTypeAnnosCopy.java b/test/transform/resource/before/GetterTypeAnnosCopy.java index 69152e1f..b48b8337 100644 --- a/test/transform/resource/before/GetterTypeAnnosCopy.java +++ b/test/transform/resource/before/GetterTypeAnnosCopy.java @@ -12,5 +12,5 @@ import java.util.List; class GetterTypeAnnos { @Getter - @TA List<@TA String> foo; + @TA List<@TA String> foo; } diff --git a/test/transform/resource/before/GetterTypeAnnosNoCopy.java b/test/transform/resource/before/GetterTypeAnnosNoCopy.java index 48513f32..bf4d9486 100644 --- a/test/transform/resource/before/GetterTypeAnnosNoCopy.java +++ b/test/transform/resource/before/GetterTypeAnnosNoCopy.java @@ -10,5 +10,5 @@ import java.util.List; class GetterTypeAnnos { @Getter - @TA List<@TA String> foo; + @TA List<@TA String> foo; } -- cgit From c3f34a8447ee4be38193a0c98ab4d265556bd8d7 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Thu, 30 Aug 2018 12:23:07 -0400 Subject: Test cases for remaining features. --- .../after-delombok/BuilderTypeAnnosCopy.java | 51 ++++++++++++++++++++++ .../after-delombok/BuilderTypeAnnosNoCopy.java | 51 ++++++++++++++++++++++ .../after-delombok/ConstructorsTypeAnnosCopy.java | 17 ++++++++ .../ConstructorsTypeAnnosNoCopy.java | 17 ++++++++ .../after-delombok/SetterTypeAnnosCopy.java | 17 ++++++++ .../after-delombok/SetterTypeAnnosNoCopy.java | 17 ++++++++ .../after-delombok/WitherTypeAnnosCopy.java | 21 +++++++++ .../after-delombok/WitherTypeAnnosNoCopy.java | 21 +++++++++ .../resource/before/BuilderTypeAnnosCopy.java | 14 ++++++ .../resource/before/BuilderTypeAnnosNoCopy.java | 12 +++++ .../resource/before/ConstructorsTypeAnnosCopy.java | 14 ++++++ .../before/ConstructorsTypeAnnosNoCopy.java | 12 +++++ .../resource/before/SetterTypeAnnosCopy.java | 16 +++++++ .../resource/before/SetterTypeAnnosNoCopy.java | 14 ++++++ .../resource/before/WitherTypeAnnosCopy.java | 19 ++++++++ .../resource/before/WitherTypeAnnosNoCopy.java | 17 ++++++++ 16 files changed, 330 insertions(+) create mode 100644 test/transform/resource/after-delombok/BuilderTypeAnnosCopy.java create mode 100644 test/transform/resource/after-delombok/BuilderTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/ConstructorsTypeAnnosCopy.java create mode 100644 test/transform/resource/after-delombok/ConstructorsTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/SetterTypeAnnosCopy.java create mode 100644 test/transform/resource/after-delombok/SetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/WitherTypeAnnosCopy.java create mode 100644 test/transform/resource/after-delombok/WitherTypeAnnosNoCopy.java create mode 100644 test/transform/resource/before/BuilderTypeAnnosCopy.java create mode 100644 test/transform/resource/before/BuilderTypeAnnosNoCopy.java create mode 100644 test/transform/resource/before/ConstructorsTypeAnnosCopy.java create mode 100644 test/transform/resource/before/ConstructorsTypeAnnosNoCopy.java create mode 100644 test/transform/resource/before/SetterTypeAnnosCopy.java create mode 100644 test/transform/resource/before/SetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/before/WitherTypeAnnosCopy.java create mode 100644 test/transform/resource/before/WitherTypeAnnosNoCopy.java diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosCopy.java b/test/transform/resource/after-delombok/BuilderTypeAnnosCopy.java new file mode 100644 index 00000000..8b0ea537 --- /dev/null +++ b/test/transform/resource/after-delombok/BuilderTypeAnnosCopy.java @@ -0,0 +1,51 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class BuilderTypeAnnos { + @TA + private List<@TA String> foo; + + @java.lang.SuppressWarnings("all") + BuilderTypeAnnos(@TA final List<@TA String> foo) { + this.foo = foo; + } + + + @java.lang.SuppressWarnings("all") + public static class BuilderTypeAnnosBuilder { + @java.lang.SuppressWarnings("all") + private List<@TA String> foo; + + @java.lang.SuppressWarnings("all") + BuilderTypeAnnosBuilder() { + } + + @java.lang.SuppressWarnings("all") + public BuilderTypeAnnosBuilder foo(@TA final List<@TA String> foo) { + this.foo = foo; + return this; + } + + @java.lang.SuppressWarnings("all") + public BuilderTypeAnnos build() { + return new BuilderTypeAnnos(foo); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo + ")"; + } + } + + @java.lang.SuppressWarnings("all") + public static BuilderTypeAnnosBuilder builder() { + return new BuilderTypeAnnosBuilder(); + } +} + diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosNoCopy.java b/test/transform/resource/after-delombok/BuilderTypeAnnosNoCopy.java new file mode 100644 index 00000000..b08e03a3 --- /dev/null +++ b/test/transform/resource/after-delombok/BuilderTypeAnnosNoCopy.java @@ -0,0 +1,51 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class BuilderTypeAnnos { + @TA + private List<@TA String> foo; + + @java.lang.SuppressWarnings("all") + BuilderTypeAnnos(final List<@TA String> foo) { + this.foo = foo; + } + + + @java.lang.SuppressWarnings("all") + public static class BuilderTypeAnnosBuilder { + @java.lang.SuppressWarnings("all") + private List<@TA String> foo; + + @java.lang.SuppressWarnings("all") + BuilderTypeAnnosBuilder() { + } + + @java.lang.SuppressWarnings("all") + public BuilderTypeAnnosBuilder foo(final List<@TA String> foo) { + this.foo = foo; + return this; + } + + @java.lang.SuppressWarnings("all") + public BuilderTypeAnnos build() { + return new BuilderTypeAnnos(foo); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo + ")"; + } + } + + @java.lang.SuppressWarnings("all") + public static BuilderTypeAnnosBuilder builder() { + return new BuilderTypeAnnosBuilder(); + } +} + diff --git a/test/transform/resource/after-delombok/ConstructorsTypeAnnosCopy.java b/test/transform/resource/after-delombok/ConstructorsTypeAnnosCopy.java new file mode 100644 index 00000000..28d6ed09 --- /dev/null +++ b/test/transform/resource/after-delombok/ConstructorsTypeAnnosCopy.java @@ -0,0 +1,17 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class ConstructorsTypeAnnos { + @TA + List<@TA String> foo; + + @java.lang.SuppressWarnings("all") + public ConstructorsTypeAnnos(@TA final List<@TA String> foo) { + this.foo = foo; + } +} diff --git a/test/transform/resource/after-delombok/ConstructorsTypeAnnosNoCopy.java b/test/transform/resource/after-delombok/ConstructorsTypeAnnosNoCopy.java new file mode 100644 index 00000000..e27131ef --- /dev/null +++ b/test/transform/resource/after-delombok/ConstructorsTypeAnnosNoCopy.java @@ -0,0 +1,17 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class ConstructorsTypeAnnos { + @TA + List<@TA String> foo; + + @java.lang.SuppressWarnings("all") + public ConstructorsTypeAnnos(final List<@TA String> foo) { + this.foo = foo; + } +} diff --git a/test/transform/resource/after-delombok/SetterTypeAnnosCopy.java b/test/transform/resource/after-delombok/SetterTypeAnnosCopy.java new file mode 100644 index 00000000..b45c3234 --- /dev/null +++ b/test/transform/resource/after-delombok/SetterTypeAnnosCopy.java @@ -0,0 +1,17 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class SetterTypeAnnos { + @TA + List<@TA String> foo; + + @java.lang.SuppressWarnings("all") + public void setFoo(@TA final List<@TA String> foo) { + this.foo = foo; + } +} diff --git a/test/transform/resource/after-delombok/SetterTypeAnnosNoCopy.java b/test/transform/resource/after-delombok/SetterTypeAnnosNoCopy.java new file mode 100644 index 00000000..e773bd9c --- /dev/null +++ b/test/transform/resource/after-delombok/SetterTypeAnnosNoCopy.java @@ -0,0 +1,17 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class SetterTypeAnnos { + @TA + List<@TA String> foo; + + @java.lang.SuppressWarnings("all") + public void setFoo(final List<@TA String> foo) { + this.foo = foo; + } +} diff --git a/test/transform/resource/after-delombok/WitherTypeAnnosCopy.java b/test/transform/resource/after-delombok/WitherTypeAnnosCopy.java new file mode 100644 index 00000000..8cbb7e5d --- /dev/null +++ b/test/transform/resource/after-delombok/WitherTypeAnnosCopy.java @@ -0,0 +1,21 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class WitherTypeAnnos { + @TA + final List<@TA String> foo; + + WitherTypeAnnos(@TA List<@TA String> foo) { + this.foo = foo; + } + + @java.lang.SuppressWarnings("all") + public WitherTypeAnnos withFoo(@TA final List<@TA String> foo) { + return this.foo == foo ? this : new WitherTypeAnnos(foo); + } +} diff --git a/test/transform/resource/after-delombok/WitherTypeAnnosNoCopy.java b/test/transform/resource/after-delombok/WitherTypeAnnosNoCopy.java new file mode 100644 index 00000000..18c25e04 --- /dev/null +++ b/test/transform/resource/after-delombok/WitherTypeAnnosNoCopy.java @@ -0,0 +1,21 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class WitherTypeAnnos { + @TA + final List<@TA String> foo; + + WitherTypeAnnos(@TA List<@TA String> foo) { + this.foo = foo; + } + + @java.lang.SuppressWarnings("all") + public WitherTypeAnnos withFoo(final List<@TA String> foo) { + return this.foo == foo ? this : new WitherTypeAnnos(foo); + } +} diff --git a/test/transform/resource/before/BuilderTypeAnnosCopy.java b/test/transform/resource/before/BuilderTypeAnnosCopy.java new file mode 100644 index 00000000..e5ea9e41 --- /dev/null +++ b/test/transform/resource/before/BuilderTypeAnnosCopy.java @@ -0,0 +1,14 @@ +//CONF: lombok.copyAnnotations += TA + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +@lombok.Builder +class BuilderTypeAnnos { + private @TA List<@TA String> foo; +} diff --git a/test/transform/resource/before/BuilderTypeAnnosNoCopy.java b/test/transform/resource/before/BuilderTypeAnnosNoCopy.java new file mode 100644 index 00000000..2defba7b --- /dev/null +++ b/test/transform/resource/before/BuilderTypeAnnosNoCopy.java @@ -0,0 +1,12 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +@lombok.Builder +class BuilderTypeAnnos { + private @TA List<@TA String> foo; +} diff --git a/test/transform/resource/before/ConstructorsTypeAnnosCopy.java b/test/transform/resource/before/ConstructorsTypeAnnosCopy.java new file mode 100644 index 00000000..229927c3 --- /dev/null +++ b/test/transform/resource/before/ConstructorsTypeAnnosCopy.java @@ -0,0 +1,14 @@ +//CONF: lombok.copyAnnotations += TA + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +@lombok.AllArgsConstructor +class ConstructorsTypeAnnos { + @TA List<@TA String> foo; +} diff --git a/test/transform/resource/before/ConstructorsTypeAnnosNoCopy.java b/test/transform/resource/before/ConstructorsTypeAnnosNoCopy.java new file mode 100644 index 00000000..7bc27008 --- /dev/null +++ b/test/transform/resource/before/ConstructorsTypeAnnosNoCopy.java @@ -0,0 +1,12 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +@lombok.AllArgsConstructor +class ConstructorsTypeAnnos { + @TA List<@TA String> foo; +} diff --git a/test/transform/resource/before/SetterTypeAnnosCopy.java b/test/transform/resource/before/SetterTypeAnnosCopy.java new file mode 100644 index 00000000..d9d086f0 --- /dev/null +++ b/test/transform/resource/before/SetterTypeAnnosCopy.java @@ -0,0 +1,16 @@ +//CONF: lombok.copyAnnotations += TA + +import lombok.Setter; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class SetterTypeAnnos { + @Setter + @TA List<@TA String> foo; +} diff --git a/test/transform/resource/before/SetterTypeAnnosNoCopy.java b/test/transform/resource/before/SetterTypeAnnosNoCopy.java new file mode 100644 index 00000000..e3666543 --- /dev/null +++ b/test/transform/resource/before/SetterTypeAnnosNoCopy.java @@ -0,0 +1,14 @@ +import lombok.Setter; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class SetterTypeAnnos { + @Setter + @TA List<@TA String> foo; +} diff --git a/test/transform/resource/before/WitherTypeAnnosCopy.java b/test/transform/resource/before/WitherTypeAnnosCopy.java new file mode 100644 index 00000000..645682f5 --- /dev/null +++ b/test/transform/resource/before/WitherTypeAnnosCopy.java @@ -0,0 +1,19 @@ +//CONF: lombok.copyAnnotations += TA + +import lombok.experimental.Wither; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class WitherTypeAnnos { + @Wither final @TA List<@TA String> foo; + + WitherTypeAnnos(@TA List<@TA String> foo) { + this.foo = foo; + } +} diff --git a/test/transform/resource/before/WitherTypeAnnosNoCopy.java b/test/transform/resource/before/WitherTypeAnnosNoCopy.java new file mode 100644 index 00000000..d278af55 --- /dev/null +++ b/test/transform/resource/before/WitherTypeAnnosNoCopy.java @@ -0,0 +1,17 @@ +import lombok.experimental.Wither; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) +@interface TA { +} + +class WitherTypeAnnos { + @Wither final @TA List<@TA String> foo; + + WitherTypeAnnos(@TA List<@TA String> foo) { + this.foo = foo; + } +} -- cgit From 65fc9897b3c2183cef305a71cf6b064fb9756253 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Thu, 30 Aug 2018 23:17:29 -0400 Subject: Handle null annotation array correctly. --- src/core/lombok/eclipse/handlers/HandleBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index 167d1ba0..3e373a00 100644 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -774,7 +774,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { String setterName = fluent ? fieldNode.getName() : HandlerUtil.buildAccessorName("set", fieldNode.getName()); MethodDeclaration setter = HandleSetter.createSetter(td, deprecate, fieldNode, setterName, nameOfSetFlag, chain, ClassFileConstants.AccPublic, - sourceNode, Collections.emptyList(), Arrays.asList(annotations)); + sourceNode, Collections.emptyList(), annotations != null ? Arrays.asList(annotations) : Collections.emptyList()); injectMethod(builderType, setter); } -- cgit From cd8434feee79c6e119de0a254e071c6c49a8938e Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Thu, 30 Aug 2018 23:18:33 -0400 Subject: Eclipse expected output. --- .../resource/after-ecj/BuilderTypeAnnosCopy.java | 31 ++++++++++++++++++++++ .../resource/after-ecj/BuilderTypeAnnosNoCopy.java | 31 ++++++++++++++++++++++ .../after-ecj/ConstructorsTypeAnnosCopy.java | 12 +++++++++ .../after-ecj/ConstructorsTypeAnnosNoCopy.java | 12 +++++++++ .../resource/after-ecj/GetterTypeAnnosCopy.java | 15 +++++++++++ .../resource/after-ecj/GetterTypeAnnosNoCopy.java | 15 +++++++++++ .../resource/after-ecj/SetterTypeAnnosCopy.java | 15 +++++++++++ .../resource/after-ecj/SetterTypeAnnosNoCopy.java | 15 +++++++++++ .../resource/after-ecj/WitherTypeAnnosCopy.java | 16 +++++++++++ .../resource/after-ecj/WitherTypeAnnosNoCopy.java | 16 +++++++++++ 10 files changed, 178 insertions(+) create mode 100644 test/transform/resource/after-ecj/BuilderTypeAnnosCopy.java create mode 100644 test/transform/resource/after-ecj/BuilderTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-ecj/ConstructorsTypeAnnosCopy.java create mode 100644 test/transform/resource/after-ecj/ConstructorsTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-ecj/GetterTypeAnnosCopy.java create mode 100644 test/transform/resource/after-ecj/GetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-ecj/SetterTypeAnnosCopy.java create mode 100644 test/transform/resource/after-ecj/SetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-ecj/WitherTypeAnnosCopy.java create mode 100644 test/transform/resource/after-ecj/WitherTypeAnnosNoCopy.java diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnosCopy.java b/test/transform/resource/after-ecj/BuilderTypeAnnosCopy.java new file mode 100644 index 00000000..8dfc8164 --- /dev/null +++ b/test/transform/resource/after-ecj/BuilderTypeAnnosCopy.java @@ -0,0 +1,31 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { +} +@lombok.Builder class BuilderTypeAnnos { + public static @java.lang.SuppressWarnings("all") class BuilderTypeAnnosBuilder { + private @java.lang.SuppressWarnings("all") List foo; + @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder() { + super(); + } + public @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder foo(final @TA List foo) { + this.foo = foo; + return this; + } + public @java.lang.SuppressWarnings("all") BuilderTypeAnnos build() { + return new BuilderTypeAnnos(foo); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + return (("BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo) + ")"); + } + } + private @TA List<@TA String> foo; + @java.lang.SuppressWarnings("all") BuilderTypeAnnos(final @TA List foo) { + super(); + this.foo = foo; + } + public static @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder builder() { + return new BuilderTypeAnnosBuilder(); + } +} diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnosNoCopy.java b/test/transform/resource/after-ecj/BuilderTypeAnnosNoCopy.java new file mode 100644 index 00000000..a2dfcc2f --- /dev/null +++ b/test/transform/resource/after-ecj/BuilderTypeAnnosNoCopy.java @@ -0,0 +1,31 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { +} +@lombok.Builder class BuilderTypeAnnos { + public static @java.lang.SuppressWarnings("all") class BuilderTypeAnnosBuilder { + private @java.lang.SuppressWarnings("all") List foo; + @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder() { + super(); + } + public @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder foo(final List foo) { + this.foo = foo; + return this; + } + public @java.lang.SuppressWarnings("all") BuilderTypeAnnos build() { + return new BuilderTypeAnnos(foo); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + return (("BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo) + ")"); + } + } + private @TA List<@TA String> foo; + @java.lang.SuppressWarnings("all") BuilderTypeAnnos(final List foo) { + super(); + this.foo = foo; + } + public static @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder builder() { + return new BuilderTypeAnnosBuilder(); + } +} diff --git a/test/transform/resource/after-ecj/ConstructorsTypeAnnosCopy.java b/test/transform/resource/after-ecj/ConstructorsTypeAnnosCopy.java new file mode 100644 index 00000000..ad372fc9 --- /dev/null +++ b/test/transform/resource/after-ecj/ConstructorsTypeAnnosCopy.java @@ -0,0 +1,12 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { +} +@lombok.AllArgsConstructor class ConstructorsTypeAnnos { + @TA List<@TA String> foo; + public @java.lang.SuppressWarnings("all") ConstructorsTypeAnnos(final @TA List foo) { + super(); + this.foo = foo; + } +} diff --git a/test/transform/resource/after-ecj/ConstructorsTypeAnnosNoCopy.java b/test/transform/resource/after-ecj/ConstructorsTypeAnnosNoCopy.java new file mode 100644 index 00000000..ce4b1b3b --- /dev/null +++ b/test/transform/resource/after-ecj/ConstructorsTypeAnnosNoCopy.java @@ -0,0 +1,12 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { +} +@lombok.AllArgsConstructor class ConstructorsTypeAnnos { + @TA List<@TA String> foo; + public @java.lang.SuppressWarnings("all") ConstructorsTypeAnnos(final List foo) { + super(); + this.foo = foo; + } +} diff --git a/test/transform/resource/after-ecj/GetterTypeAnnosCopy.java b/test/transform/resource/after-ecj/GetterTypeAnnosCopy.java new file mode 100644 index 00000000..1b4f03c5 --- /dev/null +++ b/test/transform/resource/after-ecj/GetterTypeAnnosCopy.java @@ -0,0 +1,15 @@ +import lombok.Getter; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { +} +class GetterTypeAnnos { + @Getter @TA List<@TA String> foo; + GetterTypeAnnos() { + super(); + } + public @TA @java.lang.SuppressWarnings("all") List getFoo() { + return this.foo; + } +} diff --git a/test/transform/resource/after-ecj/GetterTypeAnnosNoCopy.java b/test/transform/resource/after-ecj/GetterTypeAnnosNoCopy.java new file mode 100644 index 00000000..a43d3215 --- /dev/null +++ b/test/transform/resource/after-ecj/GetterTypeAnnosNoCopy.java @@ -0,0 +1,15 @@ +import lombok.Getter; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { +} +class GetterTypeAnnos { + @Getter @TA List<@TA String> foo; + GetterTypeAnnos() { + super(); + } + public @java.lang.SuppressWarnings("all") List getFoo() { + return this.foo; + } +} diff --git a/test/transform/resource/after-ecj/SetterTypeAnnosCopy.java b/test/transform/resource/after-ecj/SetterTypeAnnosCopy.java new file mode 100644 index 00000000..ef290cbf --- /dev/null +++ b/test/transform/resource/after-ecj/SetterTypeAnnosCopy.java @@ -0,0 +1,15 @@ +import lombok.Setter; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { +} +class SetterTypeAnnos { + @Setter @TA List<@TA String> foo; + SetterTypeAnnos() { + super(); + } + public @java.lang.SuppressWarnings("all") void setFoo(final @TA List foo) { + this.foo = foo; + } +} diff --git a/test/transform/resource/after-ecj/SetterTypeAnnosNoCopy.java b/test/transform/resource/after-ecj/SetterTypeAnnosNoCopy.java new file mode 100644 index 00000000..17e27782 --- /dev/null +++ b/test/transform/resource/after-ecj/SetterTypeAnnosNoCopy.java @@ -0,0 +1,15 @@ +import lombok.Setter; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { +} +class SetterTypeAnnos { + @Setter @TA List<@TA String> foo; + SetterTypeAnnos() { + super(); + } + public @java.lang.SuppressWarnings("all") void setFoo(final List foo) { + this.foo = foo; + } +} diff --git a/test/transform/resource/after-ecj/WitherTypeAnnosCopy.java b/test/transform/resource/after-ecj/WitherTypeAnnosCopy.java new file mode 100644 index 00000000..b4f3c687 --- /dev/null +++ b/test/transform/resource/after-ecj/WitherTypeAnnosCopy.java @@ -0,0 +1,16 @@ +import lombok.experimental.Wither; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { +} +class WitherTypeAnnos { + final @Wither @TA List<@TA String> foo; + WitherTypeAnnos(@TA List<@TA String> foo) { + super(); + this.foo = foo; + } + public @java.lang.SuppressWarnings("all") WitherTypeAnnos withFoo(final @TA List foo) { + return ((this.foo == foo) ? this : new WitherTypeAnnos(foo)); + } +} diff --git a/test/transform/resource/after-ecj/WitherTypeAnnosNoCopy.java b/test/transform/resource/after-ecj/WitherTypeAnnosNoCopy.java new file mode 100644 index 00000000..4f0b0710 --- /dev/null +++ b/test/transform/resource/after-ecj/WitherTypeAnnosNoCopy.java @@ -0,0 +1,16 @@ +import lombok.experimental.Wither; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.util.List; +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA { +} +class WitherTypeAnnos { + final @Wither @TA List<@TA String> foo; + WitherTypeAnnos(@TA List<@TA String> foo) { + super(); + this.foo = foo; + } + public @java.lang.SuppressWarnings("all") WitherTypeAnnos withFoo(final List foo) { + return ((this.foo == foo) ? this : new WitherTypeAnnos(foo)); + } +} -- cgit From cc8370ab2d7b3ca15023364c99e53735e62e13d7 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 4 Sep 2018 01:47:59 +0200 Subject: code review and fixes for the ‘copyable annotations’ setting concept. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/lombok/ConfigurationKeys.java | 6 +-- src/core/lombok/core/handlers/HandlerUtil.java | 6 +-- .../eclipse/handlers/EclipseHandlerUtil.java | 18 ++++++++ .../lombok/eclipse/handlers/HandleBuilder.java | 13 ++++-- .../lombok/eclipse/handlers/HandleConstructor.java | 2 +- src/core/lombok/eclipse/handlers/HandleGetter.java | 2 +- src/core/lombok/eclipse/handlers/HandleSetter.java | 4 +- src/core/lombok/eclipse/handlers/HandleWither.java | 4 +- src/core/lombok/javac/handlers/HandleBuilder.java | 15 ++++--- .../lombok/javac/handlers/HandleConstructor.java | 4 +- src/core/lombok/javac/handlers/HandleGetter.java | 4 +- src/core/lombok/javac/handlers/HandleSetter.java | 4 +- src/core/lombok/javac/handlers/HandleWither.java | 4 +- .../lombok/javac/handlers/JavacHandlerUtil.java | 8 ++-- src/utils/lombok/eclipse/Eclipse.java | 22 +--------- .../resource/after-delombok/BuilderTypeAnnos.java | 45 +++++++++++++++++++ .../after-delombok/BuilderTypeAnnosCopy.java | 51 ---------------------- .../after-delombok/BuilderTypeAnnosNoCopy.java | 51 ---------------------- .../after-delombok/ConstructorsTypeAnnos.java | 18 ++++++++ .../after-delombok/ConstructorsTypeAnnosCopy.java | 17 -------- .../ConstructorsTypeAnnosNoCopy.java | 17 -------- .../resource/after-delombok/GetterTypeAnnos.java | 19 ++++++++ .../after-delombok/GetterTypeAnnosCopy.java | 18 -------- .../after-delombok/GetterTypeAnnosNoCopy.java | 17 -------- .../resource/after-delombok/SetterTypeAnnos.java | 18 ++++++++ .../after-delombok/SetterTypeAnnosCopy.java | 17 -------- .../after-delombok/SetterTypeAnnosNoCopy.java | 17 -------- .../resource/after-delombok/WitherTypeAnnos.java | 21 +++++++++ .../after-delombok/WitherTypeAnnosCopy.java | 21 --------- .../after-delombok/WitherTypeAnnosNoCopy.java | 21 --------- .../resource/after-ecj/BuilderTypeAnnos.java | 33 ++++++++++++++ .../resource/after-ecj/BuilderTypeAnnosCopy.java | 31 ------------- .../resource/after-ecj/BuilderTypeAnnosNoCopy.java | 31 ------------- .../resource/after-ecj/ConstructorsTypeAnnos.java | 14 ++++++ .../after-ecj/ConstructorsTypeAnnosCopy.java | 12 ----- .../after-ecj/ConstructorsTypeAnnosNoCopy.java | 12 ----- .../resource/after-ecj/GetterTypeAnnos.java | 17 ++++++++ .../resource/after-ecj/GetterTypeAnnosCopy.java | 15 ------- .../resource/after-ecj/GetterTypeAnnosNoCopy.java | 15 ------- .../resource/after-ecj/SetterTypeAnnos.java | 17 ++++++++ .../resource/after-ecj/SetterTypeAnnosCopy.java | 15 ------- .../resource/after-ecj/SetterTypeAnnosNoCopy.java | 15 ------- .../resource/after-ecj/WitherTypeAnnos.java | 18 ++++++++ .../resource/after-ecj/WitherTypeAnnosCopy.java | 16 ------- .../resource/after-ecj/WitherTypeAnnosNoCopy.java | 16 ------- .../resource/before/BuilderTypeAnnos.java | 14 ++++++ .../resource/before/BuilderTypeAnnosCopy.java | 14 ------ .../resource/before/BuilderTypeAnnosNoCopy.java | 12 ----- .../resource/before/ConstructorsTypeAnnos.java | 14 ++++++ .../resource/before/ConstructorsTypeAnnosCopy.java | 14 ------ .../before/ConstructorsTypeAnnosNoCopy.java | 12 ----- .../transform/resource/before/GetterTypeAnnos.java | 15 +++++++ .../resource/before/GetterTypeAnnosCopy.java | 16 ------- .../resource/before/GetterTypeAnnosNoCopy.java | 14 ------ .../transform/resource/before/SetterTypeAnnos.java | 15 +++++++ .../resource/before/SetterTypeAnnosCopy.java | 16 ------- .../resource/before/SetterTypeAnnosNoCopy.java | 14 ------ .../transform/resource/before/WitherTypeAnnos.java | 18 ++++++++ .../resource/before/WitherTypeAnnosCopy.java | 19 -------- .../resource/before/WitherTypeAnnosNoCopy.java | 17 -------- 60 files changed, 358 insertions(+), 627 deletions(-) create mode 100644 test/transform/resource/after-delombok/BuilderTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/BuilderTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-delombok/BuilderTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/ConstructorsTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/ConstructorsTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-delombok/ConstructorsTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/GetterTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/GetterTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-delombok/GetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/SetterTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/SetterTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-delombok/SetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-delombok/WitherTypeAnnos.java delete mode 100644 test/transform/resource/after-delombok/WitherTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-delombok/WitherTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-ecj/BuilderTypeAnnos.java delete mode 100644 test/transform/resource/after-ecj/BuilderTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-ecj/BuilderTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-ecj/ConstructorsTypeAnnos.java delete mode 100644 test/transform/resource/after-ecj/ConstructorsTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-ecj/ConstructorsTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-ecj/GetterTypeAnnos.java delete mode 100644 test/transform/resource/after-ecj/GetterTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-ecj/GetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-ecj/SetterTypeAnnos.java delete mode 100644 test/transform/resource/after-ecj/SetterTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-ecj/SetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/after-ecj/WitherTypeAnnos.java delete mode 100644 test/transform/resource/after-ecj/WitherTypeAnnosCopy.java delete mode 100644 test/transform/resource/after-ecj/WitherTypeAnnosNoCopy.java create mode 100644 test/transform/resource/before/BuilderTypeAnnos.java delete mode 100644 test/transform/resource/before/BuilderTypeAnnosCopy.java delete mode 100644 test/transform/resource/before/BuilderTypeAnnosNoCopy.java create mode 100644 test/transform/resource/before/ConstructorsTypeAnnos.java delete mode 100644 test/transform/resource/before/ConstructorsTypeAnnosCopy.java delete mode 100644 test/transform/resource/before/ConstructorsTypeAnnosNoCopy.java create mode 100644 test/transform/resource/before/GetterTypeAnnos.java delete mode 100644 test/transform/resource/before/GetterTypeAnnosCopy.java delete mode 100644 test/transform/resource/before/GetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/before/SetterTypeAnnos.java delete mode 100644 test/transform/resource/before/SetterTypeAnnosCopy.java delete mode 100644 test/transform/resource/before/SetterTypeAnnosNoCopy.java create mode 100644 test/transform/resource/before/WitherTypeAnnos.java delete mode 100644 test/transform/resource/before/WitherTypeAnnosCopy.java delete mode 100644 test/transform/resource/before/WitherTypeAnnosNoCopy.java diff --git a/src/core/lombok/ConfigurationKeys.java b/src/core/lombok/ConfigurationKeys.java index beb0d1e0..89748f60 100644 --- a/src/core/lombok/ConfigurationKeys.java +++ b/src/core/lombok/ConfigurationKeys.java @@ -565,10 +565,10 @@ public class ConfigurationKeys { public static final ConfigurationKey STOP_BUBBLING = new ConfigurationKey("config.stopBubbling", "Tell the configuration system it should stop looking for other configuration files (default: false).") {}; /** - * lombok configuration: {@code lombok.copyAnnotations} += <String: fully-qualified annotation class name>. + * lombok configuration: {@code lombok.copyableAnnotations} += <String: fully-qualified annotation class name>. * - * Copy these annotations to getters, setters, etc. + * Copy these annotations to getters, setters, withers, builder-setters, etc. */ - public static final ConfigurationKey> COPY_ANNOTATIONS = new ConfigurationKey>("lombok.copyAnnotations", "Copy these annotations to getters, setters, etc.") {}; + public static final ConfigurationKey> COPYABLE_ANNOTATIONS = new ConfigurationKey>("lombok.copyableAnnotations", "Copy these annotations to getters, setters, withers, builder-setters, etc.") {}; } diff --git a/src/core/lombok/core/handlers/HandlerUtil.java b/src/core/lombok/core/handlers/HandlerUtil.java index 48c48c20..1694e305 100644 --- a/src/core/lombok/core/handlers/HandlerUtil.java +++ b/src/core/lombok/core/handlers/HandlerUtil.java @@ -230,9 +230,9 @@ public class HandlerUtil { public static final String DEFAULT_EXCEPTION_FOR_NON_NULL = "java.lang.NullPointerException"; - /** Returns the configuration value for ConfigurationKeys.COPY_ANNOTATIONS. */ - public static List copyAnnotationNames(AST ast) { - return ast.readConfiguration(ConfigurationKeys.COPY_ANNOTATIONS); + /** Returns the configuration value for ConfigurationKeys.COPYABLE_ANNOTATIONS. */ + public static List getCopyableAnnotationNames(AST ast) { + return ast.readConfiguration(ConfigurationKeys.COPYABLE_ANNOTATIONS); } /** diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 1e29764a..e7a58de3 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -672,6 +672,24 @@ public class EclipseHandlerUtil { } } + private static final Annotation[] EMPTY_ANNOTATIONS_ARRAY = new Annotation[0]; + + /** + * Searches the given field node for annotations and returns each one that matches the provided list of names. + */ + public static Annotation[] findExactAnnotations(AbstractVariableDeclaration field, List names) { + List result = new ArrayList(); + if (field.annotations == null) return EMPTY_ANNOTATIONS_ARRAY; + for (Annotation annotation : field.annotations) { + TypeReference typeRef = annotation.typ