diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassRule.java index 8776a0507c..d877c603e8 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassRule.java @@ -32,10 +32,7 @@ public class UseUtilityClassRule extends AbstractJavaRule { if (p.jjtGetNumChildren() == 0) { continue; } - Node n = p.jjtGetChild(0); - if (n instanceof ASTAnnotation) { - n = p.jjtGetChild(1); - } + Node n = skipAnnotations(p); if (n instanceof ASTFieldDeclaration) { if (!((ASTFieldDeclaration) n).isStatic()) { isOK = true; @@ -75,6 +72,15 @@ public class UseUtilityClassRule extends AbstractJavaRule { return super.visit(decl, data); } + private Node skipAnnotations(Node p) { + int index = 0; + Node n = p.jjtGetChild(index++); + while (n instanceof ASTAnnotation && index < p.jjtGetNumChildren()) { + n = p.jjtGetChild(index++); + } + return n; + } + private boolean isExceptionType(ASTClassOrInterfaceDeclaration parent) { ASTExtendsList extendsList = parent.getFirstChildOfType(ASTExtendsList.class); if (extendsList != null) { diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseUtilityClass.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseUtilityClass.xml index 3261b6a9be..eac965d631 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseUtilityClass.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseUtilityClass.xml @@ -209,6 +209,29 @@ public class MyException extends RuntimeException { protected static String foo() { return "foo"; } +} + ]]> + + + + #1467 UseUtilityClass can't correctly check functions with multiple annotations + 0 + diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md index 48cb125c46..440c7d6521 100644 --- a/src/site/markdown/overview/changelog.md +++ b/src/site/markdown/overview/changelog.md @@ -62,6 +62,8 @@ * [#1452](https://sourceforge.net/p/pmd/bugs/1452/): ArrayIndexOutOfBoundsException with Annotations for AccessorClassGenerationRule * java-design/UseNotifyAllInsteadOfNotify * [#1438](https://sourceforge.net/p/pmd/bugs/1438/): UseNotifyAllInsteadOfNotify gives false positive +* java-design/UseUtilityClass: + * [#1467](https://sourceforge.net/p/pmd/bugs/1467/): UseUtilityClass can't correctly check functions with multiple annotations * java-finalizers/AvoidCallingFinalize * [#1440](https://sourceforge.net/p/pmd/bugs/1440/): NPE in AvoidCallingFinalize * java-imports/UnnecessaryFullyQualifiedName