Skip to content
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

[MSHARED-1285] use an up-to-date scanner instead the newscanner #77

Merged
merged 2 commits into from
Dec 19, 2023
Merged

[MSHARED-1285] use an up-to-date scanner instead the newscanner #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0005e0
[MSHARED-1285] - exhibit incremental issue
lalmeras Dec 1, 2023
74a967d
MSHARED-1285 use an up-to-date scanner instead the newscanner
Jul 6, 2023
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
47 changes: 36 additions & 11 deletions src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.maven.model.Resource;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.Scanner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -189,20 +190,44 @@ public void filterResources(MavenResourcesExecution mavenResourcesExecution) thr
// as destination
// see MNG-1345
File outputDirectory = mavenResourcesExecution.getOutputDirectory();
boolean outputExists = outputDirectory.exists();
if (!outputExists && !outputDirectory.mkdirs()) {
if (!outputDirectory.mkdirs() && !outputDirectory.exists()) {
throw new MavenFilteringException("Cannot create resource output directory: " + outputDirectory);
}

if (resource.isFiltering()) {
isFilteringUsed = true;
}

boolean ignoreDelta = !outputExists
|| buildContext.hasDelta(mavenResourcesExecution.getFileFilters())
|| buildContext.hasDelta(getRelativeOutputDirectory(mavenResourcesExecution));
LOGGER.debug("ignoreDelta " + ignoreDelta);
Scanner scanner = buildContext.newScanner(resourceDirectory, ignoreDelta);
boolean filtersFileChanged = buildContext.hasDelta(mavenResourcesExecution.getFileFilters());
Path resourcePath = resourceDirectory.toPath();
DirectoryScanner scanner = new DirectoryScanner() {
@Override
protected boolean isSelected(String name, File file) {
if (filtersFileChanged) {
// if the file filters file has a change we must assume everything is out of
// date
return true;
}
if (file.isFile()) {
try {
File targetFile = getTargetFile(file);
if (targetFile.isFile() && buildContext.isUptodate(targetFile, file)) {
return false;
}
} catch (MavenFilteringException e) {
// can't really do anything than to assume we must copy the file...
}
}
return true;
}

private File getTargetFile(File file) throws MavenFilteringException {
Path relativize = resourcePath.relativize(file.toPath());
return getDestinationFile(
outputDirectory, targetPath, relativize.toString(), mavenResourcesExecution);
}
};
scanner.setBasedir(resourceDirectory);

setupScanner(resource, scanner, mavenResourcesExecution.isAddDefaultExcludes());

Expand Down Expand Up @@ -276,13 +301,13 @@ public void filterResources(MavenResourcesExecution mavenResourcesExecution) thr

// deal with deleted source files

scanner = buildContext.newDeleteScanner(resourceDirectory);
Scanner deleteScanner = buildContext.newDeleteScanner(resourceDirectory);

setupScanner(resource, scanner, mavenResourcesExecution.isAddDefaultExcludes());
setupScanner(resource, deleteScanner, mavenResourcesExecution.isAddDefaultExcludes());

scanner.scan();
deleteScanner.scan();

for (String name : scanner.getIncludedFiles()) {
for (String name : deleteScanner.getIncludedFiles()) {
File destinationFile = getDestinationFile(outputDirectory, targetPath, name, mavenResourcesExecution);

destinationFile.delete();
Expand Down
49 changes: 49 additions & 0 deletions src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,55 @@ public void testFilterChange() throws Exception {
assertTrue(ctx.getRefreshFiles().contains(outputFile02));
}

/**
* Check that missing targets are rebuilt even if source is not changed (MSHARED-1285)
*/
public void testMissingTarget() throws Exception {
// run full build first
filter("time");

// erase target files
outputFile01.toFile().delete();
outputFile02.toFile().delete();
// report change only on one file
Set<Path> changedFiles = new HashSet<>();
changedFiles.add(inputFile01);
TestIncrementalBuildContext ctx = new TestIncrementalBuildContext(baseDirectory, changedFiles);
ThreadBuildContext.setThreadBuildContext(ctx);

filter("time");

assertTrue(ctx.getRefreshFiles().contains(outputFile01));
assertTrue(ctx.getRefreshFiles().contains(outputFile02));
assertTrue(outputFile01.toFile().exists());
assertTrue(outputFile02.toFile().exists());
}

/**
* Check that updated targets with unchanged sources are updated (MSHARED-1285)
*/
public void testUpdatedTarget() throws Exception {
// run full build first
filter("time");

// touch target file02
FileUtils.touch(outputFile02.toFile());
Set<Path> changedFiles = new HashSet<>();
changedFiles.add(inputFile01);
// report change only on target file
changedFiles.add(outputFile02);
TestIncrementalBuildContext ctx = new TestIncrementalBuildContext(baseDirectory, changedFiles);
ThreadBuildContext.setThreadBuildContext(ctx);

// both files are updated
filter("notime");
assertTime("notime", "file01.txt");
assertTime("notime", "file02.txt");

assertTrue(ctx.getRefreshFiles().contains(outputFile01));
assertTrue(ctx.getRefreshFiles().contains(outputFile02));
}

public void testFilterDeleted() throws Exception {
// run full build first
filter("time");
Expand Down