Merge pull request alibaba#251 from fw8899/master

fix alibaba#222
robinluob · Feb 1, 2018 · cb27677 · cb27677
2 parents 598d172 + 10f3848
commit cb27677
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...md/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/oop/PojoMustOverrideToStringRule.java b/...md/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/oop/PojoMustOverrideToStringRule.java
@@ -47,11 +47,14 @@ public class PojoMustOverrideToStringRule extends AbstractPojoRule {
         + "[not(ancestor::Expression/ConditionalAndExpression//EqualityExpression[@Image='!=']//NullLiteral)]"
         + "[not(ancestor::Expression/ConditionalOrExpression//EqualityExpression[@Image='==']//NullLiteral)]";
 
-    private static final String LOMBOK_XPATH = "../Annotation/MarkerAnnotation/Name["
+    private static final String LOMBOK_NAME_XPATH = "/Name["
         + "(@Image='Data' and //ImportDeclaration[@ImportedName='lombok.Data' or @ImportedName='lombok'])"
         + " or (@Image='ToString' and //ImportDeclaration[@ImportedName='lombok.ToString' or @ImportedName='lombok'])"
         + " or (@Image='lombok.Data') or (@Image='lombok.ToString')]";
 
+    private static final String LOMBOK_XPATH = "../Annotation/MarkerAnnotation" + LOMBOK_NAME_XPATH
+        + "|../Annotation/NormalAnnotation" + LOMBOK_NAME_XPATH;
+
     private static final String MESSAGE_KEY_PREFIX = "java.oop.PojoMustOverrideToStringRule.violation.msg";
 
     @Override

diff --git a/...est/resources/com/alibaba/p3c/pmd/lang/java/rule/oop/xml/PojoMustOverrideToStringRule.xml b/...est/resources/com/alibaba/p3c/pmd/lang/java/rule/oop/xml/PojoMustOverrideToStringRule.xml
@@ -121,7 +121,7 @@
 	<code-fragment id="lombok-pojo-4">
 		<![CDATA[
 	import lombok.*;
-	@ToString
+	@ToString(callSuper = true)
 	public class FooDO {
 		private String tom;
 	}