diff options
author | Cedric Beust <cedric@beust.com> | 2017-03-05 06:41:41 -0800 |
---|---|---|
committer | Cedric Beust <cedric@beust.com> | 2017-03-05 06:41:41 -0800 |
commit | 749044426d441837fd1f16cfcc24ffd5ec0e4b10 (patch) | |
tree | 2293032f835e95dbc188956987ac487d21035438 | |
parent | 9204d90557da604b203b6d5317b8067d8d0312c5 (diff) | |
download | jcommander-749044426d441837fd1f16cfcc24ffd5ec0e4b10.tar.gz |
Compile JCommander with 1.7.
TestNG depends on it, so that's necessary.
-rw-r--r-- | kobalt/src/Build.kt | 6 | ||||
-rw-r--r-- | src/main/java/com/beust/jcommander/JCommander.java | 4 | ||||
-rw-r--r-- | src/test/java/com/beust/jcommander/ParametersNotEmptyTest.java | 23 |
3 files changed, 22 insertions, 11 deletions
diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 4a58f6a..965e1a9 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,5 +1,5 @@ - +import com.beust.kobalt.plugin.java.javaCompiler import com.beust.kobalt.plugin.packaging.assemble import com.beust.kobalt.plugin.publish.bintray import com.beust.kobalt.project @@ -29,6 +29,10 @@ val jcommander = project { sign = true } + javaCompiler { + args("-target", "1.7", "-source", "1.7") + } + pom = Model().apply { name = project.name description = "Command line parsing" diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java index e8b5045..1736ef5 100644 --- a/src/main/java/com/beust/jcommander/JCommander.java +++ b/src/main/java/com/beust/jcommander/JCommander.java @@ -1297,7 +1297,7 @@ public class JCommander { * Adds a factory to lookup string converters. The added factory is used prior to previously added factories. * @param converterFactory the factory determining string converters */ - public void addConverterFactory(IStringConverterFactory converterFactory) { + public void addConverterFactory(final IStringConverterFactory converterFactory) { addConverterInstanceFactory(new IStringConverterInstanceFactory() { @SuppressWarnings("unchecked") @Override @@ -1337,7 +1337,7 @@ public class JCommander { * @param optionName * @param value The value to convert */ - public Object convertValue(Parameterized parameterized, Class type, String optionName, String value) { + public Object convertValue(final Parameterized parameterized, Class type, String optionName, String value) { final Parameter annotation = parameterized.getParameter(); // Do nothing if it's a @DynamicParameter diff --git a/src/test/java/com/beust/jcommander/ParametersNotEmptyTest.java b/src/test/java/com/beust/jcommander/ParametersNotEmptyTest.java index 596c2f4..7ebfc24 100644 --- a/src/test/java/com/beust/jcommander/ParametersNotEmptyTest.java +++ b/src/test/java/com/beust/jcommander/ParametersNotEmptyTest.java @@ -3,8 +3,10 @@ package com.beust.jcommander; import org.testng.Assert; import org.testng.annotations.Test; +import java.util.ArrayList; +import java.util.Collections; import java.util.Date; -import java.util.stream.Collectors; +import java.util.List; @Test public class ParametersNotEmptyTest { @@ -19,12 +21,17 @@ public class ParametersNotEmptyTest { @Test public void testParameters() throws Exception { - final JCommander jc = new JCommander(new Args1()); - final String parameterNames = jc.getParameters().stream() - .map(ParameterDescription::getNames) - .sorted() - .collect(Collectors.joining(", ")); - Assert.assertEquals(parameterNames,"-date, -debug", - "getParameters returns the @Parameters"); + JCommander jc = new JCommander(new Args1()); + List<String> parameters = new ArrayList<>(); + for (ParameterDescription pd : jc.getParameters()) { + parameters.add(pd.getNames()); + } + Collections.sort(parameters); + + Assert.assertEquals(parameters, new ArrayList<String>() {{ + add("-date"); + add("-debug"); + }} + ); } } |