Skip to content

fix: support three-state logic for arguments #1587

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

Merged
algomaster99 merged 2 commits into from
May 26, 2026
Merged

fix: support three-state logic for arguments #1587

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
906f039
fix: use nullable Boolean for mojo params so lockfile config is not o…
claude May 25, 2026
8b23035
fix: revert Config() default includeMavenPlugins to false
algomaster99 May 26, 2026
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
80 changes: 46 additions & 34 deletions maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/AbstractLockfileMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ public abstract class AbstractLockfileMojo extends AbstractMojo {
@Component
protected RepositorySystem repositorySystem;

@Parameter(property = "includeMavenPlugins", defaultValue = "false")
protected boolean includeMavenPlugins;
@Parameter(property = "includeMavenPlugins")
protected Boolean includeMavenPlugins;

@Parameter(property = "allowValidationFailure", defaultValue = "false")
protected boolean allowValidationFailure;
@Parameter(property = "allowValidationFailure")
protected Boolean allowValidationFailure;

@Parameter(property = "allowPomValidationFailure", defaultValue = "false")
protected boolean allowPomValidationFailure;
@Parameter(property = "allowPomValidationFailure")
protected Boolean allowPomValidationFailure;

@Parameter(property = "allowEnvironmentalValidationFailure", defaultValue = "false")
protected boolean allowEnvironmentalValidationFailure;
@Parameter(property = "allowEnvironmentalValidationFailure")
protected Boolean allowEnvironmentalValidationFailure;

@Parameter(property = "includeEnvironment", defaultValue = "true")
protected boolean includeEnvironment;
@Parameter(property = "includeEnvironment")
protected Boolean includeEnvironment;

@Parameter(defaultValue = "${maven.version}")
protected String mavenVersion;
Expand Down Expand Up @@ -137,17 +137,24 @@ protected Config getConfig() {
String chosenChecksumAlgorithm = Strings.isNullOrEmpty(checksumAlgorithm) ? "SHA-256" : checksumAlgorithm;
ChecksumModes chosenChecksumMode =
Strings.isNullOrEmpty(checksumMode) ? ChecksumModes.LOCAL : ChecksumModes.fromName(checksumMode);
Config.MavenPluginsInclusion mavenPluginsInclusion =
includeMavenPlugins ? Config.MavenPluginsInclusion.Include : Config.MavenPluginsInclusion.Exclude;
Config.OnValidationFailure onValidationFailure =
allowValidationFailure ? Config.OnValidationFailure.Warn : Config.OnValidationFailure.Error;
Config.OnPomValidationFailure onPomValidationFailure =
allowPomValidationFailure ? Config.OnPomValidationFailure.Warn : Config.OnPomValidationFailure.Error;
Config.OnEnvironmentalValidationFailure onEnvironmentalValidationFailure = allowEnvironmentalValidationFailure
? Config.OnEnvironmentalValidationFailure.Warn
: Config.OnEnvironmentalValidationFailure.Error;
Config.EnvironmentInclusion environmentInclusion =
includeEnvironment ? Config.EnvironmentInclusion.Include : Config.EnvironmentInclusion.Exclude;
// includeMavenPlugins defaults to true when not explicitly set
Config.MavenPluginsInclusion mavenPluginsInclusion = Boolean.FALSE.equals(includeMavenPlugins)
? Config.MavenPluginsInclusion.Exclude
: Config.MavenPluginsInclusion.Include;
Config.OnValidationFailure onValidationFailure = Boolean.TRUE.equals(allowValidationFailure)
? Config.OnValidationFailure.Warn
: Config.OnValidationFailure.Error;
Config.OnPomValidationFailure onPomValidationFailure = Boolean.TRUE.equals(allowPomValidationFailure)
? Config.OnPomValidationFailure.Warn
: Config.OnPomValidationFailure.Error;
Config.OnEnvironmentalValidationFailure onEnvironmentalValidationFailure =
Boolean.TRUE.equals(allowEnvironmentalValidationFailure)
? Config.OnEnvironmentalValidationFailure.Warn
: Config.OnEnvironmentalValidationFailure.Error;
// includeEnvironment defaults to true when not explicitly set
Config.EnvironmentInclusion environmentInclusion = Boolean.FALSE.equals(includeEnvironment)
? Config.EnvironmentInclusion.Exclude
: Config.EnvironmentInclusion.Include;
Config.ReductionState reductionState =
reduced ? Config.ReductionState.Reduced : Config.ReductionState.NonReduced;

Expand Down Expand Up @@ -177,22 +184,27 @@ protected ProjectBuildingRequest newResolvePluginProjectBuildingRequest() throws

/**
* Returns a Config that starts from {@code base} (typically the stored lockfile config) and overrides
* only the fields for which a boolean flag was explicitly set to {@code true}. When a flag is
* {@code false} (the default), the stored value is preserved so that existing lockfile configs are
* not silently tightened by plugin defaults.
* only the fields that were explicitly set via CLI or pom.xml configuration (non-null). When a flag
* is null (not explicitly set), the stored value from the lockfile config is preserved.
*/
protected Config mergeConfigWithCliArgs(Config base) {
Config.MavenPluginsInclusion pluginsInclusion =
includeMavenPlugins ? Config.MavenPluginsInclusion.Include : base.getMavenPluginsInclusion();
Config.OnValidationFailure onValidationFailure =
allowValidationFailure ? Config.OnValidationFailure.Warn : base.getOnValidationFailure();
Config.OnPomValidationFailure onPomValidationFailure =
allowPomValidationFailure ? Config.OnPomValidationFailure.Warn : base.getOnPomValidationFailure();
Config.OnEnvironmentalValidationFailure onEnvFailure = allowEnvironmentalValidationFailure
? Config.OnEnvironmentalValidationFailure.Warn
Config.MavenPluginsInclusion pluginsInclusion = includeMavenPlugins != null
? (includeMavenPlugins ? Config.MavenPluginsInclusion.Include : Config.MavenPluginsInclusion.Exclude)
: base.getMavenPluginsInclusion();
Config.OnValidationFailure onValidationFailure = allowValidationFailure != null
? (allowValidationFailure ? Config.OnValidationFailure.Warn : Config.OnValidationFailure.Error)
: base.getOnValidationFailure();
Config.OnPomValidationFailure onPomValidationFailure = allowPomValidationFailure != null
? (allowPomValidationFailure ? Config.OnPomValidationFailure.Warn : Config.OnPomValidationFailure.Error)
: base.getOnPomValidationFailure();
Config.OnEnvironmentalValidationFailure onEnvFailure = allowEnvironmentalValidationFailure != null
? (allowEnvironmentalValidationFailure
? Config.OnEnvironmentalValidationFailure.Warn
: Config.OnEnvironmentalValidationFailure.Error)
: base.getOnEnvironmentalValidationFailure();
Config.EnvironmentInclusion environmentInclusion =
includeEnvironment ? Config.EnvironmentInclusion.Include : base.getEnvironmentInclusion();
Config.EnvironmentInclusion environmentInclusion = includeEnvironment != null
? (includeEnvironment ? Config.EnvironmentInclusion.Include : Config.EnvironmentInclusion.Exclude)
: base.getEnvironmentInclusion();
return new Config(
pluginsInclusion,
onValidationFailure,
Expand Down
2 changes: 1 addition & 1 deletion maven_plugin/src/test/java/io/github/chains_project/maven_lockfile/ValidateMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void cliArgOverridesStoredConfig() {
@Test
void storedConfigUsedWhenCliArgNotSet() {
var m = mojo();
assertThat(m.allowEnvironmentalValidationFailure).isFalse();
assertThat(m.allowEnvironmentalValidationFailure).isNull();

Config merged = m.mergeConfigWithCliArgs(storedConfig());
assertThat(merged.getOnEnvironmentalValidationFailure())
Expand Down
Loading