Skip to content

Commit 38e3bb4

Browse files
authored
Merge pull request #18324 from panos-kakos/JAVA-43532
[JAVA-43532]Upgraded custom-pmd to v 7.7.0
2 parents 1e1c171 + 588683a commit 38e3bb4

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

custom-pmd/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</build>
4343

4444
<properties>
45-
<pmdVersion>6.53.0</pmdVersion>
45+
<pmdVersion>7.7.0</pmdVersion>
4646
<maven.compiler.source>11</maven.compiler.source>
4747
<maven.compiler.target>11</maven.compiler.target>
4848
</properties>
Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.baeldung.pmd;
22

3-
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
4-
import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
3+
import net.sourceforge.pmd.lang.java.ast.ASTClassDeclaration;
4+
import net.sourceforge.pmd.lang.java.ast.JavaVisitorBase;
5+
import net.sourceforge.pmd.reporting.RuleContext;
56

67
import java.util.Arrays;
78
import java.util.List;
89
import java.util.Objects;
910

10-
public class UnitTestNamingConventionRule extends AbstractJavaRule {
11+
public class UnitTestNamingConventionRule extends JavaVisitorBase<RuleContext, Void>{
1112

1213
private static List<String> allowedEndings = Arrays.asList(
1314
"IntegrationTest",
@@ -19,19 +20,19 @@ public class UnitTestNamingConventionRule extends AbstractJavaRule {
1920
"jmhTest");
2021

2122
@Override
22-
public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
23+
public Void visit(ASTClassDeclaration node, RuleContext ctx) {
2324
String className = node.getSimpleName();
2425
Objects.requireNonNull(className);
2526

2627
if (className.endsWith("SpringContextTest")) {
27-
return data;
28+
return null;
2829
}
29-
30+
3031
if (className.endsWith("Tests")
31-
|| (className.endsWith("Test") && allowedEndings.stream().noneMatch(className::endsWith))) {
32-
addViolation(data, node);
32+
|| (className.endsWith("Test") && allowedEndings.stream().noneMatch(className::endsWith))) {
33+
ctx.addViolation(node);
3334
}
3435

35-
return data;
36+
return null;
3637
}
3738
}

0 commit comments

Comments
 (0)