From a1e71aa9b2f9c495e5433f8bfcf40da7676085fc Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 5 Jul 2026 11:48:53 +0000 Subject: [PATCH 1/3] fix #87: null-check getTargetFiles() return value - Skip mappings that return null from getTargetFiles() - Add test for null return from SourceMapping --- .../shared/io/scan/StaleResourceScanner.java | 4 ++ .../io/scan/StaleResourceScannerTest.java | 42 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java diff --git a/src/main/java/org/apache/maven/shared/io/scan/StaleResourceScanner.java b/src/main/java/org/apache/maven/shared/io/scan/StaleResourceScanner.java index c942ef6..f961d64 100644 --- a/src/main/java/org/apache/maven/shared/io/scan/StaleResourceScanner.java +++ b/src/main/java/org/apache/maven/shared/io/scan/StaleResourceScanner.java @@ -93,6 +93,10 @@ public Set getIncludedSources(File sourceDir, File targetDir) throws Inclu for (SourceMapping mapping : srcMappings) { Set targetFiles = mapping.getTargetFiles(targetDir, path); + if (targetFiles == null) { + continue; + } + // never include files that don't have corresponding target mappings. // the targets don't have to exist on the filesystem, but the // mappers must tell us to look for them. diff --git a/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java b/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java new file mode 100644 index 0000000..2c65fea --- /dev/null +++ b/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.shared.io.scan; + +import java.io.File; +import java.util.Set; + +import org.apache.maven.shared.io.scan.mapping.SourceMapping; +import org.junit.jupiter.api.Test; + +class StaleResourceScannerTest { + + @Test + void shouldNotNpeWhenGetTargetFilesReturnsNull() throws Exception { + StaleResourceScanner scanner = new StaleResourceScanner(); + scanner.addSourceMapping(new SourceMapping() { + public Set getTargetFiles(File targetDir, String source) { + return null; + } + }); + + File sourceDir = new File("src/test"); + File targetDir = new File("target"); + scanner.getIncludedSources(sourceDir, targetDir); + } +} From 8ce1dacd3ec3ff85a33fc5bf0791230e4062c21c Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 1 Aug 2026 11:41:35 +0000 Subject: [PATCH 2/3] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../shared/io/scan/StaleResourceScannerTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java b/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java index 2c65fea..3452a1d 100644 --- a/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java +++ b/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java @@ -19,24 +19,32 @@ package org.apache.maven.shared.io.scan; import java.io.File; +import java.nio.file.Files; import java.util.Set; import org.apache.maven.shared.io.scan.mapping.SourceMapping; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; + class StaleResourceScannerTest { @Test void shouldNotNpeWhenGetTargetFilesReturnsNull() throws Exception { StaleResourceScanner scanner = new StaleResourceScanner(); scanner.addSourceMapping(new SourceMapping() { + @Override public Set getTargetFiles(File targetDir, String source) { return null; } }); - File sourceDir = new File("src/test"); - File targetDir = new File("target"); - scanner.getIncludedSources(sourceDir, targetDir); + File baseDir = new File("target"); + baseDir.mkdirs(); + File sourceDir = Files.createTempDirectory(baseDir.toPath(), "stale-scanner-src-").toFile(); + File targetDir = Files.createTempDirectory(baseDir.toPath(), "stale-scanner-tgt-").toFile(); + Files.createTempFile(sourceDir.toPath(), "source", ".txt"); + + assertDoesNotThrow(() -> scanner.getIncludedSources(sourceDir, targetDir)); } } From 7ebaa251ba250ae2196c960e90b34589e363a3c9 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 6 Aug 2026 11:35:20 -0400 Subject: [PATCH 3/3] spotless --- .../maven/shared/io/scan/StaleResourceScannerTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java b/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java index 3452a1d..73e89d3 100644 --- a/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java +++ b/src/test/java/org/apache/maven/shared/io/scan/StaleResourceScannerTest.java @@ -41,8 +41,10 @@ public Set getTargetFiles(File targetDir, String source) { File baseDir = new File("target"); baseDir.mkdirs(); - File sourceDir = Files.createTempDirectory(baseDir.toPath(), "stale-scanner-src-").toFile(); - File targetDir = Files.createTempDirectory(baseDir.toPath(), "stale-scanner-tgt-").toFile(); + File sourceDir = Files.createTempDirectory(baseDir.toPath(), "stale-scanner-src-") + .toFile(); + File targetDir = Files.createTempDirectory(baseDir.toPath(), "stale-scanner-tgt-") + .toFile(); Files.createTempFile(sourceDir.toPath(), "source", ".txt"); assertDoesNotThrow(() -> scanner.getIncludedSources(sourceDir, targetDir));