Change VersionCommand to Picocli

Author: pesse

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

@@ -5,7 +5,10 @@
 @CommandLine.Command(
         name = "utplsql",
         description = "utPLSQL cli",
-        subcommands = { RunPicocliCommand.class })
+        subcommands = {
+                RunPicocliCommand.class,
+                VersionInfoCommand.class
+        })
 public class UtplsqlPicocliCommand {
 
 }

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

@@ -1,42 +1,30 @@
 package org.utplsql.cli;
 
 
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.Parameters;
 import org.utplsql.api.JavaApiVersionInfo;
 import org.utplsql.api.Version;
 import org.utplsql.api.db.DefaultDatabaseInformation;
 import org.utplsql.api.exception.UtPLSQLNotInstalledException;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Parameters;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
 
-@Parameters(separators = "=", commandDescription = "prints version information of cli, java-api and - if connection is given - database utPLSQL framework")
+@Command( name = "info", description = "prints version information of cli, java-api and - if connection is given - database utPLSQL framework")
 public class VersionInfoCommand implements ICommand {
 
-    @Parameter(
-            converter = ConnectionInfo.ConnectionStringConverter.class,
-            variableArity = true,
-            description = ConnectionInfo.COMMANDLINE_PARAM_DESCRIPTION)
-    private List<ConnectionInfo> connectionInfoList = new ArrayList<>();
-
-    private ConnectionInfo getConnectionInfo() {
-        if ( connectionInfoList != null && connectionInfoList.size() > 0 )
-            return connectionInfoList.get(0);
-        else
-            return null;
-    }
+    @Parameters(description = ConnectionInfo.COMMANDLINE_PARAM_DESCRIPTION, arity = "0..1")
+    private String connectionString;
 
     public int run() {
 
         System.out.println(CliVersionInfo.getInfo());
         System.out.println(JavaApiVersionInfo.getInfo());
 
         try {
-            writeUtPlsqlVersion(getConnectionInfo());
+            writeUtPlsqlVersion(connectionString);
         }
         catch (SQLException e) {
             e.printStackTrace();
@@ -46,10 +34,10 @@ public int run() {
         return 0;
     }
 
-    private void writeUtPlsqlVersion( ConnectionInfo ci ) throws SQLException {
-        if ( ci != null ) {
+    private void writeUtPlsqlVersion( String connectString ) throws SQLException {
+        if ( connectString != null ) {
 
-            DataSource dataSource = DataSourceProvider.getDataSource(ci, 1);
+            DataSource dataSource = DataSourceProvider.getDataSource(connectString, 1);
 
             try (Connection con = dataSource.getConnection()) {
                 Version v = new DefaultDatabaseInformation().getUtPlsqlFrameworkVersion(con);