Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Separate username/PW from connectstring so it's properly masked in lo…
…gging
  • Loading branch information
pesse committed Feb 14, 2019
commit 0733e11a7ced963d4097a3ca3e48ce8d41a26a87
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ private void setThickOrThinJdbcUrl(HikariDataSource ds ) throws SQLException
{
List<String> errors = new ArrayList<>();
Throwable lastException = null;

ds.setUsername(config.getUser());
ds.setPassword(config.getPassword());

for (ConnectStringPossibility possibility : possibilities) {
ds.setJdbcUrl(possibility.getConnectString(config));
try (Connection con = ds.getConnection()) {
Expand Down Expand Up @@ -92,7 +96,7 @@ private void setInitSqlFrom_NLS_LANG(HikariDataSource ds ) {
private static class ThickConnectStringPossibility implements ConnectStringPossibility {
@Override
public String getConnectString(ConnectionConfig config) {
return "jdbc:oracle:oci8:" + config.getConnectString();
return "jdbc:oracle:oci8:@" + config.getConnect();
}

@Override
Expand All @@ -104,7 +108,7 @@ public String getMaskedConnectString(ConnectionConfig config) {
private static class ThinConnectStringPossibility implements ConnectStringPossibility {
@Override
public String getConnectString(ConnectionConfig config) {
return "jdbc:oracle:thin:" + config.getConnectString();
return "jdbc:oracle:thin:@" + config.getConnect();
}

@Override
Expand Down