Merge branch 'develop' of https://github.com/utPLSQL/utPLSQL-cli into feature/version-check

Author: Samuel Nitsche

README.md

@@ -21,14 +21,11 @@ The latest CLI is always compatible with all database frameworks of the same maj
 For example CLI-3.0.4 is compatible with database framework 3.0.0-3.0.4 but not with database framework 2.x.
 
 ## Usage
-utplsql run user/pass@[[host][:port]/]db [-p=(ut_path|ut_paths)] [-f=format [-o=output_file] [-s] ...]
+utplsql run \<ConnectionURL\> [-p=(ut_path|ut_paths)] [-f=format [-o=output_file] [-s] ...]
 
 ```
-user                - Username to connect as.
-password            - Password of the user.
-host                - Server address, defaults to 127.0.0.1.
-port                - Server port, defaults to 1521.
-db                  - Database to connect to.
+<ConnectionURL>     - <user>/<password>@//<host>[:<port>]/<service> OR <user>/<password>@<TNSName> OR <user>/<password>@<host>:<port>:<SID>
+                          To connect using TNS, you need to have the ORACLE_HOME environment variable set.
 -p=suite_path(s)    - A suite path or a comma separated list of suite paths for unit test to be executed.     
                       The path(s) can be in one of the following formats:
                           schema[.package[.procedure]]

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

@@ -1,138 +1,45 @@
 package org.utplsql.cli;
 
-import com.beust.jcommander.ParameterException;
+import com.beust.jcommander.IStringConverter;
+import oracle.ucp.jdbc.PoolDataSource;
+import oracle.ucp.jdbc.PoolDataSourceFactory;
 
+import java.io.File;
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.SQLException;
 
-/**
- * Created by Vinicius on 21/04/2017.
- */
 public class ConnectionInfo {
 
-    private static final String DEFAULT_HOST = "127.0.0.1";
-    private static final int DEFAULT_PORT = 1521;
-
-    private String user;
-    private String password;
-    private String host;
-    private int port;
-    private String database;
-
-    public ConnectionInfo() {}
-
-    public Connection getConnection() throws SQLException {
-        return DriverManager.getConnection(getConnectionUrl(), getUser(), getPassword());
-    }
-
-    public ConnectionInfo parseConnectionString(String connectionString)
-            throws ParameterException, IllegalArgumentException {
-
-        if (connectionString == null || connectionString.isEmpty())
-            throw invalidConnectionString();
-
-        int i = connectionString.lastIndexOf("@");
-        if (i == -1)
-            throw invalidConnectionString();
-
-        String credentials = connectionString.substring(0, i);
-        String host = connectionString.substring(i+1);
-        parseCredentials(credentials);
-        parseHost(host);
-
-        return this;
-    }
-
-    private void parseCredentials(String str) throws ParameterException, IllegalArgumentException {
-        int barIdx = str.indexOf("/");
-
-        if (barIdx == -1 || barIdx == 0 || barIdx == str.length() - 1)
-            throw invalidConnectionString();
-
-        this.setUser(str.substring(0, barIdx));
-        this.setPassword(str.substring(barIdx+1));
-    }
-
-    private void parseHost(String str) throws ParameterException, IllegalArgumentException {
-        if (str == null || str.isEmpty())
-            throw invalidConnectionString();
-
-        int colonIdx = str.indexOf(":");
-        int barIdx = str.indexOf("/");
-
-        if ((colonIdx != -1 && barIdx == -1) || barIdx == 0) // @host:port or // @/db
-            throw invalidConnectionString();
-
-        if (colonIdx != -1) { // @host:port/db
-            setHost(str.substring(0, colonIdx));
-            setPort(Integer.parseInt(str.substring(colonIdx + 1, barIdx)));
-            setDatabase(str.substring(barIdx + 1));
-        }
-        else
-        if (barIdx != -1) { // @host/db
-            setHost(str.substring(0, barIdx));
-            setPort(DEFAULT_PORT);
-            setDatabase(str.substring(barIdx + 1));
-        }
-        else { // @db
-            setHost(DEFAULT_HOST);
-            setPort(DEFAULT_PORT);
-            setDatabase(str);
+    static {
+        String oracleHome = System.getenv("ORACLE_HOME");
+        if (oracleHome != null) {
+            System.setProperty("oracle.net.tns_admin",
+                    String.join(File.separator, oracleHome, "NETWORK", "ADMIN"));
         }
     }
 
-    private ParameterException invalidConnectionString() {
-        return new ParameterException("Invalid connection string.");
-    }
-
-    public String getUser() {
-        return user;
-    }
-
-    private void setUser(String user) {
-        this.user = user;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    private void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getHost() {
-        return host;
-    }
+    private PoolDataSource pds = PoolDataSourceFactory.getPoolDataSource();
 
-    private void setHost(String host) {
-        this.host = host;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    private void setPort(int port) {
-        this.port = port;
-    }
-
-    public String getDatabase() {
-        return database;
+    public ConnectionInfo(String connectionInfo) {
+        try {
+            this.pds.setConnectionFactoryClassName("oracle.jdbc.pool.OracleDataSource");
+            this.pds.setURL("jdbc:oracle:thin:" + connectionInfo);
+            this.pds.setInitialPoolSize(2);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
     }
 
-    private void setDatabase(String database) {
-        this.database = database;
+    public Connection getConnection() throws SQLException {
+        return pds.getConnection();
     }
 
-    public String getConnectionUrl() {
-        return String.format("jdbc:oracle:thin:@//%s:%d/%s", getHost(), getPort(), getDatabase());
-    }
+    public static class ConnectionStringConverter implements IStringConverter<ConnectionInfo> {
 
-    @Override
-    public String toString() {
-        return String.format("%s@%s:%d/%s", getUser(), getHost(), getPort(), getDatabase());
+        @Override
+        public ConnectionInfo convert(String s) {
+            return new ConnectionInfo(s);
+        }
     }
 
 }

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

@@ -30,9 +30,10 @@
 public class RunCommand {
 
     @Parameter(
-            required = true, converter = ConnectionStringConverter.class,
+            required = true,
+            converter = ConnectionInfo.ConnectionStringConverter.class,
             arity = 1,
-            description = "user/pass@[[host][:port]/]db")
+            description = "<user>/<password>@//<host>[:<port>]/<service> OR <user>/<password>@<TNSName> OR <user>/<password>@<host>:<port>:<SID>")
     private List<ConnectionInfo> connectionInfoList = new ArrayList<>();
 
     @Parameter(
@@ -115,8 +116,6 @@ public int run() throws Exception {
             testMappingOptions[0] = getMapperOptions(this.testPathParams, testFiles);
         }
 
-        if (testPaths.isEmpty()) testPaths.add(ci.getUser());
-
         // Do the reporters initialization, so we can use the id to run and gather results.
         try (Connection conn = ci.getConnection()) {
             for (ReporterOptions ro : reporterOptionsList) {