hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Fix unit tests

Browse Source
This commit is contained in:
Andreas Dangel
2023-12-11 11:14:16 +01:00
parent 1ecda3f749
commit 6ea7206f65
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pmd-cli/src/main/java/net/sourceforge/pmd/cli/commands/internal/AbstractAnalysisPmdSubcommand.java
View File

@@ -7,8 +7,9 @@ package net.sourceforge.pmd.cli.commands.internal;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import net.sourceforge.pmd.AbstractConfiguration;
import net.sourceforge.pmd.cli.commands.mixins.internal.EncodingMixin;
@@ -28,7 +29,7 @@ public abstract class AbstractAnalysisPmdSubcommand<C extends AbstractConfigurat
// see the setters #setInputPaths and setPositionalInputPaths for @Option and @Parameters annotations
// Note: can't use annotations on the fields here, as otherwise the complete list would be replaced
// rather than accumulated.
protected List<Path> inputPaths;
protected Set<Path> inputPaths;
@Option(names = "--file-list",
description =
@@ -75,7 +76,7 @@ public abstract class AbstractAnalysisPmdSubcommand<C extends AbstractConfigurat
arity = "1..*", split = ",")
protected void setInputPaths(final List<Path> inputPaths) {
if (this.inputPaths == null) {
this.inputPaths = new ArrayList<>();
this.inputPaths = new LinkedHashSet<>(); // linked hashSet in order to maintain order
}
this.inputPaths.addAll(inputPaths);

2
pmd-cli/src/main/java/net/sourceforge/pmd/cli/commands/internal/CpdCommand.java
View File

@@ -105,7 +105,7 @@ public class CpdCommand extends AbstractAnalysisPmdSubcommand<CPDConfiguration>
configuration.setFailOnViolation(failOnViolation);
configuration.setInputFilePath(fileListPath);
if (inputPaths != null) {
configuration.setInputPathList(inputPaths);
configuration.setInputPathList(new ArrayList<>(inputPaths));
}
configuration.setIgnoreAnnotations(ignoreAnnotations);
configuration.setIgnoreIdentifiers(ignoreIdentifiers);

2
pmd-cli/src/main/java/net/sourceforge/pmd/cli/commands/internal/PmdCommand.java
View File

@@ -260,7 +260,7 @@ public class PmdCommand extends AbstractAnalysisPmdSubcommand<PMDConfiguration>
protected PMDConfiguration toConfiguration() {
final PMDConfiguration configuration = new PMDConfiguration();
if (inputPaths != null) {
configuration.setInputPathList(inputPaths);
configuration.setInputPathList(new ArrayList<>(inputPaths));
}
configuration.setInputFilePath(fileListPath);
configuration.setIgnoreFilePath(ignoreListPath);