Skip to content

Clarify and simplify isDirectoryExcluded #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 7, 2025
Merged

Clarify and simplify isDirectoryExcluded #222

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55671fc
simplify excluded check
elharo Jun 7, 2025
429641b
rewrite exception message
elharo Jun 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/main/java/org/apache/maven/plugins/pmd/AbstractPmdReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,25 +368,23 @@ protected Map<File, PmdFileInfo> getFilesToProcess() throws IOException {
return files;
}

private boolean isDirectoryExcluded(Collection<File> excludeRootFiles, File sourceDirectoryToCheck) {
boolean returnVal = false;
for (File excludeDir : excludeRootFiles) {
private boolean isDirectoryExcluded(Collection<File> excludedRootFiles, File sourceDirectoryToCheck) {
for (File excludedDirectory : excludedRootFiles) {
try {
if (sourceDirectoryToCheck
.getCanonicalFile()
.toPath()
.startsWith(excludeDir.getCanonicalFile().toPath())) {
.startsWith(excludedDirectory.getCanonicalFile().toPath())) {
getLog().debug("Directory " + sourceDirectoryToCheck.getAbsolutePath()
+ " has been excluded as it matches excludeRoot "
+ excludeDir.getAbsolutePath());
returnVal = true;
break;
+ excludedDirectory.getAbsolutePath());
return true;
}
} catch (IOException e) {
getLog().warn("Error while checking " + sourceDirectoryToCheck + " whether it should be excluded.", e);
getLog().warn("Error while checking whether " + sourceDirectoryToCheck + " should be excluded.", e);
}
}
return returnVal;
return false;
}

/**
Expand Down