Repository: commons-dbcp Updated Branches: refs/heads/master 6b5437590 -> 258371be0
Use final. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/258371be Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/258371be Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/258371be Branch: refs/heads/master Commit: 258371be0c31e424ad2392313f15fd126830996c Parents: 6b54375 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Thu Aug 16 18:07:39 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Thu Aug 16 18:07:39 2018 -0600 ---------------------------------------------------------------------- .../org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 2 +- .../apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 +- .../apache/commons/dbcp2/datasources/CPDSConnectionFactory.java | 2 +- .../apache/commons/dbcp2/datasources/InstanceKeyDataSource.java | 4 ++-- .../apache/commons/dbcp2/datasources/SharedPoolDataSource.java | 2 +- .../org/apache/commons/dbcp2/managed/TransactionContext.java | 2 +- .../apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java | 2 +- .../commons/dbcp2/datasources/TestCPDSConnectionFactory.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/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 61f0fda..81c6292 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java @@ -741,7 +741,7 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl */ @Override public synchronized String toString() { - StringBuilder builder = new StringBuilder(super.toString()); + final StringBuilder builder = new StringBuilder(super.toString()); builder.append("[description="); builder.append(description); builder.append(", url="); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java index 5b47add..4849e2e 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java @@ -653,7 +653,7 @@ class PooledConnectionImpl */ @Override public synchronized String toString() { - StringBuilder builder = new StringBuilder(super.toString()); + final StringBuilder builder = new StringBuilder(super.toString()); builder.append("[connection="); builder.append(connection); builder.append(", delegatingConnection="); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/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 76bafc2..c71d1de 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java @@ -403,7 +403,7 @@ class CPDSConnectionFactory */ @Override public synchronized String toString() { - StringBuilder builder = new StringBuilder(super.toString()); + final StringBuilder builder = new StringBuilder(super.toString()); builder.append("[cpds="); builder.append(cpds); builder.append(", validationQuery="); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java index ccd2be3..1b070cc 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java @@ -1059,14 +1059,14 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable */ @Override public synchronized String toString() { - StringBuilder builder = new StringBuilder(super.toString()); + final StringBuilder builder = new StringBuilder(super.toString()); builder.append("["); toStringFields(builder); builder.append("]"); return builder.toString(); } - protected void toStringFields(StringBuilder builder) { + protected void toStringFields(final StringBuilder builder) { builder.append("getConnectionCalled="); builder.append(getConnectionCalled); builder.append(", dataSource="); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java index 76c2617..fd1b1ec 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java @@ -237,7 +237,7 @@ public class SharedPoolDataSource extends InstanceKeyDataSource { } @Override - protected void toStringFields(StringBuilder builder) { + protected void toStringFields(final StringBuilder builder) { super.toStringFields(builder); builder.append(", maxTotal="); builder.append(maxTotal); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java index 01a745b..f291e1f 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java @@ -131,7 +131,7 @@ public class TransactionContext { public void addTransactionContextListener(final TransactionContextListener listener) throws SQLException { try { if (!isActive()) { - Transaction transaction = this.transactionRef.get(); + final Transaction transaction = this.transactionRef.get(); listener.afterCompletion(TransactionContext.this, transaction == null ? false : transaction.getStatus() == Status.STATUS_COMMITTED); return; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java b/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java index 7bae26e..8745b28 100644 --- a/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java +++ b/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java @@ -209,7 +209,7 @@ public class TestDriverAdapterCPDS { @Test public void testSetPasswordThenModCharArray() { - char[] pwd = {'a' }; + final char[] pwd = {'a' }; pcds.setPassword(pwd); assertEquals("a", pcds.getPassword()); pwd[0] = 'b'; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/258371be/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java index 86c0dfe..8dcf310 100644 --- a/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java +++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java @@ -146,7 +146,7 @@ public class TestCPDSConnectionFactory { @Test public void testSetPasswordThenModCharArray() { final CPDSConnectionFactory factory = new CPDSConnectionFactory(cpds, null, -1, false, "userName", "password"); - char[] pwd = {'a' }; + final char[] pwd = {'a' }; factory.setPassword(pwd); assertEquals("a", String.valueOf(factory.getPasswordCharArray())); pwd[0] = 'b';
