[maven-pmd-plugin] 03/03: Remove deprecated usages

[adangel]

This is an automated email from the ASF dual-hosted git repository.

adangel pushed a commit to branch pmd7
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git

commit 01e30a6ef2b5955fa6b3012be5591fbf77df6a5f
Author: Andreas Dangel <adan...@apache.org>
AuthorDate: Sat May 20 10:46:12 2023 +0200

    Remove deprecated usages
---
 .../apache/maven/plugins/pmd/ExcludeViolationsFromFile.java    |  4 +++-
 .../java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java    |  7 ++-----
 .../java/org/apache/maven/plugins/pmd/exec/ExecutorTest.java   | 10 ++++++----
 3 files changed, 11 insertions(+), 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
index 55c9a98..856c7d5 100644
--- 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 class ExcludeViolationsFromFile implements 
ExcludeFromFile<Violation> {
                 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
index ad0a5d3..55f069b 100644
--- 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 @@ public class PmdExecutor extends Executor {
 
         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 @@ public class PmdExecutor extends Executor {
 
         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
index fadd719..67f48e1 100644
--- 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.MalformedURLException;
 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 class ExecutorTest extends TestCase {
 
         StringBuilder classpath = new StringBuilder();
         Executor.buildClasspath(classpath, mockedClassLoader);
-        Assert.assertEquals(pathname + File.pathSeparator, 
classpath.toString());
+        assertEquals(pathname + File.pathSeparator, classpath.toString());
     }
 }