From a382c21d464c22658e8c2eea7d7d75c2a6747527 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 16 Jul 2012 23:18:58 +0200
Subject: fixed issue 391: Using 'staticConstructor' on @Data whilst an
@XxxArgsConstructor is present means it gets ignored, but until now lombok
didn't warn you about this.
---
src/core/lombok/eclipse/handlers/HandleConstructor.java | 15 ++++++++++++---
src/core/lombok/javac/handlers/HandleConstructor.java | 15 ++++++++++++---
2 files changed, 24 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java
index eec41577..25d47870 100644
--- a/src/core/lombok/eclipse/handlers/HandleConstructor.java
+++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java
@@ -156,20 +156,29 @@ public class HandleConstructor {
}
public void generateConstructor(EclipseNode typeNode, AccessLevel level, List<EclipseNode> fields, String staticName, boolean skipIfConstructorExists, boolean suppressConstructorProperties, ASTNode source) {
+ boolean staticConstrRequired = staticName != null && !staticName.equals("");
+
if (skipIfConstructorExists && constructorExists(typeNode) != MemberExistsResult.NOT_EXISTS) return;
if (skipIfConstructorExists) {
for (EclipseNode child : typeNode.down()) {
if (child.getKind() == Kind.ANNOTATION) {
if (annotationTypeMatches(NoArgsConstructor.class, child) ||
annotationTypeMatches(AllArgsConstructor.class, child) ||
- annotationTypeMatches(RequiredArgsConstructor.class, child))
+ annotationTypeMatches(RequiredArgsConstructor.class, child)) {
+
+ if (staticConstrRequired) {
+ // @Data has asked us to generate a constructor, but we're going to skip this instruction, as an explicit 'make a constructor' annotation
+ // will take care of it. However, @Data also wants a specific static name; this will be ignored; the appropriate way to do this is to use
+ // the 'staticName' parameter of the @XArgsConstructor you've stuck on your type.
+ // We should warn that we're ignoring @Data's 'staticConstructor' param.
+ typeNode.addWarning("Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used.", source.sourceStart, source.sourceEnd);
+ }
return;
+ }
}
}
}
- boolean staticConstrRequired = staticName != null && !staticName.equals("");
-
ConstructorDeclaration constr = createConstructor(staticConstrRequired ? AccessLevel.PRIVATE : level, typeNode, fields, suppressConstructorProperties, source);
injectMethod(typeNode, constr);
if (staticConstrRequired) {
diff --git a/src/core/lombok/javac/handlers/HandleConstructor.java b/src/core/lombok/javac/handlers/HandleConstructor.java
index a2463728..65ad2547 100644
--- a/src/core/lombok/javac/handlers/HandleConstructor.java
+++ b/src/core/lombok/javac/handlers/HandleConstructor.java
@@ -154,20 +154,29 @@ public class HandleConstructor {
}
public void generateConstructor(JavacNode typeNode, AccessLevel level, List<JavacNode> fields, String staticName, boolean skipIfConstructorExists, boolean suppressConstructorProperties, JavacNode source) {
+ boolean staticConstrRequired = staticName != null && !staticName.equals("");
+
if (skipIfConstructorExists && constructorExists(typeNode) != MemberExistsResult.NOT_EXISTS) return;
if (skipIfConstructorExists) {
for (JavacNode child : typeNode.down()) {
if (child.getKind() == Kind.ANNOTATION) {
if (annotationTypeMatches(NoArgsConstructor.class, child) ||
annotationTypeMatches(AllArgsConstructor.class, child) ||
- annotationTypeMatches(RequiredArgsConstructor.class, child))
+ annotationTypeMatches(RequiredArgsConstructor.class, child)) {
+
+ if (staticConstrRequired) {
+ // @Data has asked us to generate a constructor, but we're going to skip this instruction, as an explicit 'make a constructor' annotation
+ // will take care of it. However, @Data also wants a specific static name; this will be ignored; the appropriate way to do this is to use
+ // the 'staticName' parameter of the @XArgsConstructor you've stuck on your type.
+ // We should warn that we're ignoring @Data's 'staticConstructor' param.
+ source.addWarning("Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used.");
+ }
return;
+ }
}
}
}
- boolean staticConstrRequired = staticName != null && !staticName.equals("");
-
JCMethodDecl constr = createConstructor(staticConstrRequired ? AccessLevel.PRIVATE : level, typeNode, fields, suppressConstructorProperties, source.get());
injectMethod(typeNode, constr);
if (staticConstrRequired) {
--
cgit