Skip to content

Commit 5ad90a4

Browse files
committed
fixup! Handle null cases correctly to fix tests
1 parent 55218ae commit 5ad90a4

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -655,10 +655,6 @@ private void extendJavaProjectBuilder(
655655
}
656656

657657
private boolean isExcludedDirectory(Collection<File> excludedDirectories, File sourceFile) {
658-
if (excludedDirectories == null) {
659-
return false;
660-
}
661-
662658
for (File excludedScanDirectory : excludedDirectories) {
663659
File candidateFile = sourceFile;
664660
while (candidateFile != null) {

maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,9 @@ public String getUsedMavenApiVersion() {
239239

240240
@Override
241241
public Collection<File> getExcludedScanDirectories() {
242+
if (excludedScanDirectories == null) {
243+
excludedScanDirectories = new HashSet<>();
244+
}
242245
return excludedScanDirectories;
243246
}
244247

maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,10 +581,6 @@ protected void validate(MojoDescriptor mojoDescriptor) throws InvalidParameterEx
581581
}
582582

583583
private boolean isExcludedDirectory(Collection<File> excludedDirectories, File sourceFile) {
584-
if (excludedDirectories == null) {
585-
return false;
586-
}
587-
588584
for (File excludedScanDirectory : excludedDirectories) {
589585
File candidateFile = sourceFile;
590586
while (candidateFile != null) {

0 commit comments

Comments
 (0)