Remove a lot of escaping logic that's never used

Author: elharo

src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java

@@ -34,11 +34,6 @@ public class BourneShell extends Shell {
     public BourneShell() {
         setUnconditionalQuoting(true);
         setShellCommand("/bin/sh");
-        setArgumentQuoteDelimiter('\'');
-        setExecutableQuoteDelimiter('\'');
-        setSingleQuotedArgumentEscaped(true);
-        setSingleQuotedExecutableEscaped(false);
-        setQuotedExecutableEnabled(true);
     }
 
     /**

src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java

@@ -32,7 +32,6 @@ public class CmdShell extends Shell {
      */
     public CmdShell() {
         setShellCommand("cmd.exe");
-        setQuotedExecutableEnabled(true);
         setShellArgs(new String[] {"/X", "/C"});
     }
 

src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java

@@ -51,15 +51,7 @@ public class Shell {
 
     private String workingDir;
 
-    private boolean quotedExecutableEnabled = true;
-
-    private boolean singleQuotedArgumentEscaped = false;
-
-    private boolean singleQuotedExecutableEscaped = false;
-
-    private char argQuoteDelimiter = '\"';
-
-    private char exeQuoteDelimiter = '\"';
+    private final boolean singleQuotedArgumentEscaped = false;
 
     /**
      * Set the command to execute the shell (e.g. COMMAND.COM, /bin/bash,...).
@@ -104,10 +96,10 @@ String[] getShellArgs() {
     }
 
     protected String quoteOneItem(String inputString, boolean isExecutable) {
-        char[] escapeChars = getEscapeChars(isSingleQuotedExecutableEscaped(), isDoubleQuotedExecutableEscaped());
+        char[] escapeChars = {};
         return StringUtils.quoteAndEscape(
                 inputString,
-                isExecutable ? getExecutableQuoteDelimiter() : getArgumentQuoteDelimiter(),
+                isExecutable ? '\"' : '\"',
                 escapeChars,
                 getQuotingTriggerChars(),
                 '\\',
@@ -171,22 +163,6 @@ String getExecutionPreamble() {
         return null;
     }
 
-    char[] getEscapeChars(boolean includeSingleQuote, boolean includeDoubleQuote) {
-        StringBuilder buf = new StringBuilder(2);
-        if (includeSingleQuote) {
-            buf.append('\'');
-        }
-
-        if (includeDoubleQuote) {
-            buf.append('\"');
-        }
-
-        char[] result = new char[buf.length()];
-        buf.getChars(0, buf.length(), result, 0);
-
-        return result;
-    }
-
     /**
      * @return false in all cases
      */
@@ -201,36 +177,6 @@ protected boolean isSingleQuotedArgumentEscaped() {
         return singleQuotedArgumentEscaped;
     }
 
-    boolean isDoubleQuotedExecutableEscaped() {
-        return false;
-    }
-
-    boolean isSingleQuotedExecutableEscaped() {
-        return singleQuotedExecutableEscaped;
-    }
-
-    /**
-     * @param argQuoteDelimiterParameter {@link #argQuoteDelimiter}
-     */
-    void setArgumentQuoteDelimiter(char argQuoteDelimiterParameter) {
-        this.argQuoteDelimiter = argQuoteDelimiterParameter;
-    }
-
-    char getArgumentQuoteDelimiter() {
-        return argQuoteDelimiter;
-    }
-
-    /**
-     * @param exeQuoteDelimiterParameter {@link #exeQuoteDelimiter}
-     */
-    void setExecutableQuoteDelimiter(char exeQuoteDelimiterParameter) {
-        this.exeQuoteDelimiter = exeQuoteDelimiterParameter;
-    }
-
-    char getExecutableQuoteDelimiter() {
-        return exeQuoteDelimiter;
-    }
-
     /**
      * Get the full command line to execute, including shell command, shell arguments,
      * executable and executable arguments.
@@ -271,12 +217,8 @@ boolean isQuotedArgumentsEnabled() {
         return quotedArgumentsEnabled;
     }
 
-    void setQuotedExecutableEnabled(boolean quotedExecutableEnabled) {
-        this.quotedExecutableEnabled = quotedExecutableEnabled;
-    }
-
     boolean isQuotedExecutableEnabled() {
-        return quotedExecutableEnabled;
+        return true;
     }
 
     /**
@@ -331,14 +273,6 @@ String getWorkingDirectoryAsString() {
         return workingDir;
     }
 
-    void setSingleQuotedArgumentEscaped(boolean singleQuotedArgumentEscaped) {
-        this.singleQuotedArgumentEscaped = singleQuotedArgumentEscaped;
-    }
-
-    void setSingleQuotedExecutableEscaped(boolean singleQuotedExecutableEscaped) {
-        this.singleQuotedExecutableEscaped = singleQuotedExecutableEscaped;
-    }
-
     public boolean isUnconditionalQuoting() {
         return unconditionalQuoting;
     }