diff --git a/p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/naming/LowerCamelCaseVariableNamingRule.java b/p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/naming/LowerCamelCaseVariableNamingRule.java index ad1ac1fb089044045e1c9b543022f4f116a5a6b6..b723ff26333d22dd615cc1ccf9199af52998e693 100644 --- a/p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/naming/LowerCamelCaseVariableNamingRule.java +++ b/p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/naming/LowerCamelCaseVariableNamingRule.java @@ -39,7 +39,8 @@ import java.util.regex.Pattern; public class LowerCamelCaseVariableNamingRule extends AbstractAliRule { private static final String MESSAGE_KEY_PREFIX = "java.naming.LowerCamelCaseVariableNamingRule.violation.msg"; - private Pattern pattern = Pattern.compile("^[a-z][a-z0-9]*([A-Z][a-z0-9]+)*(DO|DTO|VO|DAO)?$"); + + private Pattern pattern = Pattern.compile("^[a-z][a-z0-9]*([A-Z][a-z0-9]+)*(DO|DTO|VO|DAO|BO|DOList|DTOList|VOList|DAOList|BOList|X|Y|Z|UDF|UDAF|[A-Z])?$"); @Override public Object visit(final ASTVariableDeclaratorId node, Object data) { diff --git a/p3c-pmd/src/test/resources/com/alibaba/p3c/pmd/lang/java/rule/naming/xml/LowerCamelCaseVariableNamingRule.xml b/p3c-pmd/src/test/resources/com/alibaba/p3c/pmd/lang/java/rule/naming/xml/LowerCamelCaseVariableNamingRule.xml index bdc2d938079a01e1c3a69c704b9e0422de9f8ad6..fae7ee62d55fd94b0ce466bbc809d59286eac4c0 100644 --- a/p3c-pmd/src/test/resources/com/alibaba/p3c/pmd/lang/java/rule/naming/xml/LowerCamelCaseVariableNamingRule.xml +++ b/p3c-pmd/src/test/resources/com/alibaba/p3c/pmd/lang/java/rule/naming/xml/LowerCamelCaseVariableNamingRule.xml @@ -7,6 +7,7 @@ private String abC; private String AbC; private String abCd; + private String locationA; private void f(){ String s = "test"; } @@ -15,8 +16,8 @@ Variable name should be lowerCamelCase - 2 - 2,3 + 1 + 3 @@ -118,7 +119,7 @@ public interface BizConstants { public class MockTest{ @Mock void $clinit(){} - } + } ]]> @@ -172,6 +173,90 @@ public interface BizConstants { 0 + + + + + + Variable name should be lowerCamelCase10 + 1 + 3 + + + + + + + + Variable name should be lowerCamelCase11 + 0 + + + + + + + + Variable name should be lowerCamelCase12 + 0 + + + + + + + + Variable name should be lowerCamelCase13 + 0 + + + + + + + + Variable name should be lowerCamelCase14 + 0 + + +