Skip to content

Commit 6bb8b9e

Browse files
committed
Improve naming
1 parent 8d83261 commit 6bb8b9e

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.utplsql.cli.ConnectionConfig;
66
import org.utplsql.cli.exception.DatabaseConnectionFailed;
77

8-
import java.io.File;
98
import java.sql.Connection;
109
import java.sql.SQLException;
1110
import java.util.ArrayList;
@@ -20,7 +19,6 @@ interface ConnectStringPossibility {
2019
String getMaskedConnectString(ConnectionConfig config);
2120
}
2221

23-
2422
private final ConnectionConfig config;
2523
private List<ConnectStringPossibility> possibilities = new ArrayList<>();
2624

@@ -35,13 +33,13 @@ public HikariDataSource getDataSource() throws SQLException {
3533

3634
HikariDataSource ds = new HikariDataSource();
3735

38-
setInitSql(ds);
39-
testAndSetJdbcUrl(ds);
36+
setInitSqlFrom_NLS_LANG(ds);
37+
setThickOrThinJdbcUrl(ds);
4038

4139
return ds;
4240
}
4341

44-
private void testAndSetJdbcUrl( HikariDataSource ds ) throws SQLException
42+
private void setThickOrThinJdbcUrl(HikariDataSource ds ) throws SQLException
4543
{
4644
List<String> errors = new ArrayList<>();
4745
Throwable lastException = null;
@@ -59,7 +57,7 @@ private void testAndSetJdbcUrl( HikariDataSource ds ) throws SQLException
5957
throw new DatabaseConnectionFailed(lastException);
6058
}
6159

62-
private void setInitSql( HikariDataSource ds ) {
60+
private void setInitSqlFrom_NLS_LANG(HikariDataSource ds ) {
6361
String nls_lang = EnvironmentVariableUtil.getEnvValue("NLS_LANG");
6462

6563
if ( nls_lang != null ) {

0 commit comments

Comments
 (0)