File tree Expand file tree Collapse file tree 4 files changed +1
-31
lines changed
main/java/org/utplsql/cli
test/java/org/utplsql/cli Expand file tree Collapse file tree 4 files changed +1
-31
lines changed Original file line number Diff line number Diff line change 3939 </exclusion >
4040 </exclusions >
4141 </dependency >
42- <dependency >
43- <groupId >com.beust</groupId >
44- <artifactId >jcommander</artifactId >
45- <version >1.72</version >
46- <scope >compile</scope >
47- </dependency >
4842 <dependency >
4943 <groupId >com.zaxxer</groupId >
5044 <artifactId >HikariCP</artifactId >
Original file line number Diff line number Diff line change 11package org .utplsql .cli ;
22
3- import com .beust .jcommander .IStringConverter ;
4-
53public class ConnectionInfo {
64
75 public static final String COMMANDLINE_PARAM_DESCRIPTION = "<user>/<password>@//<host>[:<port>]/<service> OR <user>/<password>@<TNSName> OR <user>/<password>@<host>:<port>:<SID>" ;
8- private final String connectionInfo ;
9-
10- public ConnectionInfo (String connectionInfo ) {
11- this .connectionInfo = connectionInfo ;
12- }
13-
14- public String getConnectionString () {
15- return connectionInfo ;
16- }
17-
18- public static class ConnectionStringConverter implements IStringConverter <ConnectionInfo > {
19-
20- @ Override
21- public ConnectionInfo convert (String s ) {
22- return new ConnectionInfo (s );
23- }
24- }
256}
Original file line number Diff line number Diff line change 11package org .utplsql .cli ;
22
3- import com .zaxxer .hikari .HikariDataSource ;
43import org .utplsql .cli .datasource .TestedDataSourceProvider ;
54
65import javax .sql .DataSource ;
@@ -21,10 +20,6 @@ public class DataSourceProvider {
2120 }
2221 }
2322
24- public static DataSource getDataSource (ConnectionInfo info , int maxConnections ) throws SQLException {
25- return getDataSource (info .getConnectionString (), maxConnections );
26- }
27-
2823 public static DataSource getDataSource (String connectString , int maxConnections ) throws SQLException {
2924
3025 requireOjdbc ();
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ static int runApp(String... args) {
6262 }
6363
6464 static Version getFrameworkVersion () throws SQLException {
65- DataSource ds = DataSourceProvider .getDataSource (new ConnectionInfo ( TestHelper .getConnectionString () ), 1 );
65+ DataSource ds = DataSourceProvider .getDataSource (TestHelper .getConnectionString (), 1 );
6666 try (Connection con = ds .getConnection () ) {
6767 return DBHelper .getDatabaseFrameworkVersion (con );
6868 }
You can’t perform that action at this time.
0 commit comments