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

Move unknown options check further in the startup #7066

Merged
merged 2 commits into from
May 7, 2024
Merged

Move unknown options check further in the startup #7066

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85dc4fa
Move unknown options check further in the startups
Gabriel-Trintinalia May 7, 2024
94c7107
Rename variable to make it clearer
Gabriel-Trintinalia May 7, 2024
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
8 changes: 6 additions & 2 deletions besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigurationDefaultProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public class TomlConfigurationDefaultProvider implements IDefaultValueProvider {
private final CommandLine commandLine;
private final InputStream configurationInputStream;
private TomlParseResult result;
private boolean isUnknownOptionsChecked;

/**
* Instantiates a new Toml config file default value provider.
Expand Down Expand Up @@ -230,6 +231,11 @@ private void checkConfigurationValidity() {
throw new ParameterException(
commandLine,
String.format("Unable to read TOML configuration file %s", configurationInputStream));

if (!isUnknownOptionsChecked && !commandLine.isUnmatchedArgumentsAllowed()) {
checkUnknownOptions(result);
isUnknownOptionsChecked = true;
}
}

/** Load configuration from file. */
Expand All @@ -249,8 +255,6 @@ public void loadConfigurationFromFile() {
commandLine, String.format("Invalid TOML configuration: %s", errors));
}

checkUnknownOptions(result);

this.result = result;

} catch (final IOException e) {
Expand Down
Loading