Change ReportersCommand to Picocli

Author: pesse

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

@@ -1,43 +1,29 @@
 package org.utplsql.cli;
 
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.Parameters;
 import org.utplsql.api.exception.DatabaseNotCompatibleException;
 import org.utplsql.api.exception.UtPLSQLNotInstalledException;
 import org.utplsql.api.reporter.ReporterFactory;
 import org.utplsql.api.reporter.inspect.ReporterInfo;
 import org.utplsql.api.reporter.inspect.ReporterInspector;
 import org.utplsql.cli.exception.DatabaseConnectionFailed;
+import picocli.CommandLine.*;
 
 import javax.sql.DataSource;
 import java.io.PrintStream;
 import java.sql.Connection;
 import java.util.*;
 
-@Parameters(separators = "=", commandDescription = "prints a list of reporters available in the specified database")
+@Command( name = "reporters", description = "prints a list of reporters available in the specified database")
 public class ReportersCommand implements ICommand {
 
-    @Parameter(
-            converter = ConnectionInfo.ConnectionStringConverter.class,
-            arity = 1,
-            description = ConnectionInfo.COMMANDLINE_PARAM_DESCRIPTION)
-    private List<ConnectionInfo> connectionInfoList = new ArrayList<>();
-
-    private ConnectionInfo getConnectionInfo() {
-        Objects.requireNonNull(connectionInfoList);
-
-        if ( connectionInfoList.size() <=  0
-                || connectionInfoList.get(0) == null)
-            throw new IllegalArgumentException("No Connection-Info given");
-
-        return connectionInfoList.get(0);
-    }
+    @Parameters(description = ConnectionInfo.COMMANDLINE_PARAM_DESCRIPTION, arity = "1")
+    private String connectionString;
 
     @Override
     public int run() {
 
         try {
-            DataSource ds = DataSourceProvider.getDataSource(getConnectionInfo(), 1);
+            DataSource ds = DataSourceProvider.getDataSource(connectionString, 1);
             try (Connection con = ds.getConnection()) {
 
                 ReporterFactory reporterFactory = ReporterFactoryProvider.createReporterFactory(con);

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

@@ -7,7 +7,8 @@
         description = "utPLSQL cli",
         subcommands = {
                 RunPicocliCommand.class,
-                VersionInfoCommand.class
+                VersionInfoCommand.class,
+                ReportersCommand.class
         })
 public class UtplsqlPicocliCommand {