You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/06/22 22:29:58 UTC
[maven-shared-utils] 02/02: [MSHARED-297] - Minor code cleanup
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
commit 6798f3033c3c5144e52c5aa8e1be584ea97527d2
Author: Rob Oxspring <ro...@imapmail.org>
AuthorDate: Thu May 28 23:50:09 2020 +0100
[MSHARED-297] - Minor code cleanup
---
.../maven/shared/utils/cli/shell/BourneShell.java | 13 ++-----------
.../apache/maven/shared/utils/cli/shell/Shell.java | 6 +++---
.../shared/utils/cli/CommandLineUtilsTest.java | 5 ++---
.../shared/utils/cli/shell/BourneShellTest.java | 22 +++++++---------------
4 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
index 3317788..e3af665 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
@@ -105,13 +105,8 @@ public class BourneShell
}
String dir = getWorkingDirectoryAsString();
- StringBuilder sb = new StringBuilder();
- sb.append( "cd " );
- sb.append( quoteOneItem( dir, false ) );
- sb.append( " && " );
-
- return sb.toString();
+ return "cd " + quoteOneItem( dir, false ) + " && ";
}
/**
@@ -138,10 +133,6 @@ public class BourneShell
return null;
}
- StringBuilder sb = new StringBuilder();
- sb.append( "'" );
- sb.append( path.replace( "'", "'\"'\"'" ) );
- sb.append( "'" );
- return sb.toString();
+ return "'" + path.replace( "'", "'\"'\"'" ) + "'";
}
}
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
index c1e5dd0..0268108 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
@@ -110,7 +110,7 @@ public class Shell
}
else
{
- return shellArgs.toArray( new String[shellArgs.size()] );
+ return shellArgs.toArray( new String[0] );
}
}
@@ -146,7 +146,7 @@ public class Shell
*/
List<String> getRawCommandLine( String executableParameter, String... argumentsParameter )
{
- List<String> commandLine = new ArrayList<String>();
+ List<String> commandLine = new ArrayList<>();
StringBuilder sb = new StringBuilder();
if ( executableParameter != null )
@@ -280,7 +280,7 @@ public class Shell
public List<String> getShellCommandLine( String... arguments )
{
- List<String> commandLine = new ArrayList<String>();
+ List<String> commandLine = new ArrayList<>();
if ( getShellCommand() != null )
{
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
index 50d9336..079d0d1 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
@@ -148,8 +148,8 @@ public class CommandLineUtilsTest
public void givenAnEscapedSingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped()
throws Exception
{
- final String command = "echo \"let\\\'s go\"";
- final String[] expected = new String[] { "echo", "let\\\'s go" };
+ final String command = "echo \"let\\'s go\"";
+ final String[] expected = new String[] { "echo", "let\\'s go"};
assertCmdLineArgs( expected, command );
}
@@ -168,5 +168,4 @@ public class CommandLineUtilsTest
assertEquals( expected.length, actual.length );
assertEquals( Arrays.asList( expected ), Arrays.asList( actual ) );
}
-
}
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
index 4fbcf84..199f36e 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
@@ -42,7 +42,7 @@ public class BourneShellTest
sh.setWorkingDirectory( "/usr/local/bin" );
sh.setExecutable( "chmod" );
- String executable = StringUtils.join( sh.getShellCommandLine( new String[]{} ).iterator(), " " );
+ String executable = StringUtils.join( sh.getShellCommandLine().iterator(), " " );
assertEquals( "/bin/sh -c cd '/usr/local/bin' && 'chmod'", executable );
}
@@ -54,7 +54,7 @@ public class BourneShellTest
sh.setWorkingDirectory( "/usr/local/'something else'" );
sh.setExecutable( "chmod" );
- String executable = StringUtils.join( sh.getShellCommandLine( new String[]{} ).iterator(), " " );
+ String executable = StringUtils.join( sh.getShellCommandLine().iterator(), " " );
assertEquals( "/bin/sh -c cd '/usr/local/'\"'\"'something else'\"'\"'' && 'chmod'", executable );
}
@@ -66,7 +66,7 @@ public class BourneShellTest
sh.setWorkingDirectory( "\\usr\\local\\'something else'" );
sh.setExecutable( "chmod" );
- String executable = StringUtils.join( sh.getShellCommandLine( new String[]{} ).iterator(), " " );
+ String executable = StringUtils.join( sh.getShellCommandLine().iterator(), " " );
assertEquals( "/bin/sh -c cd '\\usr\\local\\'\"'\"'something else'\"'\"'' && 'chmod'", executable );
}
@@ -78,9 +78,7 @@ public class BourneShellTest
sh.setWorkingDirectory( "/usr/bin" );
sh.setExecutable( "chmod" );
- final String[] args = { "\"some arg with spaces\"" };
-
- List<String> shellCommandLine = sh.getShellCommandLine( args );
+ List<String> shellCommandLine = sh.getShellCommandLine("\"some arg with spaces\"");
String cli = StringUtils.join( shellCommandLine.iterator(), " " );
System.out.println( cli );
@@ -94,9 +92,7 @@ public class BourneShellTest
sh.setWorkingDirectory( "/usr/bin" );
sh.setExecutable( "chmod" );
- String[] args = { "some arg with spaces" };
-
- List<String> shellCommandLine = sh.getShellCommandLine( args );
+ List<String> shellCommandLine = sh.getShellCommandLine("some arg with spaces");
String cli = StringUtils.join( shellCommandLine.iterator(), " " );
System.out.println( cli );
@@ -110,9 +106,7 @@ public class BourneShellTest
sh.setWorkingDirectory( "/usr/bin" );
sh.setExecutable( "chmod" );
- String[] args = { "arg'withquote" };
-
- List<String> shellCommandLine = sh.getShellCommandLine( args );
+ List<String> shellCommandLine = sh.getShellCommandLine("arg'withquote");
assertEquals("cd '/usr/bin' && 'chmod' 'arg'\"'\"'withquote'", shellCommandLine.get(shellCommandLine.size() - 1));
}
@@ -127,9 +121,7 @@ public class BourneShellTest
sh.setWorkingDirectory( "/usr/bin" );
sh.setExecutable( "chmod" );
- String[] args = { ";some&argwithunix$chars" };
-
- List<String> shellCommandLine = sh.getShellCommandLine( args );
+ List<String> shellCommandLine = sh.getShellCommandLine(";some&argwithunix$chars");
String cli = StringUtils.join( shellCommandLine.iterator(), " " );
System.out.println( cli );