Repository: commons-dbcp Updated Branches: refs/heads/master 9773e41c0 -> 5d98623c3
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/5d98623c Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/5d98623c Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/5d98623c Branch: refs/heads/master Commit: 5d98623c312b7639c84f1d73e5bb3d4b8487fd8a Parents: 9773e41 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sun Jun 10 13:20:24 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sun Jun 10 13:20:24 2018 -0600 ---------------------------------------------------------------------- .../apache/commons/dbcp2/BasicDataSource.java | 2 +- .../dbcp2/DriverManagerConnectionFactory.java | 2 +- .../apache/commons/dbcp2/ObjectNameWrapper.java | 4 ++-- .../dbcp2/cpdsadapter/ConnectionImpl.java | 8 ++++---- .../dbcp2/cpdsadapter/PooledConnectionImpl.java | 18 +++++++++--------- .../datasources/PerUserPoolDataSource.java | 2 +- .../commons/dbcp2/datasources/UserPassKey.java | 4 ++-- .../dbcp2/managed/ManagedConnection.java | 2 +- .../managed/TestConnectionWithNarayana.java | 20 ++++++++++---------- 9 files changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5d98623c/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java index c1517e5..4b5a2a7 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -2386,7 +2386,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean } try { ObjectNameWrapper.wrap(requestedName).registerMBean(this); - } catch (MalformedObjectNameException e) { + } catch (final MalformedObjectNameException e) { log.warn("The requested JMX name [" + requestedName + "] was not valid and will be ignored."); } } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5d98623c/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java index 9efa0c6..c8d1106 100644 --- a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java @@ -89,7 +89,7 @@ public class DriverManagerConnectionFactory implements ConnectionFactory { return DriverManager.getConnection(connectionUri, propeties); } - private String connectionUri; + private final String connectionUri; private String userName; private String userPassword; private Properties propeties; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5d98623c/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java b/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java index a02d771..baf983d 100644 --- a/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java +++ b/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java @@ -47,7 +47,7 @@ class ObjectNameWrapper { } } - public static ObjectName unwrap(ObjectNameWrapper wrapper) { + public static ObjectName unwrap(final ObjectNameWrapper wrapper) { return wrapper == null ? null : wrapper.unwrap(); } @@ -65,7 +65,7 @@ class ObjectNameWrapper { this.objectName = objectName; } - public void registerMBean(Object object) { + public void registerMBean(final Object object) { if (MBEAN_SERVER == null || objectName == null) { return; } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5d98623c/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java index 9e731c1..0599755 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java @@ -96,7 +96,7 @@ class ConnectionImpl extends DelegatingConnection<Connection> { * @since 2.4.0 */ @Override - public CallableStatement prepareCall(String sql) throws SQLException { + public CallableStatement prepareCall(final String sql) throws SQLException { checkOpen(); try { return new DelegatingCallableStatement(this, pooledConnection.prepareCall(sql)); @@ -127,7 +127,7 @@ class ConnectionImpl extends DelegatingConnection<Connection> { * @since 2.4.0 */ @Override - public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException { + public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency) throws SQLException { checkOpen(); try { return new DelegatingCallableStatement(this, @@ -162,8 +162,8 @@ class ConnectionImpl extends DelegatingConnection<Connection> { * @since 2.4.0 */ @Override - public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, - int resultSetHoldability) throws SQLException { + public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency, + final int resultSetHoldability) throws SQLException { checkOpen(); try { return new DelegatingCallableStatement(this, http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5d98623c/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 59fee86..d3a6a3d 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java @@ -225,8 +225,8 @@ class PooledConnectionImpl * * @since 2.4.0 */ - protected PStmtKey createKey(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability, - StatementType statementType) { + protected PStmtKey createKey(final String sql, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability, + final StatementType statementType) { return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), resultSetType, resultSetConcurrency, resultSetHoldability, statementType); } @@ -235,8 +235,8 @@ class PooledConnectionImpl * * @since 2.4.0 */ - protected PStmtKey createKey(String sql, int resultSetType, int resultSetConcurrency, - StatementType statementType) { + protected PStmtKey createKey(final String sql, final int resultSetType, final int resultSetConcurrency, + final StatementType statementType) { return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), resultSetType, resultSetConcurrency, statementType); } @@ -292,7 +292,7 @@ class PooledConnectionImpl private String getCatalogOrNull() { try { return connection == null ? null : connection.getCatalog(); - } catch (SQLException e) { + } catch (final SQLException e) { return null; } } @@ -401,7 +401,7 @@ class PooledConnectionImpl * Thrown if a database access error occurs or this method is called on a closed connection. * @since 2.4.0 */ - CallableStatement prepareCall(String sql) throws SQLException { + CallableStatement prepareCall(final String sql) throws SQLException { if (pstmtPool == null) { return connection.prepareCall(sql); } @@ -433,7 +433,7 @@ class PooledConnectionImpl * parameters are not <code>ResultSet</code> constants indicating type and concurrency. * @since 2.4.0 */ - CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException { + CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency) throws SQLException { if (pstmtPool == null) { return connection.prepareCall(sql, resultSetType, resultSetConcurrency); } @@ -468,8 +468,8 @@ class PooledConnectionImpl * parameters are not <code>ResultSet</code> constants indicating type, concurrency, and holdability. * @since 2.4.0 */ - CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, - int resultSetHoldability) throws SQLException { + CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency, + final int resultSetHoldability) throws SQLException { if (pstmtPool == null) { return connection.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability); } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5d98623c/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 f34b127..6de8a8a 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java @@ -139,7 +139,7 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource { return managers.get(getPoolKey(upkey.getUsername())); } - private ObjectPool<PooledConnectionAndInfo> getCPDSConnectionFactoryPool(PooledConnectionManager manager) { + private ObjectPool<PooledConnectionAndInfo> getCPDSConnectionFactoryPool(final PooledConnectionManager manager) { return ((CPDSConnectionFactory) manager).getPool(); } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5d98623c/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java index 199ddb1..48ccb98 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java @@ -64,7 +64,7 @@ class UserPassKey implements Serializable { * Only takes the user name into account. */ @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -74,7 +74,7 @@ class UserPassKey implements Serializable { if (getClass() != obj.getClass()) { return false; } - UserPassKey other = (UserPassKey) obj; + final UserPassKey other = (UserPassKey) obj; if (userName == null) { if (other.userName != null) { return false; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5d98623c/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java index c3b9292..f48cbb8 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java @@ -51,7 +51,7 @@ public class ManagedConnection<C extends Connection> extends DelegatingConnectio private final boolean accessToUnderlyingConnectionAllowed; private TransactionContext transactionContext; private boolean isSharedConnection; - private Lock lock; + private final Lock lock; public ManagedConnection(final ObjectPool<C> pool, final TransactionRegistry transactionRegistry, http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/5d98623c/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java b/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java index 758efa2..ecff5b0 100644 --- a/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java +++ b/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java @@ -47,7 +47,7 @@ public class TestConnectionWithNarayana { private static final String DROP_STMT = "DROP TABLE TEST_DATA"; static { - StringBuffer sb = new StringBuffer(); + final StringBuffer sb = new StringBuffer(); sb.append("Start"); sb.append("payload"); for (int i = 0; i < 10000; i++) { @@ -85,8 +85,8 @@ public class TestConnectionWithNarayana { mds.setLogExpiredConnections(true); mds.setLifo(false); - Connection conn = mds.getConnection(); - PreparedStatement ps = conn.prepareStatement(CREATE_STMT); + final Connection conn = mds.getConnection(); + final PreparedStatement ps = conn.prepareStatement(CREATE_STMT); ps.execute(); ps.close(); conn.close(); @@ -105,13 +105,13 @@ public class TestConnectionWithNarayana { Thread.sleep(1000); try (Connection conn = mds.getConnection()) { fail("Should not get the connection 1"); - } catch (SQLException e) { + } catch (final SQLException e) { if (!e.getCause().getClass().equals(IllegalStateException.class)) { throw e; } try (Connection conn = mds.getConnection()) { fail("Should not get connection 2"); - } catch (SQLException e2) { + } catch (final SQLException e2) { if (!e2.getCause().getClass().equals(IllegalStateException.class)) { throw e2; } @@ -136,7 +136,7 @@ public class TestConnectionWithNarayana { try { conn.commit(); fail("Should not work after timeout"); - } catch (SQLException e) { + } catch (final SQLException e) { // Expected Assert.assertEquals("Commit can not be set while enrolled in a transaction", e.getMessage()); } @@ -198,14 +198,14 @@ public class TestConnectionWithNarayana { try { mds.getTransactionManager().commit(); fail("Should not have been able to commit"); - } catch (RollbackException e) { + } catch (final RollbackException e) { // this is expected if (mds.getTransactionManager().getTransaction() != null) { // Need to pop it off the thread if a background thread rolled the transaction back mds.getTransactionManager().rollback(); } } - } catch (Exception e) { + } catch (final Exception e) { if (mds.getTransactionManager().getTransaction() != null) { // Need to pop it off the thread if a background thread rolled the transaction back mds.getTransactionManager().rollback(); @@ -224,8 +224,8 @@ public class TestConnectionWithNarayana { @After public void tearDown() throws Exception { - Connection conn = mds.getConnection(); - PreparedStatement ps = conn.prepareStatement(DROP_STMT); + final Connection conn = mds.getConnection(); + final PreparedStatement ps = conn.prepareStatement(DROP_STMT); ps.execute(); ps.close(); conn.close();
