diff --git a/README.md b/README.md index 7c3da5aa7..9421520c7 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ > We are pleased to present Alibaba Java Coding Guidelines which consolidates the best programming practices over the years from Alibaba Group's technical teams. A vast number of Java programming teams impose demanding requirements on code quality across projects as we encourage reuse and better understanding of each other's programs. We have seen many programming problems in the past. For example, defective database table structures and index designs may cause software architecture flaws and performance risks. Another example is confusing code structures being difficult to maintain. Furthermore, vulnerable code without authentication is prone to hackers’ attacks. To address these kinds of problems, we developed this document for Java developers at Alibaba. For more information please refer the *Alibaba Java Coding Guidelines*: -- 中文版: *[阿里巴巴Java开发手册](https://github.com/alibaba/p3c/blob/master/%E9%98%BF%E9%87%8C%E5%B7%B4%E5%B7%B4Java%E5%BC%80%E5%8F%91%E6%89%8B%E5%86%8C%EF%BC%88%E8%AF%A6%E5%B0%BD%E7%89%88%EF%BC%89.pdf)* +- 中文版: *[阿里巴巴Java开发手册](https://github.com/alibaba/p3c/blob/master/%E9%98%BF%E9%87%8C%E5%B7%B4%E5%B7%B4Java%E5%BC%80%E5%8F%91%E6%89%8B%E5%86%8C%EF%BC%88%E5%8D%8E%E5%B1%B1%E7%89%88%EF%BC%89.pdf)* - English Version: *[Alibaba Java Coding Guidelines](https://alibaba.github.io/Alibaba-Java-Coding-Guidelines)* - 《阿里巴巴Java开发手册》书籍版天猫官方店: *[阿里巴巴Java开发手册最新版](https://detail.tmall.com/item.htm?spm=a1z2e.8325951.feedDetail.4.3315431gklIXe&id=562626792765&ns=1&abbucket=14)* - 《码出高效》书籍版天猫官方店: *[码出高效:Java开发手册](https://detail.tmall.com/item.htm?spm=a230r.1.14.40.7dee7d6bwpO82U&id=575107529181&ns=1&abbucket=20)* diff --git a/p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/other/AvoidApacheBeanUtilsCopyRule.java b/p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/other/AvoidApacheBeanUtilsCopyRule.java index 4ad8568de..3462740f4 100644 --- a/p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/other/AvoidApacheBeanUtilsCopyRule.java +++ b/p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/other/AvoidApacheBeanUtilsCopyRule.java @@ -30,8 +30,9 @@ */ public class AvoidApacheBeanUtilsCopyRule extends AbstractXpathRule { private static final String XPATH = - "//PrimaryPrefix/Name[@Image='BeanUtils.copyProperties' and " - + "//ImportDeclaration[@ImportedName='org.apache.commons.beanutils.BeanUtils']]"; + "//PrimaryPrefix/Name[(@Image='BeanUtils.copyProperties' and " + + "//ImportDeclaration[@ImportedName='org.apache.commons.beanutils.BeanUtils']) or " + + "starts-with(@Image,'org.apache.commons.beanutils.BeanUtils.copyProperties.copyProperties')]"; public AvoidApacheBeanUtilsCopyRule() { setXPath(XPATH); diff --git a/p3c-pmd/src/test/resources/com/alibaba/p3c/pmd/lang/java/rule/other/xml/AvoidApacheBeanUtilsCopyRule.xml b/p3c-pmd/src/test/resources/com/alibaba/p3c/pmd/lang/java/rule/other/xml/AvoidApacheBeanUtilsCopyRule.xml index 727a9790e..d85f880d1 100644 --- a/p3c-pmd/src/test/resources/com/alibaba/p3c/pmd/lang/java/rule/other/xml/AvoidApacheBeanUtilsCopyRule.xml +++ b/p3c-pmd/src/test/resources/com/alibaba/p3c/pmd/lang/java/rule/other/xml/AvoidApacheBeanUtilsCopyRule.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests https://pmd.sourceforge.io/rule-tests_1_0_0.xsd"> - - Use Apache BeanUtils copy + Use Apache BeanUtils copyProperties 1 5 - + + + + + + + + + Use Apache BeanUtils other + 0 + diff --git "a/\351\230\277\351\207\214\345\267\264\345\267\264Java\345\274\200\345\217\221\346\211\213\345\206\214\357\274\210\345\215\216\345\261\261\347\211\210\357\274\211.pdf" "b/\351\230\277\351\207\214\345\267\264\345\267\264Java\345\274\200\345\217\221\346\211\213\345\206\214\357\274\210\345\215\216\345\261\261\347\211\210\357\274\211.pdf" new file mode 100644 index 000000000..7cf51a91e Binary files /dev/null and "b/\351\230\277\351\207\214\345\267\264\345\267\264Java\345\274\200\345\217\221\346\211\213\345\206\214\357\274\210\345\215\216\345\261\261\347\211\210\357\274\211.pdf" differ diff --git "a/\351\230\277\351\207\214\345\267\264\345\267\264Java\345\274\200\345\217\221\346\211\213\345\206\214\357\274\210\350\257\246\345\260\275\347\211\210\357\274\211.pdf" "b/\351\230\277\351\207\214\345\267\264\345\267\264Java\345\274\200\345\217\221\346\211\213\345\206\214\357\274\210\350\257\246\345\260\275\347\211\210\357\274\211.pdf" deleted file mode 100644 index 35865f059..000000000 Binary files "a/\351\230\277\351\207\214\345\267\264\345\267\264Java\345\274\200\345\217\221\346\211\213\345\206\214\357\274\210\350\257\246\345\260\275\347\211\210\357\274\211.pdf" and /dev/null differ