Remove deprecated usages

apache · May 20, 2023 · 01e30a6 · 01e30a6
1 parent 72969c7
commit 01e30a6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/pmd/ExcludeViolationsFromFile.java b/src/main/java/org/apache/maven/plugins/pmd/ExcludeViolationsFromFile.java
@@ -100,7 +100,9 @@ public boolean isExcludedFromFailure(final RuleViolation errorDetail) {
                 throw new RuntimeException(e2);
             }
         }
-        final String className = extractClassName(errorDetail.getPackageName(), errorDetail.getClassName(), fileName);
+        final Map<String, String> additionalInfo = errorDetail.getAdditionalInfo();
+        final String className = extractClassName(
+                additionalInfo.get(RuleViolation.PACKAGE_NAME), additionalInfo.get(RuleViolation.CLASS_NAME), fileName);
         return isExcludedFromFailure(className, errorDetail.getRule().getName());
     }
 

diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
@@ -155,8 +155,8 @@ private PmdResult run() throws MavenReportException {
 
         PMDConfiguration configuration = new PMDConfiguration();
         LanguageVersion languageVersion = null;
-        Language language = LanguageRegistry.findLanguageByTerseName(
-                request.getLanguage() != null ? request.getLanguage() : "java");
+        Language language =
+                LanguageRegistry.PMD.getLanguageById(request.getLanguage() != null ? request.getLanguage() : "java");
         if (language == null) {
             throw new MavenReportException("Unsupported language: " + request.getLanguage());
         }
@@ -189,9 +189,6 @@ private PmdResult run() throws MavenReportException {
 
         configuration.setRuleSets(request.getRulesets());
         configuration.setMinimumPriority(RulePriority.valueOf(request.getMinimumPriority()));
-        if (request.getBenchmarkOutputLocation() != null) {
-            configuration.setBenchmark(true);
-        }
         List<File> files = request.getFiles();
 
         Report report = null;

diff --git a/src/test/java/org/apache/maven/plugins/pmd/exec/ExecutorTest.java b/src/test/java/org/apache/maven/plugins/pmd/exec/ExecutorTest.java
@@ -23,11 +23,13 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
 import org.apache.commons.lang3.SystemUtils;
+import org.junit.Test;
 
-public class ExecutorTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+
+public class ExecutorTest {
+    @Test
     public void testBuildClasspath() throws MalformedURLException {
         String basename = "home/test/dir with space/mylib.jar";
         String pathname = new File("/", basename).getPath();
@@ -39,6 +41,6 @@ public void testBuildClasspath() throws MalformedURLException {
 
         StringBuilder classpath = new StringBuilder();
         Executor.buildClasspath(classpath, mockedClassLoader);
-        Assert.assertEquals(pathname + File.pathSeparator, classpath.toString());
+        assertEquals(pathname + File.pathSeparator, classpath.toString());
     }
 }