Skip to content

Option key validation on uniqueness #14466

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

Closed
wants to merge 3 commits into from
Closed

Option key validation on uniqueness #14466

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f93732f
Option keys validation on uniqueness.
ruslanys Sep 13, 2018
2a22842
Change exception description
ruslanys Sep 13, 2018
59dd57c
javaformat
ruslanys Sep 13, 2018
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
20 changes: 18 additions & 2 deletions ...ng-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import joptsimple.OptionDescriptor;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
import joptsimple.OptionSpecBuilder;

import org.springframework.boot.cli.command.OptionParsingCommand;
Expand All @@ -55,11 +56,26 @@ public class OptionHandler {
private Collection<OptionHelp> optionHelp;

public OptionSpecBuilder option(String name, String description) {
return getParser().accepts(name, description);
OptionParser parser = getParser();
if (parser.recognizedOptions().containsKey(name)) {
throw new IllegalArgumentException("Option key -" + name + " duplicated.");
}

return parser.accepts(name, description);
}

public OptionSpecBuilder option(Collection<String> aliases, String description) {
return getParser().acceptsAll(aliases, description);
OptionParser parser = getParser();

Map<String, OptionSpec<?>> recognizedOptions = parser.recognizedOptions();
for (String alias : aliases) {
if (recognizedOptions.containsKey(alias)) {
throw new IllegalArgumentException(
"Option key -" + alias + " duplicated.");
}
}

return parser.acceptsAll(aliases, description);
}

public OptionParser getParser() {
Expand Down