Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update JCommander version

Browse Source 
This commit updates the JCommander version to 1.81.
The update also takes into account an issue that was
introduced in new versions of the JCommander, namely,
https://github.com/cbeust/jcommander/issues/377.
This commit is contained in:
Joao Ferreira
2019-01-15 18:14:52 +00:00
committed by Janne Valkealahti
parent 3b06a9aef7
commit 63f786fd8c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -25,7 +25,7 @@
<jline.version>3.4.0</jline.version>
<assertj.version>3.8.0</assertj.version>
<java.version>1.8</java.version>
<jcommander.version>1.48</jcommander.version>
<jcommander.version>1.81</jcommander.version>
</properties>
<modules>

8
spring-shell-jcommander-adapter/src/main/java/org/springframework/shell/jcommander/JCommanderParameterResolver.java
View File

@@ -104,9 +104,7 @@ public class JCommanderParameterResolver implements ParameterResolver {
private JCommander createJCommander(MethodParameter methodParameter) {
Object pojo = BeanUtils.instantiateClass(methodParameter.getParameterType());
JCommander jCommander = new JCommander(pojo);
jCommander.setAcceptUnknownOptions(true);
return jCommander;
return new JCommander(pojo);
}
@Override
@@ -122,7 +120,7 @@ public class JCommanderParameterResolver implements ParameterResolver {
unCamelify(j.getParameterized().getType().getSimpleName()))
.keys(Arrays.asList(j.getParameter().names()))
.help(j.getDescription())
.mandatoryKey(!j.equals(jCommander.getMainParameter()))
.mandatoryKey(!j.equals(jCommander.getMainParameterValue()))
// Not ideal as this does not take reverse-conversion into account, but just toString()
.defaultValue(j.getDefault() == null ? "" : String.valueOf(j.getDefault()))
.elementDescriptor(
@@ -136,7 +134,7 @@ public class JCommanderParameterResolver implements ParameterResolver {
private Stream<com.beust.jcommander.ParameterDescription> streamAllJCommanderDescriptions(JCommander jCommander) {
return Stream.concat(
jCommander.getParameters().stream(),
jCommander.getMainParameter() != null ? Stream.of(jCommander.getMainParameter()) : Stream.empty());
jCommander.getMainParameterValue() != null ? Stream.of(jCommander.getMainParameterValue()) : Stream.empty());
}
// Java 9+ warn if you try to reflect on JDK types