Forgot to merge the latest other features.

Some refactoring should be done

Author: pesse

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

@@ -2,9 +2,11 @@
 
 import com.zaxxer.hikari.HikariDataSource;
 import org.utplsql.api.EnvironmentVariableUtil;
+import org.utplsql.cli.datasource.TestedDataSourceProvider;
 
 import javax.sql.DataSource;
 import java.io.File;
+import java.sql.SQLException;
 
 /** Helper class to give you a ready-to-use datasource
  *
@@ -13,19 +15,20 @@
 public class DataSourceProvider {
 
     static {
-        String oracleHome = EnvironmentVariableUtil.getEnvValue("ORACLE_HOME");
-        if (oracleHome != null) {
+        String oracleHome = System.getenv("ORACLE_HOME");
+        if (oracleHome != null && System.getProperty("oracle.net.tns_admin") == null) {
             System.setProperty("oracle.net.tns_admin",
                     String.join(File.separator, oracleHome, "NETWORK", "ADMIN"));
         }
     }
 
-    public static DataSource getDataSource(ConnectionInfo info, int maxConnections ) {
+    public static DataSource getDataSource(ConnectionInfo info, int maxConnections ) throws SQLException {
 
         requireOjdbc();
 
-        HikariDataSource pds = new HikariDataSource();
-        pds.setJdbcUrl("jdbc:oracle:thin:" + info.getConnectionString());
+        ConnectionConfig config = new ConnectionConfig(info.getConnectionString());
+
+        HikariDataSource pds = new TestedDataSourceProvider(config).getDataSource();
         pds.setAutoCommit(false);
         pds.setMaximumPoolSize(maxConnections);
         return pds;

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

@@ -31,14 +31,15 @@ private ConnectionInfo getConnectionInfo() {
     @Override
     public int run() {
 
-        DataSource ds = DataSourceProvider.getDataSource(getConnectionInfo(), 1);
-        try (Connection con = ds.getConnection() ) {
+        try {
+            DataSource ds = DataSourceProvider.getDataSource(getConnectionInfo(), 1);
+            try (Connection con = ds.getConnection()) {
 
-            ReporterFactory reporterFactory = ReporterFactoryProvider.createReporterFactory(con);
+                ReporterFactory reporterFactory = ReporterFactoryProvider.createReporterFactory(con);
 
-            writeReporters(ReporterInspector.create(reporterFactory, con).getReporterInfos(), System.out);
-        }
-        catch ( Exception e ) {
+                writeReporters(ReporterInspector.create(reporterFactory, con).getReporterInfos(), System.out);
+            }
+        } catch (Exception e) {
             e.printStackTrace();
             return 1;
         }

src/main/java/org/utplsql/cli/datasource/DataSourceProvider.java renamed to src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java

@@ -10,25 +10,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class DataSourceProvider {
+public class TestedDataSourceProvider {
 
     interface ConnectStringPossibility {
         String getConnectString(ConnectionConfig config);
         String getMaskedConnectString(ConnectionConfig config);
     }
 
-    static {
-        String oracleHome = System.getenv("ORACLE_HOME");
-        if (oracleHome != null && System.getProperty("oracle.net.tns_admin") == null) {
-            System.setProperty("oracle.net.tns_admin",
-                    String.join(File.separator, oracleHome, "NETWORK", "ADMIN"));
-        }
-    }
 
     private final ConnectionConfig config;
     private List<ConnectStringPossibility> possibilities = new ArrayList<>();
 
-    public DataSourceProvider(ConnectionConfig config) {
+    public TestedDataSourceProvider(ConnectionConfig config) {
         this.config = config;
 
         possibilities.add(new ThickConnectStringPossibility());

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

@@ -1,7 +1,7 @@
 package org.utplsql.cli;
 
 import org.junit.jupiter.api.Test;
-import org.utplsql.cli.datasource.DataSourceProvider;
+import org.utplsql.cli.datasource.TestedDataSourceProvider;
 
 import javax.sql.DataSource;
 import java.io.IOException;
@@ -14,9 +14,9 @@ public class DataSourceProviderIT {
     @Test
     public void connectToDatabase() throws IOException, SQLException {
 
-        ConnectionConfig config = new ConnectionConfig(RunCommandTestHelper.getConnectionString());
+        ConnectionConfig config = new ConnectionConfig(TestHelper.getConnectionString());
 
-        DataSource dataSource = new DataSourceProvider(config).getDataSource();
+        DataSource dataSource = new TestedDataSourceProvider(config).getDataSource();
 
         assertNotNull(dataSource);
     }