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

Jump to bottom

Option to skip creation of aggregated output if input set is empty #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Option to skip creation of aggregated output if input set is empty #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ...ntalbuild/src/main/java/io/takari/incrementalbuild/aggregator/AggregatorBuildContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ public interface AggregatorBuildContext {

public InputSet newInputSet();

public InputSet newInputSet(boolean createOutputIfEmpty);

}
7 changes: 6 additions & 1 deletion ...in/java/io/takari/incrementalbuild/aggregator/internal/DefaultAggregatorBuildContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ public DefaultAggregatorBuildContext(Workspace workspace, File stateFile,

@Override
public DefaultInputSet newInputSet() {
return new DefaultInputSet(this);
return newInputSet(true);
}

@Override
public DefaultInputSet newInputSet(boolean createOutputIfEmpty) {
return new DefaultInputSet(this, createOutputIfEmpty);
}

private File registerOutput(File outputFile) {
Expand Down
10 changes: 9 additions & 1 deletion ...albuild/src/main/java/io/takari/incrementalbuild/aggregator/internal/DefaultInputSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ public class DefaultInputSet implements InputSet {
private final DefaultAggregatorBuildContext context;

private final Set<File> inputs = new LinkedHashSet<>();
private final boolean createOutputIfEmpty;

DefaultInputSet(DefaultAggregatorBuildContext context) {
DefaultInputSet(DefaultAggregatorBuildContext context, boolean createOutputIfEmpty) {
this.context = context;
this.createOutputIfEmpty = createOutputIfEmpty;
}

@Override
Expand All @@ -44,12 +46,18 @@ public Iterable<File> addInputs(File basedir, Collection<String> includes,
@Override
public boolean aggregateIfNecessary(File outputFile, InputAggregator aggregator)
throws IOException {
if (inputs.isEmpty() && !createOutputIfEmpty) {
return false;
}
return context.aggregateIfNecessary(inputs, outputFile, aggregator);
}

@Override
public <T extends Serializable> boolean aggregateIfNecessary(File outputFile,
MetadataAggregator<T> aggregator) throws IOException {
if (inputs.isEmpty() && !createOutputIfEmpty) {
return false;
}
return context.aggregateIfNecessary(inputs, outputFile, aggregator);
}

Expand Down
5 changes: 5 additions & 0 deletions .../src/main/java/io/takari/incrementalbuild/maven/internal/MavenAggregatorBuildContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,9 @@ public InputSet newInputSet() {
return provider.get().newInputSet();
}

@Override
public InputSet newInputSet(boolean createOutputIfEmpty) {
return provider.get().newInputSet(createOutputIfEmpty);
}

}
14 changes: 14 additions & 0 deletions ...build/src/test/java/io/takari/incrementalbuild/spi/DefaultAggregatorBuildContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,18 @@ public void testEmpty() throws Exception {
Assert.assertEquals(1, indexer.outputs.size());
}

@Test
public void testEmptyNoCreate() throws Exception {
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add a test for incremental delete of an aggregate output created during a prior build.

File outputFile = new File(temp.getRoot(), "output");
File basedir = temp.newFolder();

FileIndexer indexer = new FileIndexer();
DefaultAggregatorBuildContext actx = newContext();
DefaultInputSet output = actx.newInputSet(false);
output.addInputs(basedir, null, null);
output.aggregateIfNecessary(outputFile, indexer);
actx.commit(null);
Assert.assertFalse(outputFile.exists());
Assert.assertEquals(0, indexer.outputs.size());
}
}