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

Buildmutators filter removal #315

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

Buildmutators filter removal #315

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
1 change: 0 additions & 1 deletion src/main/java/org/gradle/profiler/ScenarioLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ static List<ScenarioDefinition> loadScenarios(File scenarioFile, InvocationSetti
String title = scenario.hasPath(TITLE) ? scenario.getString(TITLE) : null;

List<BuildMutator> mutators = BUILD_MUTATOR_CONFIGURATORS.entrySet().stream()
.filter(entry -> scenario.hasPath(entry.getKey()))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

BuildMutators are responsible for returning BuildMutator.NOOP if they don't support this key during configuration. This centralizes the logic to the BuildMutator instead of in 2 places.

.map(entry -> entry.getValue().configure(scenario, scenarioName, settings, entry.getKey()))
.filter(mutator -> mutator != BuildMutator.NOOP)
.collect(Collectors.toList());
Expand Down
6 changes: 4 additions & 2 deletions ...in/java/org/gradle/profiler/mutations/AbstractBuildMutatorWithoutOptionsConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ public abstract class AbstractBuildMutatorWithoutOptionsConfigurator implements

@Override
public BuildMutator configure(Config scenario, String scenarioName, InvocationSettings settings, String key) {
boolean enabled = scenario.getBoolean(key);
return enabled ? createBuildMutator(settings) : BuildMutator.NOOP;
return new HasPathBuildMutatorConfigurator(() -> {
boolean enabled = scenario.getBoolean(key);
return enabled ? createBuildMutator(settings) : BuildMutator.NOOP;
}).configure(scenario,scenarioName,settings,key);
}
}
13 changes: 8 additions & 5 deletions src/main/java/org/gradle/profiler/mutations/AbstractCleanupMutator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,14 @@ protected static void delete(File f) {
protected static abstract class Configurator implements BuildMutatorConfigurator {
@Override
public BuildMutator configure(Config scenario, String scenarioName, InvocationSettings settings, String key) {
CleanupSchedule schedule = ConfigUtil.enumValue(scenario, key, CleanupSchedule.class, null);
if (schedule == null) {
throw new IllegalArgumentException("Schedule for cleanup is not specified");
}
return newInstance(scenario, scenarioName, settings, key, schedule);
return new HasPathBuildMutatorConfigurator(() -> {
CleanupSchedule schedule = ConfigUtil
.enumValue(scenario, key, CleanupSchedule.class, null);
if (schedule == null) {
throw new IllegalArgumentException("Schedule for cleanup is not specified");
}
return newInstance(scenario, scenarioName, settings, key, schedule);
}).configure(scenario, scenarioName, settings, key);
}

protected abstract BuildMutator newInstance(Config scenario, String scenarioName, InvocationSettings settings, String key, CleanupSchedule schedule);
Expand Down
13 changes: 8 additions & 5 deletions src/main/java/org/gradle/profiler/mutations/FileChangeMutatorConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,15 @@ public FileChangeMutatorConfigurator(Class<? extends AbstractFileChangeMutator>

@Override
public BuildMutator configure(Config scenario, String scenarioName, InvocationSettings settings, String key) {
List<BuildMutator> mutatorsForKey = new ArrayList<>();
for (File sourceFileToChange : sourceFiles(scenario, scenarioName, settings.getProjectDir(), key)) {
mutatorsForKey.add(getBuildMutatorForFile(sourceFileToChange));
}
return new HasPathBuildMutatorConfigurator(() -> {
List<BuildMutator> mutatorsForKey = new ArrayList<>();
for (File sourceFileToChange : sourceFiles(scenario, scenarioName,
settings.getProjectDir(), key)) {
mutatorsForKey.add(getBuildMutatorForFile(sourceFileToChange));
}

return new CompositeBuildMutator(mutatorsForKey);
return new CompositeBuildMutator(mutatorsForKey);
}).configure(scenario, scenarioName, settings, key);
}

private BuildMutator getBuildMutatorForFile(File sourceFileToChange) {
Expand Down
17 changes: 10 additions & 7 deletions src/main/java/org/gradle/profiler/mutations/GitCheckoutMutator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,16 @@ private void checkout(String target) {
public static class Configurator implements BuildMutatorConfigurator {
@Override
public BuildMutator configure(Config scenario, String scenarioName, InvocationSettings settings, String key) {
Config config = scenario.getConfig(key);
String cleanup = ConfigUtil.string(config, "cleanup", null);
String build = ConfigUtil.string(config, "build", null);
if (build == null) {
throw new IllegalArgumentException("No git-checkout target specified for build");
}
return new GitCheckoutMutator(settings.getProjectDir(), cleanup, build);
return new HasPathBuildMutatorConfigurator(() -> {
Config config = scenario.getConfig(key);
String cleanup = ConfigUtil.string(config, "cleanup", null);
String build = ConfigUtil.string(config, "build", null);
if (build == null) {
throw new IllegalArgumentException(
"No git-checkout target specified for build");
}
return new GitCheckoutMutator(settings.getProjectDir(), cleanup, build);
}).configure(scenario, scenarioName, settings, key);
}
}

Expand Down
12 changes: 7 additions & 5 deletions src/main/java/org/gradle/profiler/mutations/GitRevertMutator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ private void abortRevert() {
public static class Configurator implements BuildMutatorConfigurator {
@Override
public BuildMutator configure(Config scenario, String scenarioName, InvocationSettings settings, String key) {
List<String> commits = ConfigUtil.strings(scenario, key);
if (commits.isEmpty()) {
throw new IllegalArgumentException("No commits specified for git-revert");
}
return new GitRevertMutator(settings.getProjectDir(), commits);
return new HasPathBuildMutatorConfigurator(() -> {
List<String> commits = ConfigUtil.strings(scenario, key);
if (commits.isEmpty()) {
throw new IllegalArgumentException("No commits specified for git-revert");
}
return new GitRevertMutator(settings.getProjectDir(), commits);
}).configure(scenario, scenarioName, settings, key);
}
}

Expand Down
26 changes: 26 additions & 0 deletions src/main/java/org/gradle/profiler/mutations/HasPathBuildMutatorConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package org.gradle.profiler.mutations;

import com.typesafe.config.Config;
import java.util.function.Supplier;
import org.gradle.profiler.BuildMutator;
import org.gradle.profiler.InvocationSettings;

class HasPathBuildMutatorConfigurator implements BuildMutatorConfigurator {

private Supplier<BuildMutator> configurator;

HasPathBuildMutatorConfigurator(Supplier<BuildMutator> configurator) {
this.configurator = configurator;
}

@Override
public BuildMutator configure(Config scenario, String scenarioName, InvocationSettings settings, String key) {
BuildMutator buildMutator;
if (scenario.hasPath(key)) {
buildMutator = configurator.get();
} else {
buildMutator = BuildMutator.NOOP;
}
return buildMutator;
}
}