GITHUB-417: Trimming parameters

Fixes #417
cbeust · Dec 1, 2017 · 4aec38b · phillip-urioste · Jul 4, 2019 · 4aec38b
1 parent b794de2
commit 4aec38b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java
@@ -909,7 +909,7 @@ private int processFixedArity(String[] args, int originalIndex, ParameterDescrip
             Object finalValue = null;
             if (index + arity < args.length) {
                 for (int j = 1; j <= arity; j++) {
-                    String value = trim(args[index + j + offset]);
+                    String value = args[index + j + offset];
                     finalValue = pd.addValue(arg, value, false, validate, j - 1);
                     requiredFields.remove(pd.getParameterized());
                 }

diff --git a/src/test/java/com/beust/jcommander/JCommanderTest.java b/src/test/java/com/beust/jcommander/JCommanderTest.java
@@ -34,9 +34,6 @@
 import java.io.*;
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -524,7 +521,7 @@ public void getParametersShouldNotNpe() {
     public void validationShouldWork1() {
         ArgsValidate1 a = new ArgsValidate1();
         JCommander jc = new JCommander(a);
-        jc.parse("-age", "2 ");
+        jc.parse("-age", "2");
         Assert.assertEquals(a.age, new Integer(2));
     }
 
@@ -1418,27 +1415,22 @@ public void mainWithConverter() {
         Assert.assertEquals(file.getAbsolutePath(), args.getPath().getAbsolutePath());
     }
 
-    @Test(enabled = false)
-    public static void main(String[] args) {
-
-        class FileValidator implements IParameterValidator {
-            @Override
-            public void validate(String name, String value) throws ParameterException {
-                if (!Files.exists(Paths.get(value))) {
-                    throw new ParameterException("FILE_DOES_NOT_EXIST");
-                }
-            }
-        }
-
+    @Test
+    public void trimTest() {
         class Args {
-            @Parameter(names = "--file", validateWith = FileValidator.class, required = true,
-                    description = "The properties file containing setup information.")
-            private Path propertiesFile = Paths.get("");
+            @Parameter(names = {"-L", "--replace-new-line"}, description = "Char used for replacing new line in value")
+            protected String escapeNl;
         }
-
+        Args args = new Args();
         JCommander.newBuilder()
-                .addObject(new Args())
+                .addObject(args)
                 .build()
-                .parse("--file", "README.markdown");
+                .parse("-L", " ");
+        Assert.assertEquals(args.escapeNl, " ");
+    }
+
+    @Test(enabled = false)
+    public static void main(String[] args) {
+        new JCommanderTest().trimTest();
     }
 }