Skip to content

Consider default excludes when choosing files to check #653

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

Open
elharo wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −18
Open

Consider default excludes when choosing files to check #653

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c961614
Remove moot code
elharo Jan 5, 2026
3474ff4
default
elharo Jan 7, 2026
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
29 changes: 11 additions & 18 deletions src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,21 +436,6 @@ private Properties getOverridingProperties(CheckstyleExecutorRequest request) th
}

private List<File> getFilesToProcess(CheckstyleExecutorRequest request) throws IOException {
StringBuilder excludesStr = new StringBuilder();

if (StringUtils.isNotEmpty(request.getExcludes())) {
Copy link
Contributor Author

@elharo elharo Jan 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addFilesToProcess gets the excludes from the request, but it does not currently get the default excludes. That's the difference.

excludesStr.append(request.getExcludes());
}

String[] defaultExcludes = FileUtils.getDefaultExcludes();
for (String defaultExclude : defaultExcludes) {
if (excludesStr.length() > 0) {
excludesStr.append(",");
}

excludesStr.append(defaultExclude);
}

Set<File> files = new LinkedHashSet<>();
if (request.isAggregate()) {
for (MavenProject project : request.getReactorProjects()) {
Expand Down Expand Up @@ -501,11 +486,19 @@ private void addFilesToProcess(
Collection<File> files,
Collection<File> testSourceDirectories)
throws IOException {

String excludes = request.getExcludes();
String defaultExcludes = String.join(",", FileUtils.getDefaultExcludes());
if (excludes == null || excludes.isEmpty()) {
excludes = defaultExcludes;
} else {
excludes = excludes + "," + defaultExcludes;
}

if (sourceDirectories != null) {
for (File sourceDirectory : sourceDirectories) {
if (sourceDirectory.isDirectory()) {
final List<File> sourceFiles =
FileUtils.getFiles(sourceDirectory, request.getIncludes(), request.getExcludes());
final List<File> sourceFiles = FileUtils.getFiles(sourceDirectory, request.getIncludes(), excludes);
files.addAll(sourceFiles);
logger.debug("Added " + sourceFiles.size() + " source files found in '"
+ sourceDirectory.getAbsolutePath() + "'.");
Expand All @@ -517,7 +510,7 @@ private void addFilesToProcess(
for (File testSourceDirectory : testSourceDirectories) {
if (testSourceDirectory.isDirectory()) {
final List<File> testSourceFiles =
FileUtils.getFiles(testSourceDirectory, request.getIncludes(), request.getExcludes());
FileUtils.getFiles(testSourceDirectory, request.getIncludes(), excludes);

files.addAll(testSourceFiles);
logger.debug("Added " + testSourceFiles.size() + " test source files found in '"
Expand Down