This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git
commit 2a3f6321dd5950a0090219bf87d8c5ec082956ca Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 07:18:50 2026 +0000 Simplify redundant code --- src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java | 2 +- .../org/apache/maven/plugins/pmd/ExcludeDuplicationsFromFile.java | 2 +- src/main/java/org/apache/maven/plugins/pmd/PmdReportRenderer.java | 7 +++---- src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java | 2 +- .../java/org/apache/maven/plugins/pmd/CapturingPrintStream.java | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java b/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java index 024eaec..433da46 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java +++ b/src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java @@ -490,7 +490,7 @@ public abstract class AbstractPmdReport extends AbstractMavenReport { return Collections.singleton(aggregatedProject); } - List<Path> modulePaths = new LinkedList<Path>(); + List<Path> modulePaths = new LinkedList<>(); for (String module : aggregatedProject.getModules()) { modulePaths.add(new File(aggregatedProject.getBasedir(), module).toPath()); } diff --git a/src/main/java/org/apache/maven/plugins/pmd/ExcludeDuplicationsFromFile.java b/src/main/java/org/apache/maven/plugins/pmd/ExcludeDuplicationsFromFile.java index 3aac5b6..ae53235 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/ExcludeDuplicationsFromFile.java +++ b/src/main/java/org/apache/maven/plugins/pmd/ExcludeDuplicationsFromFile.java @@ -106,7 +106,7 @@ public class ExcludeDuplicationsFromFile implements ExcludeFromFile<Duplication> try (Stream<String> lines = Files.lines(Paths.get(excludeFromFailureFile))) { exclusionList.addAll(lines.filter(line -> !line.startsWith("#")) - .map(line -> createSetFromExclusionLine(line)) + .map(this::createSetFromExclusionLine) .collect(Collectors.toList())); } catch (final IOException e) { throw new MojoExecutionException("Cannot load file " + excludeFromFailureFile, e); diff --git a/src/main/java/org/apache/maven/plugins/pmd/PmdReportRenderer.java b/src/main/java/org/apache/maven/plugins/pmd/PmdReportRenderer.java index 0722f5c..e241759 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/PmdReportRenderer.java +++ b/src/main/java/org/apache/maven/plugins/pmd/PmdReportRenderer.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.UncheckedIOException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -258,7 +257,7 @@ public class PmdReportRenderer extends AbstractMavenReportRenderer { private void renderViolationsTable(Collection<Violation> violationSegment) { List<Violation> violationSegmentCopy = new ArrayList<>(violationSegment); - Collections.sort(violationSegmentCopy, new Comparator<Violation>() { + violationSegmentCopy.sort(new Comparator<Violation>() { /** * {@inheritDoc} */ @@ -323,7 +322,7 @@ public class PmdReportRenderer extends AbstractMavenReportRenderer { startSection(getI18nString("suppressedViolations.title")); List<SuppressedViolation> suppressedViolationsCopy = new ArrayList<>(suppressedViolations); - Collections.sort(suppressedViolationsCopy, new Comparator<SuppressedViolation>() { + suppressedViolationsCopy.sort(new Comparator<SuppressedViolation>() { @Override public int compare(SuppressedViolation o1, SuppressedViolation o2) { return o1.getFilename().compareTo(o2.getFilename()); @@ -368,7 +367,7 @@ public class PmdReportRenderer extends AbstractMavenReportRenderer { // sort the problem by filename first, since PMD is executed multithreaded // and might report the results unsorted. List<ProcessingError> processingErrorsCopy = new ArrayList<>(processingErrors); - Collections.sort(processingErrorsCopy, new Comparator<ProcessingError>() { + processingErrorsCopy.sort(new Comparator<ProcessingError>() { @Override public int compare(ProcessingError e1, ProcessingError e2) { return e1.getFilename().compareTo(e2.getFilename()); diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java b/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java index f92630a..d28c1e3 100644 --- a/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java +++ b/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java @@ -62,7 +62,7 @@ abstract class Executor { } } - protected static class ProcessStreamHandler implements Runnable { + protected static final class ProcessStreamHandler implements Runnable { private static final int BUFFER_SIZE = 8192; private final BufferedInputStream in; diff --git a/src/test/java/org/apache/maven/plugins/pmd/CapturingPrintStream.java b/src/test/java/org/apache/maven/plugins/pmd/CapturingPrintStream.java index 67e8e84..b3f6795 100644 --- a/src/test/java/org/apache/maven/plugins/pmd/CapturingPrintStream.java +++ b/src/test/java/org/apache/maven/plugins/pmd/CapturingPrintStream.java @@ -25,7 +25,7 @@ import org.slf4j.simple.MavenSlf4jSimpleFriend; /** * Captures log output from simple slf4j for asserting in unit tests. */ -class CapturingPrintStream extends PrintStream { +final class CapturingPrintStream extends PrintStream { private boolean quiet; private StringBuilder buffer = new StringBuilder();
