Repository: commons-dbcp Updated Branches: refs/heads/master 749e5b391 -> 04e3fe1d2
[DBCP-519] Add some toString() methods for debugging (never printing passwords): Remove user names from toString() output per Phil's suugestion. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/04e3fe1d Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/04e3fe1d Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/04e3fe1d Branch: refs/heads/master Commit: 04e3fe1d2cfd176784f164413010d87a01f1e5c2 Parents: 749e5b3 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Thu Aug 16 15:03:25 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Thu Aug 16 15:03:25 2018 -0600 ---------------------------------------------------------------------- .../dbcp2/cpdsadapter/DriverAdapterCPDS.java | 6 +-- .../datasources/CPDSConnectionFactory.java | 2 - .../datasources/PerUserPoolDataSource.java | 41 -------------------- 3 files changed, 2 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/04e3fe1d/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java index 58aafcc..add181e 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java @@ -735,7 +735,7 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl } /** - * Does not print the userPassword field nor the password in the connectionProperties. + * Does not print the userName and userPassword field nor the 'user' or 'password' in the connectionProperties. * * @since 2.6.0 */ @@ -745,10 +745,8 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl builder.append("[description="); builder.append(description); builder.append(", url="); - // TODO What if the connection string contains a 'password' query parameter but that connection string is not in a legal URL format? + // TODO What if the connection string contains a 'user' or 'password' query parameter but that connection string is not in a legal URL format? builder.append(url); - builder.append(", userName="); - builder.append(userName); builder.append(", driver="); builder.append(driver); builder.append(", loginTimeout="); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/04e3fe1d/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java index ef6e5f7..a6253f0 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java @@ -411,8 +411,6 @@ class CPDSConnectionFactory builder.append(rollbackAfterValidation); builder.append(", pool="); builder.append(pool); - builder.append(", userName="); - builder.append(userName); builder.append(", maxConnLifetimeMillis="); builder.append(maxConnLifetimeMillis); builder.append(", validatingSet="); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/04e3fe1d/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java index 289617b..1087b37 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java @@ -1173,45 +1173,4 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { con.setReadOnly(defaultReadOnly.booleanValue()); } } - - @Override - protected void toStringFields(StringBuilder builder) { - super.toStringFields(builder); - builder.append(", perUserBlockWhenExhausted="); - builder.append(perUserBlockWhenExhausted); - builder.append(", perUserEvictionPolicyClassName="); - builder.append(perUserEvictionPolicyClassName); - builder.append(", perUserLifo="); - builder.append(perUserLifo); - builder.append(", perUserMaxIdle="); - builder.append(perUserMaxIdle); - builder.append(", perUserMaxTotal="); - builder.append(perUserMaxTotal); - builder.append(", perUserMaxWaitMillis="); - builder.append(perUserMaxWaitMillis); - builder.append(", perUserMinEvictableIdleTimeMillis="); - builder.append(perUserMinEvictableIdleTimeMillis); - builder.append(", perUserMinIdle="); - builder.append(perUserMinIdle); - builder.append(", perUserNumTestsPerEvictionRun="); - builder.append(perUserNumTestsPerEvictionRun); - builder.append(", perUserSoftMinEvictableIdleTimeMillis="); - builder.append(perUserSoftMinEvictableIdleTimeMillis); - builder.append(", perUserTestOnCreate="); - builder.append(perUserTestOnCreate); - builder.append(", perUserTestOnBorrow="); - builder.append(perUserTestOnBorrow); - builder.append(", perUserTestOnReturn="); - builder.append(perUserTestOnReturn); - builder.append(", perUserTestWhileIdle="); - builder.append(perUserTestWhileIdle); - builder.append(", perUserTimeBetweenEvictionRunsMillis="); - builder.append(perUserTimeBetweenEvictionRunsMillis); - builder.append(", perUserDefaultAutoCommit="); - builder.append(perUserDefaultAutoCommit); - builder.append(", perUserDefaultTransactionIsolation="); - builder.append(perUserDefaultTransactionIsolation); - builder.append(", perUserDefaultReadOnly="); - builder.append(perUserDefaultReadOnly); - } }
