Fix the handling of complex command line arguments

mcartoixa · Feb 17, 2021 · 4a91d69 · 4a91d69
1 parent 75cdcfe
commit 4a91d69
Show file tree

Hide file tree

Showing 32 changed files with 144 additions and 221 deletions.
diff --git a/src/main/com/mcartoixa/ant/sfdx/force/apex/ExecuteTask.java b/src/main/com/mcartoixa/ant/sfdx/force/apex/ExecuteTask.java
@@ -90,9 +90,8 @@ public void setApexCodeFile(final File apexCodeFile) {
 
     public void setTargetUserName(final String userName) {
         if (userName != null && !userName.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-u");
-            arg.setValue(userName);
+            getCommandline().createArgument().setValue("-u");
+            getCommandline().createArgument().setValue(userName);
         }
     }
 

diff --git a/src/main/com/mcartoixa/ant/sfdx/force/apex/test/RunTask.java b/src/main/com/mcartoixa/ant/sfdx/force/apex/test/RunTask.java
@@ -187,9 +187,8 @@ public void setSynchronous(final boolean synchronous) {
 
     public void setTargetUserName(final String userName) {
         if (userName != null && !userName.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-u");
-            arg.setValue(userName);
+            getCommandline().createArgument().setValue("-u");
+            getCommandline().createArgument().setValue(userName);
         }
     }
 
@@ -203,9 +202,8 @@ public void setToDir(final File toDir) {
         if (toDir != null) {
             this.toDir = !toDir.exists() || toDir.isDirectory() ? toDir : toDir.getParentFile();
 
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-d");
-            arg.setValue(toDir.getAbsolutePath());
+            getCommandline().createArgument().setValue("-d");
+            getCommandline().createArgument().setValue(toDir.getAbsolutePath());
         }
     }
 
@@ -248,17 +246,14 @@ protected void prepareContext() {
     @Override
     protected void createArguments() {
         if (!classes.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-n");
-            arg.setValue(String.join(",", classes));
+            getCommandline().createArgument().setValue("-n");
+            getCommandline().createArgument().setValue(String.join(",", classes));
         } else if (!suites.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-s");
-            arg.setValue(String.join(",", suites));
+            getCommandline().createArgument().setValue("-s");
+            getCommandline().createArgument().setValue(String.join(",", suites));
         } else if (!tests.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-t");
-            arg.setValue(String.join(",", tests));
+            getCommandline().createArgument().setValue("-n");
+            getCommandline().createArgument().setValue(String.join(",", tests));
         }
 
         getCommandline().createArgument().setValue("-c");

diff --git a/src/main/com/mcartoixa/ant/sfdx/force/data/record/CreateTask.java b/src/main/com/mcartoixa/ant/sfdx/force/data/record/CreateTask.java
@@ -93,9 +93,8 @@ public void setSObjectType(final String sObjectType) {
 
     public void setTargetUserName(final String userName) {
         if (userName != null && !userName.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-u");
-            arg.setValue(userName);
+            getCommandline().createArgument().setValue("-u");
+            getCommandline().createArgument().setValue(userName);
         }
     }
 
@@ -119,8 +118,7 @@ protected void createArguments() {
                 record.append(f.getValue());
                 record.append("'");
             });
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setLine("-v \"" + record + "\"");
+            getCommandline().createArgument().setLine("-v \"" + record + "\"");
         }
 
         super.createArguments();

diff --git a/src/main/com/mcartoixa/ant/sfdx/force/data/tree/ImportTask.java b/src/main/com/mcartoixa/ant/sfdx/force/data/tree/ImportTask.java
@@ -26,7 +26,6 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.FileList;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Resource;
@@ -147,17 +146,15 @@ public void addFilelist(final FileList list) {
 
     public void setPlan(final File plan) {
         if (plan != null) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-p");
-            arg.setValue(plan.getPath());
+            getCommandline().createArgument().setValue("-p");
+            getCommandline().createArgument().setValue(plan.getPath());
         }
     }
 
     public void setTargetUserName(final String userName) {
         if (userName != null && !userName.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-u");
-            arg.setValue(userName);
+            getCommandline().createArgument().setValue("-u");
+            getCommandline().createArgument().setValue(userName);
         }
     }
 
@@ -201,9 +198,8 @@ protected void createArguments() {
             }
         }
         if (sobjecttreefiles.length() > 0) {
-            final Commandline.Argument arg = this.getCommandline().createArgument();
-            arg.setPrefix("-f");
-            arg.setValue(sobjecttreefiles.toString());
+            getCommandline().createArgument().setValue("-f");
+            getCommandline().createArgument().setValue(sobjecttreefiles.toString());
         }
 
         super.createArguments();

diff --git a/src/main/com/mcartoixa/ant/sfdx/force/limits/api/DisplayTask.java b/src/main/com/mcartoixa/ant/sfdx/force/limits/api/DisplayTask.java
@@ -18,7 +18,6 @@
 import com.mcartoixa.ant.sfdx.ISfdxJsonParser;
 import com.mcartoixa.ant.sfdx.SfdxTask;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Commandline;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -76,9 +75,8 @@ protected String getCommand() {
 
     public void setTargetUserName(final String userName) {
         if (userName != null && !userName.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-u");
-            arg.setValue(userName);
+            getCommandline().createArgument().setValue("-u");
+            getCommandline().createArgument().setValue(userName);
         }
     }
 

diff --git a/src/main/com/mcartoixa/ant/sfdx/force/mdapi/DescribeMetadataTask.java b/src/main/com/mcartoixa/ant/sfdx/force/mdapi/DescribeMetadataTask.java
@@ -19,7 +19,6 @@
 import com.mcartoixa.ant.sfdx.SfdxTask;
 import java.io.File;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Commandline;
 
 /**
  *
@@ -53,17 +52,15 @@ public DescribeMetadataTask() {
 
     public void setResultFile(final File resultFile) {
         if (resultFile != null) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-f");
-            arg.setValue(resultFile.getPath());
+            getCommandline().createArgument().setValue("-f");
+            getCommandline().createArgument().setValue(resultFile.getPath());
         }
     }
 
     public void setTargetUserName(final String userName) {
         if (userName != null && !userName.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-u");
-            arg.setValue(userName);
+            getCommandline().createArgument().setValue("-u");
+            getCommandline().createArgument().setValue(userName);
         }
     }
 

diff --git a/src/main/com/mcartoixa/ant/sfdx/force/mdapi/RetrieveTask.java b/src/main/com/mcartoixa/ant/sfdx/force/mdapi/RetrieveTask.java
@@ -67,42 +67,37 @@ public void setRetrieveTargetDir(final File retrieveTargetDir) {
         if (retrieveTargetDir != null) {
             final File dir = !retrieveTargetDir.exists() || retrieveTargetDir.isDirectory() ? retrieveTargetDir : retrieveTargetDir.getParentFile();
 
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-r");
-            arg.setValue(dir.getAbsolutePath());
+            getCommandline().createArgument().setValue("-r");
+            getCommandline().createArgument().setValue(dir.getAbsolutePath());
         }
     }
 
     public void setSinglePackage(final boolean singlePackage) {
         if (singlePackage) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setValue("-s");
+            getCommandline().createArgument().setValue("-s");
         }
     }
 
     public void setSourceDir(final File sourceDir) {
         if (sourceDir != null) {
             final File dir = !sourceDir.exists() || sourceDir.isDirectory() ? sourceDir : sourceDir.getParentFile();
 
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-d");
-            arg.setValue(dir.getAbsolutePath());
+            getCommandline().createArgument().setValue("-d");
+            getCommandline().createArgument().setValue(dir.getAbsolutePath());
         }
     }
 
     public void setTargetUserName(final String userName) {
         if (userName != null && !userName.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-u");
-            arg.setValue(userName);
+            getCommandline().createArgument().setValue("-u");
+            getCommandline().createArgument().setValue(userName);
         }
     }
 
     public void setUnpackaged(final File unpackaged) {
         if (unpackaged != null) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-k");
-            arg.setValue(unpackaged.getAbsolutePath());
+            getCommandline().createArgument().setValue("-k");
+            getCommandline().createArgument().setValue(unpackaged.getAbsolutePath());
         }
     }
 
@@ -116,9 +111,8 @@ public void setWait(final int wait) {
     @Override
     protected void createArguments() {
         if (!packages.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-p");
-            arg.setValue(String.join(",", packages));
+            getCommandline().createArgument().setValue("-p");
+            getCommandline().createArgument().setValue(String.join(",", packages));
         }
 
         super.createArguments();

diff --git a/src/main/com/mcartoixa/ant/sfdx/force/org/CreateTask.java b/src/main/com/mcartoixa/ant/sfdx/force/org/CreateTask.java
@@ -69,32 +69,28 @@ public Property createParam() {
 
     public void setAlias(final String alias) {
         if (alias != null && !alias.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-a");
-            arg.setValue(alias);
+            getCommandline().createArgument().setValue("-a");
+            getCommandline().createArgument().setValue(alias);
         }
     }
 
     public void setClientId(final String clientId) {
         if (clientId != null && !clientId.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-i");
-            arg.setValue(clientId);
+            getCommandline().createArgument().setValue("-i");
+            getCommandline().createArgument().setValue(clientId);
         }
     }
 
     public void setDefaultUserName(final boolean isDefaultUserName) {
         if (isDefaultUserName) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setValue("-s");
+            getCommandline().createArgument().setValue("-s");
         }
     }
 
     public void setDefinitionFile(final File definitionFile) {
         if (definitionFile != null) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-f");
-            arg.setFile(definitionFile);
+            getCommandline().createArgument().setValue("-f");
+            getCommandline().createArgument().setFile(definitionFile);
         }
     }
 
@@ -108,23 +104,20 @@ public void setDurationDays(final int days) {
 
     public void setNoAncestors(final boolean noAncestors) {
         if (noAncestors) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setValue("-c");
+            getCommandline().createArgument().setValue("-c");
         }
     }
 
     public void setNoNamespace(final boolean noNamespace) {
         if (noNamespace) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setValue("-n");
+            getCommandline().createArgument().setValue("-n");
         }
     }
 
     public void setTargetDevHubUserName(final String devHubUserName) {
         if (devHubUserName != null && !devHubUserName.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-v");
-            arg.setValue(devHubUserName);
+            getCommandline().createArgument().setValue("-v");
+            getCommandline().createArgument().setValue(devHubUserName);
         }
     }
 

diff --git a/src/main/com/mcartoixa/ant/sfdx/force/org/DeleteTask.java b/src/main/com/mcartoixa/ant/sfdx/force/org/DeleteTask.java
@@ -18,7 +18,6 @@
 import com.mcartoixa.ant.sfdx.ISfdxJsonParser;
 import com.mcartoixa.ant.sfdx.SfdxTask;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Commandline;
 
 /**
  *
@@ -59,17 +58,15 @@ protected String getCommand() {
 
     public void setTargetUserName(final String userName) {
         if (userName != null && !userName.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-u");
-            arg.setValue(userName);
+            getCommandline().createArgument().setValue("-u");
+            getCommandline().createArgument().setValue(userName);
         }
     }
 
     public void setTargetDevHubUserName(final String devHubUserName) {
         if (devHubUserName != null && !devHubUserName.isEmpty()) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setPrefix("-v");
-            arg.setValue(devHubUserName);
+            getCommandline().createArgument().setValue("-v");
+            getCommandline().createArgument().setValue(devHubUserName);
         }
     }
 

diff --git a/src/main/com/mcartoixa/ant/sfdx/force/org/DisplayTask.java b/src/main/com/mcartoixa/ant/sfdx/force/org/DisplayTask.java
@@ -18,7 +18,6 @@
 import com.mcartoixa.ant.sfdx.ISfdxJsonParser;
 import com.mcartoixa.ant.sfdx.SfdxTask;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Commandline.Argument;
 
 /**
  *
@@ -68,9 +67,8 @@ protected String getCommand() {
 
     public void setTargetUserName(final String userName) {
         if (userName != null && !userName.isEmpty()) {
-            final Argument arg = this.getCommandline().createArgument();
-            arg.setPrefix("-u");
-            arg.setValue(userName);
+            getCommandline().createArgument().setValue("-u");
+            getCommandline().createArgument().setValue(userName);
         }
     }
 

diff --git a/src/main/com/mcartoixa/ant/sfdx/force/org/ListTask.java b/src/main/com/mcartoixa/ant/sfdx/force/org/ListTask.java
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Commandline;
 import org.json.JSONObject;
 
 /**
@@ -137,15 +136,13 @@ protected String getCommand() {
 
     public void setAll(final boolean all) {
         if (all) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setValue("--all");
+            getCommandline().createArgument().setValue("--all");
         }
     }
 
     public void setClean(final boolean clean) {
         if (clean) {
-            final Commandline.Argument arg = getCommandline().createArgument();
-            arg.setValue("--clean");
+            getCommandline().createArgument().setValue("--clean");
         }
     }