Skip to content

[CLI-312] Inconsistent behaviour in key/value pairs (Java property style) #233

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
garydgregory merged 12 commits into from
Feb 16, 2024
Merged

[CLI-312] Inconsistent behaviour in key/value pairs (Java property style) #233

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d873a30
[CLI-312] Illustrate problem
mthmulders Nov 17, 2021
ec0ede2
Added Supplier<T> defaults for getParsedOptionValue
Claudenw Feb 8, 2024
ecfdac4
added tests
Claudenw Feb 9, 2024
0fd117f
Fixed test issues
Claudenw Feb 14, 2024
4c841db
CLI-320: Awkward behavior of Option.builder() for multiple optional args
paulk-asert Nov 2, 2023
a5ddad4
Fixes for -D with separate single value
Claudenw Feb 14, 2024
a50adcc
cleaned up accidental includes
Claudenw Feb 14, 2024
3e8ea7d
Removed unneeded line.
Claudenw Feb 14, 2024
34872cc
added test for missing value
Claudenw Feb 15, 2024
675fa04
removed extra spaces
Claudenw Feb 15, 2024
232259f
removed unecessary function
Claudenw Feb 16, 2024
3e4c33c
removed unnecessary throws from test
Claudenw Feb 16, 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
Prev Previous commit
Next Next commit
Fixed test issues
  • Loading branch information
@Claudenw
Claudenw committed Feb 14, 2024
commit 0fd117fcc450a15dfd168b1aa0a85accdbb5d503
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/cli/CommandLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ public <T> T getParsedOptionValue(final char opt, final Supplier<T> defaultValue
* @since 1.5.0
*/
public <T> T getParsedOptionValue(final Option option) throws ParseException {
return getParsedOptionValue(option, null);
return getParsedOptionValue(option, ()-> null);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/org/apache/commons/cli/CommandLineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,15 @@ public void testGetParsedOptionValueUsingDefault() throws Exception {

assertEquals(123, ((Number) cmd.getParsedOptionValue(optI)).intValue());
assertEquals("foo", cmd.getParsedOptionValue(optF, "foo"));
assertEquals("foo", cmd.getParsedOptionValue(optF, ()->"foo"));
assertEquals("foo", cmd.getParsedOptionValue(optF, ()-> "foo"));
assertEquals("foo", cmd.getParsedOptionValue("f", "foo"));
assertEquals("foo", cmd.getParsedOptionValue("f", ()->"foo"));
assertEquals("foo", cmd.getParsedOptionValue("f", ()-> "foo"));
assertEquals("foo", cmd.getParsedOptionValue('f', "foo"));
assertEquals("foo", cmd.getParsedOptionValue('f', ()->"foo"));
assertEquals("foo", cmd.getParsedOptionValue('f', ()-> "foo"));
}

@Test
public void testNullhOption() throws Exception {
public void testNullOption() throws Exception {
final Options options = new Options();
final Option optI = Option.builder("i").hasArg().type(Number.class).build();
final Option optF = Option.builder("f").hasArg().build();
Expand Down