New entry point for Picocli

Author: pesse

src/main/java/org/utplsql/cli/Cli.java

@@ -2,6 +2,9 @@
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.ParameterException;
+import picocli.CommandLine;
+
+import java.util.List;
 
 public class Cli {
 
@@ -50,5 +53,34 @@ static int runWithExitCode( String[] args ) {
 
         return exitCode;
     }
+    static int runPicocliWithExitCode( String[] args ) {
+
+        LoggerConfiguration.configure(LoggerConfiguration.ConfigLevel.NONE);
+        LocaleInitializer.initLocale();
+
+        CommandLine commandLine = new CommandLine(UtplsqlPicocliCommand.class);
+        commandLine.setTrimQuotes(true);
+
+        int exitCode = DEFAULT_ERROR_CODE;
+
+        try {
+
+            List<CommandLine> parsedLines = commandLine.parse(args);
+
+            for ( CommandLine parsedLine : parsedLines ) {
+                Object command = parsedLine.getCommand();
+                if ( command instanceof ICommand ) {
+                    exitCode = ((ICommand)command).run();
+                    break;
+                }
+            }
+        } catch (ParameterException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return exitCode;
+    }
 
 }

src/test/java/org/utplsql/cli/RunCommandIT.java

@@ -70,7 +70,7 @@ void run_withDbmsOutputEnabled() throws Exception {
 
         int result = TestHelper.runApp("run",
                 TestHelper.getConnectionString(),
-                "-dbout",
+                "-D",
                 "--failure-exit-code=2");
 
         assertValidReturnCode(result);

src/test/java/org/utplsql/cli/TestHelper.java

@@ -54,7 +54,7 @@ static RunAction createRunAction(String... args) throws Exception {
     }
 
     static int runApp(String... args) {
-        return Cli.runWithExitCode(args);
+        return Cli.runPicocliWithExitCode(args);
     }
 
     static Version getFrameworkVersion() throws SQLException {