alibaba/p3c
1
0
Fork 0
mirror of https://github.com/alibaba/p3c.git synced 2025-10-14 23:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix https://github.com/alibaba/p3c/issues/222

Browse Source
This commit is contained in:
曾候
2018-02-01 11:38:18 +08:00
parent 598d172339
commit 10f3848688
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/oop/PojoMustOverrideToStringRule.java
View File

@@ -47,11 +47,14 @@ public class PojoMustOverrideToStringRule extends AbstractPojoRule {
+ "[not(ancestor::Expression/ConditionalAndExpression//EqualityExpression[@Image='!=']//NullLiteral)]" + "[not(ancestor::Expression/ConditionalAndExpression//EqualityExpression[@Image='!=']//NullLiteral)]"
+ "[not(ancestor::Expression/ConditionalOrExpression//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'])" + "(@Image='Data' and //ImportDeclaration[@ImportedName='lombok.Data' or @ImportedName='lombok'])"
+ " or (@Image='ToString' and //ImportDeclaration[@ImportedName='lombok.ToString' or @ImportedName='lombok'])" + " or (@Image='ToString' and //ImportDeclaration[@ImportedName='lombok.ToString' or @ImportedName='lombok'])"
+ " or (@Image='lombok.Data') or (@Image='lombok.ToString')]"; + " 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"; private static final String MESSAGE_KEY_PREFIX = "java.oop.PojoMustOverrideToStringRule.violation.msg";
@Override @Override

2
p3c-pmd/src/test/resources/com/alibaba/p3c/pmd/lang/java/rule/oop/xml/PojoMustOverrideToStringRule.xml
View File

@@ -121,7 +121,7 @@
<code-fragment id="lombok-pojo-4"> <code-fragment id="lombok-pojo-4">
<![CDATA[ <![CDATA[
import lombok.*; import lombok.*;
@ToString @ToString(callSuper = true)
public class FooDO { public class FooDO {
private String tom; private String tom;
} }