migrate to pmd rc3 #180

Feuermagier · Jun 9, 2023 · 63bcf60 · 63bcf60
1 parent 05f8b04
commit 63bcf60
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/autograder-core/pom.xml b/autograder-core/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <spoon.version>10.3.0</spoon.version>
-        <pmd.version>7.0.0-rc2</pmd.version>
+        <pmd.version>7.0.0-rc3</pmd.version>
         <spotbugs.version>6.45.0</spotbugs.version>
 
         <docker.version>3.3.1</docker.version>

diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/pmd/NoPathTextRenderer.java b/autograder-core/src/main/java/de/firemage/autograder/core/pmd/NoPathTextRenderer.java
diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/pmd/PMDInCodeProblem.java b/autograder-core/src/main/java/de/firemage/autograder/core/pmd/PMDInCodeProblem.java
@@ -12,7 +12,7 @@ public class PMDInCodeProblem extends ProblemImpl {
     public PMDInCodeProblem(PMDCheck check, RuleViolation violation, Path root) {
         super(check,
             new CodePosition(
-                relativize(root, Path.of(violation.getFilename())),
+                relativize(root, Path.of(violation.getFileId().getAbsolutePath())),
                 violation.getBeginLine(),
                 violation.getBeginLine(),
                 violation.getBeginColumn(),

diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/pmd/PMDLinter.java b/autograder-core/src/main/java/de/firemage/autograder/core/pmd/PMDLinter.java
@@ -10,6 +10,7 @@
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.document.FileCollector;
+import net.sourceforge.pmd.lang.document.FileId;
 
 import javax.tools.JavaFileObject;
 import java.io.IOException;
@@ -53,8 +54,8 @@ public List<Problem> lint(UploadedFile file, List<PMDCheck> checks, ClassLoader
             FileCollector collector = pmd.files();
             for (JavaFileObject compilationUnit : file.getSource().compilationUnits()) {
                 collector.addSourceFile(
-                    compilationUnit.getCharContent(false).toString(),
-                    compilationUnit.getName()
+                    FileId.fromPathLikeString(compilationUnit.getName()),
+                    compilationUnit.getCharContent(false).toString()
                 );
             }
 

diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/pmd/ProblemRenderer.java b/autograder-core/src/main/java/de/firemage/autograder/core/pmd/ProblemRenderer.java
@@ -23,7 +23,7 @@ public ProblemRenderer(Map<String, PMDCheck> checks, Path root) {
         super("Custom renderer", "Creates InCodeProblems");
         this.checks = checks;
         this.root = root;
-        super.setWriter(new NullWriter());
+        super.setWriter(NullWriter.INSTANCE);
     }
 
     @Override