You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/07/08 20:03:12 UTC

[1/4] commons-dbcp git commit: Use final.

Repository: commons-dbcp
Updated Branches:
  refs/heads/master 5dd2debd7 -> 82dc4a18c


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestLifetimeExceededException.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestLifetimeExceededException.java b/src/test/java/org/apache/commons/dbcp2/TestLifetimeExceededException.java
index 69ae9df..61cee17 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestLifetimeExceededException.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestLifetimeExceededException.java
@@ -29,13 +29,13 @@ public class TestLifetimeExceededException {
 
     @Test
     public void testLifetimeExceededExceptionNoMessage() {
-        LifetimeExceededException exception = new LifetimeExceededException();
+        final LifetimeExceededException exception = new LifetimeExceededException();
         assertNull(exception.getMessage());
     }
 
     @Test
     public void testLifetimeExceededException() {
-        LifetimeExceededException exception = new LifetimeExceededException("car");
+        final LifetimeExceededException exception = new LifetimeExceededException("car");
         assertEquals("car", exception.getMessage());
     }
 }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestListException.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestListException.java b/src/test/java/org/apache/commons/dbcp2/TestListException.java
index 07ab198..c234f0c 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestListException.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestListException.java
@@ -33,7 +33,7 @@ public class TestListException {
 
     @Test
     public void testNulls() {
-        ListException list = new ListException(null, null);
+        final ListException list = new ListException(null, null);
         assertNull(list.getMessage());
         assertNull(list.getExceptionList());
     }
@@ -41,8 +41,9 @@ public class TestListException {
     @Test
     public void testExceptionList() {
         @SuppressWarnings("unchecked")
+        final
         List<Throwable> exceptions = Arrays.asList(new Throwable[] {new NullPointerException(), new RuntimeException()});
-        ListException list = new ListException("Internal Error", exceptions);
+        final ListException list = new ListException("Internal Error", exceptions);
         assertEquals("Internal Error", list.getMessage());
         assertArrayEquals(exceptions.toArray(), list.getExceptionList().toArray());
     }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java b/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
index d90edd4..9f1698d 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
@@ -382,17 +382,17 @@ public class TesterCallableStatement extends TesterPreparedStatement implements
     }
 
     @Override
-    public void registerOutParameter(int parameterIndex, SQLType sqlType) throws SQLException {
+    public void registerOutParameter(final int parameterIndex, final SQLType sqlType) throws SQLException {
         // Do nothing
     }
 
     @Override
-    public void registerOutParameter(int parameterIndex, SQLType sqlType, int scale) throws SQLException {
+    public void registerOutParameter(final int parameterIndex, final SQLType sqlType, final int scale) throws SQLException {
         // Do nothing
     }
 
     @Override
-    public void registerOutParameter(int parameterIndex, SQLType sqlType, String typeName) throws SQLException {
+    public void registerOutParameter(final int parameterIndex, final SQLType sqlType, final String typeName) throws SQLException {
         // Do nothing
     }
 
@@ -409,17 +409,17 @@ public class TesterCallableStatement extends TesterPreparedStatement implements
     }
 
     @Override
-    public void registerOutParameter(String parameterName, SQLType sqlType) throws SQLException {
+    public void registerOutParameter(final String parameterName, final SQLType sqlType) throws SQLException {
         // Do nothing
     }
 
     @Override
-    public void registerOutParameter(String parameterName, SQLType sqlType, int scale) throws SQLException {
+    public void registerOutParameter(final String parameterName, final SQLType sqlType, final int scale) throws SQLException {
         // Do nothing
     }
 
     @Override
-    public void registerOutParameter(String parameterName, SQLType sqlType, String typeName) throws SQLException {
+    public void registerOutParameter(final String parameterName, final SQLType sqlType, final String typeName) throws SQLException {
         // Do nothing
     }
 
@@ -568,12 +568,12 @@ public class TesterCallableStatement extends TesterPreparedStatement implements
     }
 
     @Override
-    public void setObject(String parameterName, Object x, SQLType targetSqlType) throws SQLException {
+    public void setObject(final String parameterName, final Object x, final SQLType targetSqlType) throws SQLException {
         // Do nothing
     }
 
     @Override
-    public void setObject(String parameterName, Object x, SQLType targetSqlType, int scaleOrLength)
+    public void setObject(final String parameterName, final Object x, final SQLType targetSqlType, final int scaleOrLength)
             throws SQLException {
         // Do nothing
     }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
index a3d12fa..5883cb8 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
@@ -464,12 +464,12 @@ public class TesterPreparedStatement extends TesterStatement implements Prepared
     }
 
     @Override
-    public void setObject(int parameterIndex, Object x, SQLType targetSqlType) throws SQLException {
+    public void setObject(final int parameterIndex, final Object x, final SQLType targetSqlType) throws SQLException {
         checkOpen();
     }
 
     @Override
-    public void setObject(int parameterIndex, Object x, SQLType targetSqlType, int scaleOrLength) throws SQLException {
+    public void setObject(final int parameterIndex, final Object x, final SQLType targetSqlType, final int scaleOrLength) throws SQLException {
         checkOpen();
     }
 

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
index 9b734d0..afc4c1e 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
@@ -1076,12 +1076,12 @@ public java.sql.Date getDate(final int columnIndex, final Calendar cal) throws S
     }
 
     @Override
-    public void updateObject(int columnIndex, Object x, SQLType targetSqlType) throws SQLException {
+    public void updateObject(final int columnIndex, final Object x, final SQLType targetSqlType) throws SQLException {
         checkOpen();
     }
 
     @Override
-    public void updateObject(int columnIndex, Object x, SQLType targetSqlType, int scaleOrLength) throws SQLException {
+    public void updateObject(final int columnIndex, final Object x, final SQLType targetSqlType, final int scaleOrLength) throws SQLException {
         checkOpen();
     }
 
@@ -1096,12 +1096,12 @@ public java.sql.Date getDate(final int columnIndex, final Calendar cal) throws S
     }
 
     @Override
-    public void updateObject(String columnLabel, Object x, SQLType targetSqlType) throws SQLException {
+    public void updateObject(final String columnLabel, final Object x, final SQLType targetSqlType) throws SQLException {
         checkOpen();
     }
 
     @Override
-    public void updateObject(String columnLabel, Object x, SQLType targetSqlType, int scaleOrLength)
+    public void updateObject(final String columnLabel, final Object x, final SQLType targetSqlType, final int scaleOrLength)
             throws SQLException {
         checkOpen();
     }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/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 a3e0f4e..0669b1f 100644
--- a/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
+++ b/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
@@ -299,7 +299,7 @@ public class TestDriverAdapterCPDS {
 
     @Test
     public void testGetReference() throws NamingException {
-        Reference ref = pcds.getReference();
+        final Reference ref = pcds.getReference();
         assertEquals(pcds.getDriver(), ref.get("driver").getContent());
         assertEquals(pcds.getDescription(), ref.get("description").getContent());
     }
@@ -312,7 +312,7 @@ public class TestDriverAdapterCPDS {
         assertEquals("bar", pcds.getPassword());
         pcds.setPassword(new char[] {'a', 'b'});
         assertArrayEquals(new char[] {'a', 'b'}, pcds.getPasswordCharArray());
-        PrintWriter pw = new PrintWriter(System.err);
+        final PrintWriter pw = new PrintWriter(System.err);
         pcds.setLogWriter(pw);
         assertEquals(pw, pcds.getLogWriter());
         pcds.setLoginTimeout(10);
@@ -331,20 +331,20 @@ public class TestDriverAdapterCPDS {
 
     @Test
     public void testGetObjectInstanceNull() throws Exception {
-        Object o = pcds.getObjectInstance(null, null, null, null);
+        final Object o = pcds.getObjectInstance(null, null, null, null);
         assertNull(o);
     }
 
     @Test
     public void testGetObjectInstance() throws Exception {
-        Reference ref = pcds.getReference();
-        Object o = pcds.getObjectInstance(ref, null, null, null);
+        final Reference ref = pcds.getReference();
+        final Object o = pcds.getObjectInstance(ref, null, null, null);
         assertEquals(pcds.getDriver(), ((DriverAdapterCPDS) o).getDriver());
     }
 
     @Test
     public void testGetObjectInstanceChangeDescription() throws Exception {
-        Reference ref = pcds.getReference();
+        final Reference ref = pcds.getReference();
         for (int i = 0; i < ref.size(); i++) {
             if (ref.get(i).getType().equals("description")) {
                 ref.remove(i);
@@ -352,7 +352,7 @@ public class TestDriverAdapterCPDS {
             }
         }
         ref.add(new StringRefAddr("description", "anything"));
-        Object o = pcds.getObjectInstance(ref, null, null, null);
+        final Object o = pcds.getObjectInstance(ref, null, null, null);
         assertEquals(pcds.getDescription(), ((DriverAdapterCPDS) o).getDescription());
     }
 }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
index 1a875d0..59a351d 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
@@ -71,7 +71,7 @@ public class TestInstanceKeyDataSource {
      */
     @Test
     public void testExceptionOnSetupDefaults() throws Exception {
-        ThrowOnSetupDefaultsDataSource tds = new ThrowOnSetupDefaultsDataSource();
+        final ThrowOnSetupDefaultsDataSource tds = new ThrowOnSetupDefaultsDataSource();
         final int numConnections = tds.getNumActive();
         try {
             tds.getConnection(USER, PASS);
@@ -169,7 +169,7 @@ public class TestInstanceKeyDataSource {
     public void testJndiPropertiesCleared() {
         spds.setJndiEnvironment("name", "king");
         assertEquals("king", spds.getJndiEnvironment("name"));
-        Properties properties = new Properties();
+        final Properties properties = new Properties();
         properties.setProperty("fish", "kohi");
         spds.setJndiEnvironment(properties);
         assertNull(spds.getJndiEnvironment("name"));
@@ -178,7 +178,7 @@ public class TestInstanceKeyDataSource {
     @Test
     public void testJndiEnvironment() {
         assertNull(spds.getJndiEnvironment("name"));
-        Properties properties = new Properties();
+        final Properties properties = new Properties();
         properties.setProperty("name", "clarke");
         spds.setJndiEnvironment(properties);
         assertEquals("clarke", spds.getJndiEnvironment("name"));
@@ -302,10 +302,10 @@ public class TestInstanceKeyDataSource {
         pcds.setDriver(DRIVER);
         pcds.setUrl(URL);
         spds.setConnectionPoolDataSource(pcds);
-        PooledConnectionAndInfo info = spds.getPooledConnectionAndInfo(null, null);
+        final PooledConnectionAndInfo info = spds.getPooledConnectionAndInfo(null, null);
         assertNull(info.getUsername());
         assertNull(info.getPassword());
-        Connection conn = spds.getConnection();
+        final Connection conn = spds.getConnection();
         assertNotNull(conn);
     }
 }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
index 623ccb4..f8c4a91 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
@@ -558,8 +558,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      */
     @Test
     public void testPerUserBlockWhenExhaustedMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> userDefaultBlockWhenExhausted = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> userDefaultBlockWhenExhausted = new HashMap<>();
         userDefaultBlockWhenExhausted.put("key", Boolean.TRUE);
         ds.setPerUserBlockWhenExhausted(userDefaultBlockWhenExhausted);
         assertEquals(Boolean.TRUE, ds.getPerUserBlockWhenExhausted("key"));
@@ -570,7 +570,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      */
     @Test
     public void testPerUserBlockWhenExhaustedMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> userDefaultBlockWhenExhausted = new HashMap<>();
         userDefaultBlockWhenExhausted.put("key", Boolean.FALSE);
         ds.setPerUserBlockWhenExhausted(userDefaultBlockWhenExhausted);
@@ -594,8 +594,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      */
     @Test
     public void testPerUserBlockWhenExhaustedMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> userDefaultBlockWhenExhausted = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> userDefaultBlockWhenExhausted = new HashMap<>();
         userDefaultBlockWhenExhausted.put("key", Boolean.FALSE);
         ds.setPerUserBlockWhenExhausted(userDefaultBlockWhenExhausted);
         assertEquals(ds.getDefaultBlockWhenExhausted(), ds.getPerUserBlockWhenExhausted("missingkey"));
@@ -607,7 +607,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      */
     @Test
     public void testPerUserBlockWhenExhaustedWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserBlockWhenExhausted(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserBlockWhenExhausted(user));
     }
@@ -621,7 +621,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      */
     @Test
     public void testPerUserBlockWhenExhaustedWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserBlockWhenExhausted(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserBlockWhenExhausted(user));
         // when the code above is executed, the backing map was initalized
@@ -639,7 +639,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      */
     @Test
     public void testPerUserBlockWhenExhaustedWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserBlockWhenExhausted("whatismyuseragain?", Boolean.FALSE);
         assertEquals(Boolean.TRUE, ds.getPerUserBlockWhenExhausted("missingkey"));
     }
@@ -648,8 +648,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultAutoCommitMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
         ds.setPerUserDefaultAutoCommit(values);
         assertEquals(Boolean.TRUE, ds.getPerUserDefaultAutoCommit("key"));
@@ -657,7 +657,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultAutoCommitMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserDefaultAutoCommit(values);
@@ -671,8 +671,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultAutoCommitMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserDefaultAutoCommit(values);
         // TODO this is not consistent with the other methods
@@ -681,14 +681,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultAutoCommitWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultAutoCommit(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserDefaultAutoCommit(user));
     }
 
     @Test
     public void testPerUserDefaultAutoCommitWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultAutoCommit(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserDefaultAutoCommit(user));
         ds.setPerUserDefaultAutoCommit("anotheruser", Boolean.FALSE);
@@ -698,7 +698,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultAutoCommitWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultAutoCommit("whatismyuseragain?", Boolean.FALSE);
         // TODO this is not consistent with the other methods
         assertEquals(null, ds.getPerUserDefaultAutoCommit("missingkey"));
@@ -708,8 +708,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultReadOnlyMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
         ds.setPerUserDefaultReadOnly(values);
         assertEquals(Boolean.TRUE, ds.getPerUserDefaultReadOnly("key"));
@@ -717,7 +717,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultReadOnlyMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserDefaultReadOnly(values);
@@ -731,8 +731,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultReadOnlyMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserDefaultReadOnly(values);
         // TODO this is not consistent with the other methods
@@ -741,14 +741,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultReadOnlyWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultReadOnly(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserDefaultReadOnly(user));
     }
 
     @Test
     public void testPerUserDefaultReadOnlyWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultReadOnly(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserDefaultReadOnly(user));
         ds.setPerUserDefaultReadOnly("anotheruser", Boolean.FALSE);
@@ -758,7 +758,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultReadOnlyWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultReadOnly("whatismyuseragain?", Boolean.FALSE);
         // TODO this is not consistent with the other methods
         assertEquals(null, ds.getPerUserDefaultReadOnly("missingkey"));
@@ -768,8 +768,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultTransactionIsolationMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Integer> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Integer> values = new HashMap<>();
         values.put("key", 1);
         ds.setPerUserDefaultTransactionIsolation(values);
         assertEquals((Integer) 1, (Integer) ds.getPerUserDefaultTransactionIsolation("key"));
@@ -777,7 +777,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultTransactionIsolationMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
         ds.setPerUserDefaultTransactionIsolation(values);
@@ -792,8 +792,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultTransactionIsolationMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Integer> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
         ds.setPerUserDefaultTransactionIsolation(values);
         // TODO this is not consistent with the other methods
@@ -802,14 +802,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultTransactionIsolationWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultTransactionIsolation(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserDefaultTransactionIsolation(user));
     }
 
     @Test
     public void testPerUserDefaultTransactionIsolationWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultTransactionIsolation(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserDefaultTransactionIsolation(user));
         ds.setPerUserDefaultTransactionIsolation("anotheruser", 0);
@@ -819,7 +819,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserDefaultTransactionIsolationWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultTransactionIsolation("whatismyuseragain?", 0);
         // TODO this is not consistent with the other methods
         assertEquals(null, (Integer) ds.getPerUserDefaultTransactionIsolation("missingkey"));
@@ -829,8 +829,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserEvictionPolicyClassNameMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, String> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, String> values = new HashMap<>();
         values.put("key", "test");
         ds.setPerUserEvictionPolicyClassName(values);
         assertEquals("test", ds.getPerUserEvictionPolicyClassName("key"));
@@ -838,7 +838,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserEvictionPolicyClassNameMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, String> values = new HashMap<>();
         values.put("key", "bar");
         ds.setPerUserEvictionPolicyClassName(values);
@@ -852,8 +852,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserEvictionPolicyClassNameMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, String> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, String> values = new HashMap<>();
         values.put("key", "bar");
         ds.setPerUserEvictionPolicyClassName(values);
         assertEquals(ds.getDefaultEvictionPolicyClassName(), ds.getPerUserEvictionPolicyClassName("missingkey"));
@@ -861,14 +861,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserEvictionPolicyClassNameWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserEvictionPolicyClassName(user, "bar");
         assertEquals("bar", ds.getPerUserEvictionPolicyClassName(user));
     }
 
     @Test
     public void testPerUserEvictionPolicyClassNameWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserEvictionPolicyClassName(user, "bar");
         assertEquals("bar", ds.getPerUserEvictionPolicyClassName(user));
         ds.setPerUserEvictionPolicyClassName("anotheruser", "bar");
@@ -878,7 +878,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserEvictionPolicyClassNameWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserEvictionPolicyClassName("whatismyuseragain?", "bar");
         assertEquals(ds.getDefaultEvictionPolicyClassName(), ds.getPerUserEvictionPolicyClassName("missingkey"));
     }
@@ -887,8 +887,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserLifoMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
         ds.setPerUserLifo(values);
         assertEquals(Boolean.TRUE, ds.getPerUserLifo("key"));
@@ -896,7 +896,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserLifoMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserLifo(values);
@@ -910,8 +910,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserLifoMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserLifo(values);
         assertEquals(ds.getDefaultLifo(), ds.getPerUserLifo("missingkey"));
@@ -919,14 +919,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserLifoWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserLifo(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserLifo(user));
     }
 
     @Test
     public void testPerUserLifoWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserLifo(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserLifo(user));
         ds.setPerUserLifo("anotheruser", Boolean.FALSE);
@@ -936,7 +936,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserLifoWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserLifo("whatismyuseragain?", Boolean.FALSE);
         assertEquals(ds.getDefaultLifo(), ds.getPerUserLifo("missingkey"));
     }
@@ -945,8 +945,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxIdleMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Integer> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Integer> values = new HashMap<>();
         values.put("key", 1);
         ds.setPerUserMaxIdle(values);
         assertEquals((Integer) 1, (Integer) ds.getPerUserMaxIdle("key"));
@@ -954,7 +954,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxIdleMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
         ds.setPerUserMaxIdle(values);
@@ -968,8 +968,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxIdleMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Integer> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
         ds.setPerUserMaxIdle(values);
         assertEquals((Integer) ds.getDefaultMaxIdle(), (Integer) ds.getPerUserMaxIdle("missingkey"));
@@ -977,14 +977,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxIdleWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxIdle(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMaxIdle(user));
     }
 
     @Test
     public void testPerUserMaxIdleWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxIdle(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMaxIdle(user));
         ds.setPerUserMaxIdle("anotheruser", 0);
@@ -994,7 +994,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxIdleWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxIdle("whatismyuseragain?", 0);
         assertEquals((Integer) ds.getDefaultMaxIdle(), (Integer) ds.getPerUserMaxIdle("missingkey"));
     }
@@ -1003,8 +1003,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxTotalMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Integer> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Integer> values = new HashMap<>();
         values.put("key", 1);
         ds.setPerUserMaxTotal(values);
         assertEquals((Integer) 1, (Integer) ds.getPerUserMaxTotal("key"));
@@ -1012,7 +1012,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxTotalMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
         ds.setPerUserMaxTotal(values);
@@ -1026,8 +1026,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxTotalMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Integer> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
         ds.setPerUserMaxTotal(values);
         assertEquals((Integer) ds.getDefaultMaxTotal(), (Integer) ds.getPerUserMaxTotal("missingkey"));
@@ -1035,14 +1035,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxTotalWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxTotal(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMaxTotal(user));
     }
 
     @Test
     public void testPerUserMaxTotalWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxTotal(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMaxTotal(user));
         ds.setPerUserMaxTotal("anotheruser", 0);
@@ -1052,7 +1052,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxTotalWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxTotal("whatismyuseragain?", 0);
         assertEquals((Integer) ds.getDefaultMaxTotal(), (Integer) ds.getPerUserMaxTotal("missingkey"));
     }
@@ -1061,8 +1061,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxWaitMillisMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Long> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Long> values = new HashMap<>();
         values.put("key", 1l);
         ds.setPerUserMaxWaitMillis(values);
         assertEquals(1l, ds.getPerUserMaxWaitMillis("key"));
@@ -1070,7 +1070,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxWaitMillisMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Long> values = new HashMap<>();
         values.put("key", 0l);
         ds.setPerUserMaxWaitMillis(values);
@@ -1084,8 +1084,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxWaitMillisMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Long> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Long> values = new HashMap<>();
         values.put("key", 0l);
         ds.setPerUserMaxWaitMillis(values);
         assertEquals(ds.getDefaultMaxWaitMillis(), ds.getPerUserMaxWaitMillis("missingkey"));
@@ -1093,14 +1093,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxWaitMillisWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxWaitMillis(user, 0l);
         assertEquals(0l, ds.getPerUserMaxWaitMillis(user));
     }
 
     @Test
     public void testPerUserMaxWaitMillisWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxWaitMillis(user, 0l);
         assertEquals(0l, ds.getPerUserMaxWaitMillis(user));
         ds.setPerUserMaxWaitMillis("anotheruser", 0l);
@@ -1110,7 +1110,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMaxWaitMillisWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxWaitMillis("whatismyuseragain?", 0l);
         assertEquals(ds.getDefaultMaxWaitMillis(), ds.getPerUserMaxWaitMillis("missingkey"));
     }
@@ -1119,8 +1119,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMinEvictableIdleTimeMillisMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Long> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Long> values = new HashMap<>();
         values.put("key", 1l);
         ds.setPerUserMinEvictableIdleTimeMillis(values);
         assertEquals(1l, ds.getPerUserMinEvictableIdleTimeMillis("key"));
@@ -1128,7 +1128,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMinEvictableIdleTimeMillisMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Long> values = new HashMap<>();
         values.put("key", 0l);
         ds.setPerUserMinEvictableIdleTimeMillis(values);
@@ -1142,8 +1142,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMinEvictableIdleTimeMillisMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Long> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Long> values = new HashMap<>();
         values.put("key", 0l);
         ds.setPerUserMinEvictableIdleTimeMillis(values);
         assertEquals(ds.getDefaultMinEvictableIdleTimeMillis(), ds.getPerUserMinEvictableIdleTimeMillis("missingkey"));
@@ -1151,14 +1151,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMinEvictableIdleTimeMillisWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinEvictableIdleTimeMillis(user, 0l);
         assertEquals(0l, ds.getPerUserMinEvictableIdleTimeMillis(user));
     }
 
     @Test
     public void testPerUserMinEvictableIdleTimeMillisWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinEvictableIdleTimeMillis(user, 0l);
         assertEquals(0l, ds.getPerUserMinEvictableIdleTimeMillis(user));
         ds.setPerUserMinEvictableIdleTimeMillis("anotheruser", 0l);
@@ -1168,7 +1168,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMinEvictableIdleTimeMillisWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinEvictableIdleTimeMillis("whatismyuseragain?", 0l);
         assertEquals(ds.getDefaultMinEvictableIdleTimeMillis(), ds.getPerUserMinEvictableIdleTimeMillis("missingkey"));
     }
@@ -1177,8 +1177,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMinIdleMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Integer> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Integer> values = new HashMap<>();
         values.put("key", 1);
         ds.setPerUserMinIdle(values);
         assertEquals((Integer) 1, (Integer) ds.getPerUserMinIdle("key"));
@@ -1186,7 +1186,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMinIdleMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
         ds.setPerUserMinIdle(values);
@@ -1200,8 +1200,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMinIdleMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Integer> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
         ds.setPerUserMinIdle(values);
         assertEquals((Integer) ds.getDefaultMinIdle(), (Integer) ds.getPerUserMinIdle("missingkey"));
@@ -1209,14 +1209,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMinIdleWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinIdle(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMinIdle(user));
     }
 
     @Test
     public void testPerUserMinIdleWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinIdle(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMinIdle(user));
         ds.setPerUserMinIdle("anotheruser", 0);
@@ -1226,7 +1226,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserMinIdleWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinIdle("whatismyuseragain?", 0);
         assertEquals((Integer) ds.getDefaultMinIdle(), (Integer) ds.getPerUserMinIdle("missingkey"));
     }
@@ -1235,8 +1235,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserNumTestsPerEvictionRunMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Integer> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Integer> values = new HashMap<>();
         values.put("key", 1);
         ds.setPerUserNumTestsPerEvictionRun(values);
         assertEquals((Integer) 1, (Integer) ds.getPerUserNumTestsPerEvictionRun("key"));
@@ -1244,7 +1244,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserNumTestsPerEvictionRunMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
         ds.setPerUserNumTestsPerEvictionRun(values);
@@ -1258,8 +1258,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserNumTestsPerEvictionRunMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Integer> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
         ds.setPerUserNumTestsPerEvictionRun(values);
         assertEquals((Integer) ds.getDefaultNumTestsPerEvictionRun(), (Integer) ds.getPerUserNumTestsPerEvictionRun("missingkey"));
@@ -1267,14 +1267,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserNumTestsPerEvictionRunWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserNumTestsPerEvictionRun(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserNumTestsPerEvictionRun(user));
     }
 
     @Test
     public void testPerUserNumTestsPerEvictionRunWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserNumTestsPerEvictionRun(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserNumTestsPerEvictionRun(user));
         ds.setPerUserNumTestsPerEvictionRun("anotheruser", 0);
@@ -1284,7 +1284,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserNumTestsPerEvictionRunWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserNumTestsPerEvictionRun("whatismyuseragain?", 0);
         assertEquals((Integer) ds.getDefaultNumTestsPerEvictionRun(), (Integer) ds.getPerUserNumTestsPerEvictionRun("missingkey"));
     }
@@ -1293,8 +1293,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Long> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Long> values = new HashMap<>();
         values.put("key", 1l);
         ds.setPerUserSoftMinEvictableIdleTimeMillis(values);
         assertEquals(1l, ds.getPerUserSoftMinEvictableIdleTimeMillis("key"));
@@ -1302,7 +1302,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Long> values = new HashMap<>();
         values.put("key", 0l);
         ds.setPerUserSoftMinEvictableIdleTimeMillis(values);
@@ -1316,8 +1316,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Long> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Long> values = new HashMap<>();
         values.put("key", 0l);
         ds.setPerUserSoftMinEvictableIdleTimeMillis(values);
         assertEquals(ds.getDefaultSoftMinEvictableIdleTimeMillis(), ds.getPerUserSoftMinEvictableIdleTimeMillis("missingkey"));
@@ -1325,14 +1325,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserSoftMinEvictableIdleTimeMillis(user, 0l);
         assertEquals(0l, ds.getPerUserSoftMinEvictableIdleTimeMillis(user));
     }
 
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserSoftMinEvictableIdleTimeMillis(user, 0l);
         assertEquals(0l, ds.getPerUserSoftMinEvictableIdleTimeMillis(user));
         ds.setPerUserSoftMinEvictableIdleTimeMillis("anotheruser", 0l);
@@ -1342,7 +1342,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserSoftMinEvictableIdleTimeMillis("whatismyuseragain?", 0l);
         assertEquals(ds.getDefaultSoftMinEvictableIdleTimeMillis(), ds.getPerUserSoftMinEvictableIdleTimeMillis("missingkey"));
     }
@@ -1351,8 +1351,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnBorrowMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
         ds.setPerUserTestOnBorrow(values);
         assertEquals(Boolean.TRUE, ds.getPerUserTestOnBorrow("key"));
@@ -1360,7 +1360,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnBorrowMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserTestOnBorrow(values);
@@ -1374,8 +1374,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnBorrowMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserTestOnBorrow(values);
         assertEquals(ds.getDefaultTestOnBorrow(), ds.getPerUserTestOnBorrow("missingkey"));
@@ -1383,14 +1383,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnBorrowWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnBorrow(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnBorrow(user));
     }
 
     @Test
     public void testPerUserTestOnBorrowWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnBorrow(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnBorrow(user));
         ds.setPerUserTestOnBorrow("anotheruser", Boolean.FALSE);
@@ -1400,7 +1400,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnBorrowWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnBorrow("whatismyuseragain?", Boolean.FALSE);
         assertEquals(ds.getDefaultTestOnBorrow(), ds.getPerUserTestOnBorrow("missingkey"));
     }
@@ -1409,8 +1409,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnCreateMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
         ds.setPerUserTestOnCreate(values);
         assertEquals(Boolean.TRUE, ds.getPerUserTestOnCreate("key"));
@@ -1418,7 +1418,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnCreateMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserTestOnCreate(values);
@@ -1432,8 +1432,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnCreateMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserTestOnCreate(values);
         assertEquals(ds.getDefaultTestOnCreate(), ds.getPerUserTestOnCreate("missingkey"));
@@ -1441,14 +1441,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnCreateWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnCreate(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnCreate(user));
     }
 
     @Test
     public void testPerUserTestOnCreateWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnCreate(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnCreate(user));
         ds.setPerUserTestOnCreate("anotheruser", Boolean.FALSE);
@@ -1458,7 +1458,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnCreateWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnCreate("whatismyuseragain?", Boolean.FALSE);
         assertEquals(ds.getDefaultTestOnCreate(), ds.getPerUserTestOnCreate("missingkey"));
     }
@@ -1467,8 +1467,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnReturnMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
         ds.setPerUserTestOnReturn(values);
         assertEquals(Boolean.TRUE, ds.getPerUserTestOnReturn("key"));
@@ -1476,7 +1476,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnReturnMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserTestOnReturn(values);
@@ -1490,8 +1490,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnReturnMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserTestOnReturn(values);
         assertEquals(ds.getDefaultTestOnReturn(), ds.getPerUserTestOnReturn("missingkey"));
@@ -1499,14 +1499,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnReturnWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnReturn(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnReturn(user));
     }
 
     @Test
     public void testPerUserTestOnReturnWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnReturn(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnReturn(user));
         ds.setPerUserTestOnReturn("anotheruser", Boolean.FALSE);
@@ -1516,7 +1516,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestOnReturnWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnReturn("whatismyuseragain?", Boolean.FALSE);
         assertEquals(ds.getDefaultTestOnReturn(), ds.getPerUserTestOnReturn("missingkey"));
     }
@@ -1525,8 +1525,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestWhileIdleMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
         ds.setPerUserTestWhileIdle(values);
         assertEquals(Boolean.TRUE, ds.getPerUserTestWhileIdle("key"));
@@ -1534,7 +1534,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestWhileIdleMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserTestWhileIdle(values);
@@ -1548,8 +1548,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestWhileIdleMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Boolean> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
         ds.setPerUserTestWhileIdle(values);
         assertEquals(ds.getDefaultTestWhileIdle(), ds.getPerUserTestWhileIdle("missingkey"));
@@ -1557,14 +1557,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestWhileIdleWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestWhileIdle(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestWhileIdle(user));
     }
 
     @Test
     public void testPerUserTestWhileIdleWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestWhileIdle(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestWhileIdle(user));
         ds.setPerUserTestWhileIdle("anotheruser", Boolean.FALSE);
@@ -1574,7 +1574,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTestWhileIdleWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestWhileIdle("whatismyuseragain?", Boolean.FALSE);
         assertEquals(ds.getDefaultTestWhileIdle(), ds.getPerUserTestWhileIdle("missingkey"));
     }
@@ -1583,8 +1583,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Long> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Long> values = new HashMap<>();
         values.put("key", 1l);
         ds.setPerUserTimeBetweenEvictionRunsMillis(values);
         assertEquals(1l, ds.getPerUserTimeBetweenEvictionRunsMillis("key"));
@@ -1592,7 +1592,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Long> values = new HashMap<>();
         values.put("key", 0l);
         ds.setPerUserTimeBetweenEvictionRunsMillis(values);
@@ -1606,8 +1606,8 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
-        Map<String, Long> values = new HashMap<>();
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final Map<String, Long> values = new HashMap<>();
         values.put("key", 0l);
         ds.setPerUserTimeBetweenEvictionRunsMillis(values);
         assertEquals(ds.getDefaultTimeBetweenEvictionRunsMillis(), ds.getPerUserTimeBetweenEvictionRunsMillis("missingkey"));
@@ -1615,14 +1615,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisWithUserMapNotInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTimeBetweenEvictionRunsMillis(user, 0l);
         assertEquals(0l, ds.getPerUserTimeBetweenEvictionRunsMillis(user));
     }
 
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisWithUserMapInitialized() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTimeBetweenEvictionRunsMillis(user, 0l);
         assertEquals(0l, ds.getPerUserTimeBetweenEvictionRunsMillis(user));
         ds.setPerUserTimeBetweenEvictionRunsMillis("anotheruser", 0l);
@@ -1632,7 +1632,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     public void testPerUserTimeBetweenEvictionRunsMillisWithUserMapNotInitializedMissingKey() {
-        PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
+        final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTimeBetweenEvictionRunsMillis("whatismyuseragain?", 0l);
         assertEquals(ds.getDefaultTimeBetweenEvictionRunsMillis(), ds.getPerUserTimeBetweenEvictionRunsMillis("missingkey"));
     }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
index 370158e..95dc424 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
@@ -87,7 +87,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     @Test
     public void testXaDataSourceInstance() throws SQLException {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
-            XADataSource ds = new JdbcDataSource();
+            final XADataSource ds = new JdbcDataSource();
             basicManagedDataSource.setXaDataSourceInstance(ds);
             assertEquals(ds, basicManagedDataSource.getXaDataSourceInstance());
         }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java
index 7efe5ca..d2d427c 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java
@@ -98,7 +98,7 @@ public class TestLocalXaResource {
 
     @Test
     public void testStartNoFlagResume() throws XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.start(xid, XAResource.TMRESUME);
         assertEquals(xid, resource.getXid());
@@ -106,7 +106,7 @@ public class TestLocalXaResource {
 
     @Test
     public void testStartNoFlagResumeEnd() throws XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.start(xid, XAResource.TMRESUME);
         // flag is never used in the end
@@ -116,7 +116,7 @@ public class TestLocalXaResource {
 
     @Test(expected=NullPointerException.class)
     public void testStartNoFlagResumeEndMissingXid() throws XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.start(xid, XAResource.TMRESUME);
         // flag is never used in the end
@@ -125,7 +125,7 @@ public class TestLocalXaResource {
 
     @Test(expected=XAException.class)
     public void testStartNoFlagResumeEndDifferentXid() throws XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.start(xid, XAResource.TMRESUME);
         // flag is never used in the end
@@ -134,7 +134,7 @@ public class TestLocalXaResource {
 
     @Test
     public void testForgetDifferentXid() throws XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.forget(new TestXid());
         assertEquals(xid, resource.getXid());
@@ -142,7 +142,7 @@ public class TestLocalXaResource {
 
     @Test
     public void testForgetMissingXid() throws XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.forget(null);
         assertEquals(xid, resource.getXid());
@@ -150,7 +150,7 @@ public class TestLocalXaResource {
 
     @Test
     public void testForget() throws XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.forget(xid);
         assertNull(resource.getXid());
@@ -158,7 +158,7 @@ public class TestLocalXaResource {
 
     @Test
     public void testStartReadOnlyConnectionPrepare() throws XAException, SQLException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         conn.setAutoCommit(false);
         conn.setReadOnly(true);
         resource.start(xid, XAResource.TMNOFLAGS);
@@ -174,7 +174,7 @@ public class TestLocalXaResource {
      */
     @Test
     public void testStartExceptionOnGetAutoCommit() throws XAException, SQLException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         ((TestConnection) conn).throwWhenGetAutoCommit = true;
         conn.setAutoCommit(false);
         conn.setReadOnly(true);
@@ -196,7 +196,7 @@ public class TestLocalXaResource {
      */
     @Test
     public void testStartReadOnlyConnectionExceptionOnGetAutoCommit() throws XAException, SQLException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         ((TestConnection) conn).throwWhenGetAutoCommit = true;
         conn.setAutoCommit(false);
         conn.setReadOnly(false);
@@ -211,7 +211,7 @@ public class TestLocalXaResource {
 
     @Test(expected=XAException.class)
     public void testStartFailsWhenCannotSetAutoCommit() throws XAException, SQLException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         ((TestConnection) conn).throwWhenSetAutoCommit = true;
         resource.start(xid, XAResource.TMNOFLAGS);
     }
@@ -230,7 +230,7 @@ public class TestLocalXaResource {
 
     @Test(expected=XAException.class)
     public void testCommitInvalidXid() throws SQLException, XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(false);
         resource.start(xid, XAResource.TMNOFLAGS);
@@ -239,7 +239,7 @@ public class TestLocalXaResource {
 
     @Test(expected=XAException.class)
     public void testCommitConnectionClosed() throws SQLException, XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         ((TestConnection) conn).closed = true;
         conn.setReadOnly(false);
         resource.start(xid, XAResource.TMNOFLAGS);
@@ -248,7 +248,7 @@ public class TestLocalXaResource {
 
     @Test
     public void testCommitConnectionNotReadOnly() throws SQLException, XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(true);
         resource.start(xid, XAResource.TMNOFLAGS);
@@ -258,7 +258,7 @@ public class TestLocalXaResource {
 
     @Test
     public void testCommit() throws SQLException, XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(false);
         resource.start(xid, XAResource.TMNOFLAGS);
@@ -273,7 +273,7 @@ public class TestLocalXaResource {
 
     @Test(expected=XAException.class)
     public void testRollbackInvalidXid() throws SQLException, XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(false);
         resource.start(xid, XAResource.TMNOFLAGS);
@@ -282,7 +282,7 @@ public class TestLocalXaResource {
 
     @Test
     public void testRollback() throws SQLException, XAException {
-        Xid xid = new TestXid();
+        final Xid xid = new TestXid();
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(false);
         resource.start(xid, XAResource.TMNOFLAGS);
@@ -301,12 +301,12 @@ public class TestLocalXaResource {
         public boolean closed = false;
 
         @Override
-        public <T> T unwrap(Class<T> iface) throws SQLException {
+        public <T> T unwrap(final Class<T> iface) throws SQLException {
             return null;
         }
 
         @Override
-        public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        public boolean isWrapperFor(final Class<?> iface) throws SQLException {
             return false;
         }
 
@@ -316,22 +316,22 @@ public class TestLocalXaResource {
         }
 
         @Override
-        public PreparedStatement prepareStatement(String sql) throws SQLException {
+        public PreparedStatement prepareStatement(final String sql) throws SQLException {
             return null;
         }
 
         @Override
-        public CallableStatement prepareCall(String sql) throws SQLException {
+        public CallableStatement prepareCall(final String sql) throws SQLException {
             return null;
         }
 
         @Override
-        public String nativeSQL(String sql) throws SQLException {
+        public String nativeSQL(final String sql) throws SQLException {
             return null;
         }
 
         @Override
-        public void setAutoCommit(boolean autoCommit) throws SQLException {
+        public void setAutoCommit(final boolean autoCommit) throws SQLException {
             if (throwWhenSetAutoCommit) {
                 throw new SQLException();
             }
@@ -372,7 +372,7 @@ public class TestLocalXaResource {
         }
 
         @Override
-        public void setReadOnly(boolean readOnly) throws SQLException {
+        public void setReadOnly(final boolean readOnly) throws SQLException {
             this.readOnly = readOnly;
         }
 
@@ -382,7 +382,7 @@ public class TestLocalXaResource {
         }
 
         @Override
-        public void setCatalog(String catalog) throws SQLException {
+        public void setCatalog(final String catalog) throws SQLException {
         }
 
         @Override
@@ -391,7 +391,7 @@ public class TestLocalXaResource {
         }
 
         @Override
-        public void setTransactionIsolation(int level) throws SQLException {
+        public void setTransactionIsolation(final int level) throws SQLException {
         }
 
         @Override
@@ -409,18 +409,18 @@ public class TestLocalXaResource {
         }
 
         @Override
-        public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
+        public Statement createStatement(final int resultSetType, final int resultSetConcurrency) throws SQLException {
             return null;
         }
 
         @Override
-        public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
+        public PreparedStatement prepareStatement(final String sql, final int resultSetType, final int resultSetConcurrency)
                 throws SQLException {
             return null;
         }
 
         @Override
-        public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency)
+        public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency)
                 throws SQLException {
             return null;
         }
@@ -431,11 +431,11 @@ public class TestLocalXaResource {
         }
 
         @Override
-        public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
+        public void setTypeMap(final Map<String, Class<?>> map) throws SQLException {
         }
 
         @Override
-        public void setHoldability(int holdability) throws SQLException {
+        public void setHoldability(final int holdability) throws SQLException {
         }
 
         @Override
@@ -449,48 +449,48 @@ public class TestLocalXaResource {
         }
 
         @Override
-        public Savepoint setSavepoint(String name) throws SQLException {
+        public Savepoint setSavepoint(final String name) throws SQLException {
             return null;
         }
 
         @Override
-        public void rollback(Savepoint savepoint) throws SQLException {
+        public void rollback(final Savepoint savepoint) throws SQLException {
         }
 
         @Override
-        public void releaseSavepoint(Savepoint savepoint) throws SQLException {
+        public void releaseSavepoint(final Savepoint savepoint) throws SQLException {
         }
 
         @Override
-        public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability)
+        public Statement createStatement(final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability)
                 throws SQLException {
             return null;
         }
 
         @Override
-        public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
-                int resultSetHoldability) throws SQLException {
+        public PreparedStatement prepareStatement(final String sql, final int resultSetType, final int resultSetConcurrency,
+                final int resultSetHoldability) throws SQLException {
             return null;
         }
 
         @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 {
             return null;
         }
 
         @Override
-        public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+        public PreparedStatement prepareStatement(final String sql, final int autoGeneratedKeys) throws SQLException {
             return null;
         }
 
         @Override
-        public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+        public PreparedStatement prepareStatement(final String sql, final int[] columnIndexes) throws SQLException {
             return null;
         }
 
         @Override
-        public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
+        public PreparedStatement prepareStatement(final String sql, final String[] columnNames) throws SQLException {
             return null;
         }
 
@@ -515,20 +515,20 @@ public class TestLocalXaResource {
         }
 
         @Override
-        public boolean isValid(int timeout) throws SQLException {
+        public boolean isValid(final int timeout) throws SQLException {
             return false;
         }
 
         @Override
-        public void setClientInfo(String name, String value) throws SQLClientInfoException {
+        public void setClientInfo(final String name, final String value) throws SQLClientInfoException {
         }
 
         @Override
-        public void setClientInfo(Properties properties) throws SQLClientInfoException {
+        public void setClientInfo(final Properties properties) throws SQLClientInfoException {
         }
 
         @Override
-        public String getClientInfo(String name) throws SQLException {
+        public String getClientInfo(final String name) throws SQLException {
             return null;
         }
 
@@ -538,17 +538,17 @@ public class TestLocalXaResource {
         }
 
         @Override
-        public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
+        public Array createArrayOf(final String typeName, final Object[] elements) throws SQLException {
             return null;
         }
 
         @Override
-        public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
+        public Struct createStruct(final String typeName, final Object[] attributes) throws SQLException {
             return null;
         }
 
         @Override
-        public void setSchema(String schema) throws SQLException {
+        public void setSchema(final String schema) throws SQLException {
         }
 
         @Override
@@ -557,11 +557,11 @@ public class TestLocalXaResource {
         }
 
         @Override
-        public void abort(Executor executor) throws SQLException {
+        public void abort(final Executor executor) throws SQLException {
         }
 
         @Override
-        public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
+        public void setNetworkTimeout(final Executor executor, final int milliseconds) throws SQLException {
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
index 5f31d7a..7697345 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
@@ -266,7 +266,7 @@ public class TestManagedDataSource extends TestConnectionPool {
 
     @Test(expected=IllegalStateException.class)
     public void testSetTransactionRegistryAlreadySet() {
-        ManagedDataSource<?> managed = (ManagedDataSource<?>) ds;
+        final ManagedDataSource<?> managed = (ManagedDataSource<?>) ds;
         managed.setTransactionRegistry(null);
     }
 

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/managed/TestPoolableManagedConnection.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestPoolableManagedConnection.java b/src/test/java/org/apache/commons/dbcp2/managed/TestPoolableManagedConnection.java
index 44da212..4496dbb 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestPoolableManagedConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestPoolableManagedConnection.java
@@ -135,7 +135,7 @@ public class TestPoolableManagedConnection {
         try {
             assertNull(transactionRegistry.getXAResource(conn));
             fail("Transaction registry was supposed to be empty now");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         assertEquals(0, pool.getNumActive());
     }
 }
\ No newline at end of file


[3/4] commons-dbcp git commit: Use final.

Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
index 57a339e..6b75956 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
@@ -70,7 +70,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testAllProceduresAreCallable() throws Exception {
         try {
             delegate.allProceduresAreCallable();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).allProceduresAreCallable();
     }
 
@@ -78,7 +78,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testAllTablesAreSelectable() throws Exception {
         try {
             delegate.allTablesAreSelectable();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).allTablesAreSelectable();
     }
 
@@ -86,7 +86,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testAutoCommitFailureClosesAllResultSets() throws Exception {
         try {
             delegate.autoCommitFailureClosesAllResultSets();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).autoCommitFailureClosesAllResultSets();
     }
 
@@ -94,7 +94,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testDataDefinitionCausesTransactionCommit() throws Exception {
         try {
             delegate.dataDefinitionCausesTransactionCommit();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).dataDefinitionCausesTransactionCommit();
     }
 
@@ -102,7 +102,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testDataDefinitionIgnoredInTransactions() throws Exception {
         try {
             delegate.dataDefinitionIgnoredInTransactions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).dataDefinitionIgnoredInTransactions();
     }
 
@@ -110,7 +110,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testDeletesAreDetectedInteger() throws Exception {
         try {
             delegate.deletesAreDetected(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).deletesAreDetected(1);
     }
 
@@ -118,7 +118,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testDoesMaxRowSizeIncludeBlobs() throws Exception {
         try {
             delegate.doesMaxRowSizeIncludeBlobs();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).doesMaxRowSizeIncludeBlobs();
     }
 
@@ -126,7 +126,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGeneratedKeyAlwaysReturned() throws Exception {
         try {
             delegate.generatedKeyAlwaysReturned();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).generatedKeyAlwaysReturned();
     }
 
@@ -134,7 +134,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetAttributesStringStringStringString() throws Exception {
         try {
             delegate.getAttributes("foo","foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getAttributes("foo","foo","foo","foo");
     }
 
@@ -142,7 +142,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetBestRowIdentifierStringStringStringIntegerBoolean() throws Exception {
         try {
             delegate.getBestRowIdentifier("foo","foo","foo",1,Boolean.TRUE);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getBestRowIdentifier("foo","foo","foo",1,Boolean.TRUE);
     }
 
@@ -150,7 +150,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetCatalogSeparator() throws Exception {
         try {
             delegate.getCatalogSeparator();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getCatalogSeparator();
     }
 
@@ -158,7 +158,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetCatalogTerm() throws Exception {
         try {
             delegate.getCatalogTerm();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getCatalogTerm();
     }
 
@@ -166,7 +166,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetCatalogs() throws Exception {
         try {
             delegate.getCatalogs();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getCatalogs();
     }
 
@@ -174,7 +174,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetClientInfoProperties() throws Exception {
         try {
             delegate.getClientInfoProperties();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getClientInfoProperties();
     }
 
@@ -182,7 +182,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetColumnPrivilegesStringStringStringString() throws Exception {
         try {
             delegate.getColumnPrivileges("foo","foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getColumnPrivileges("foo","foo","foo","foo");
     }
 
@@ -190,7 +190,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetColumnsStringStringStringString() throws Exception {
         try {
             delegate.getColumns("foo","foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getColumns("foo","foo","foo","foo");
     }
 
@@ -203,7 +203,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetConnection() throws Exception {
         try {
             delegate.getConnection();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(0)).getConnection();
     }
 
@@ -211,7 +211,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetCrossReferenceStringStringStringStringStringString() throws Exception {
         try {
             delegate.getCrossReference("foo","foo","foo","foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getCrossReference("foo","foo","foo","foo","foo","foo");
     }
 
@@ -219,7 +219,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetDatabaseMajorVersion() throws Exception {
         try {
             delegate.getDatabaseMajorVersion();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getDatabaseMajorVersion();
     }
 
@@ -227,7 +227,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetDatabaseMinorVersion() throws Exception {
         try {
             delegate.getDatabaseMinorVersion();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getDatabaseMinorVersion();
     }
 
@@ -235,7 +235,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetDatabaseProductName() throws Exception {
         try {
             delegate.getDatabaseProductName();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getDatabaseProductName();
     }
 
@@ -243,7 +243,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetDatabaseProductVersion() throws Exception {
         try {
             delegate.getDatabaseProductVersion();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getDatabaseProductVersion();
     }
 
@@ -251,7 +251,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetDefaultTransactionIsolation() throws Exception {
         try {
             delegate.getDefaultTransactionIsolation();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getDefaultTransactionIsolation();
     }
 
@@ -271,7 +271,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetDriverName() throws Exception {
         try {
             delegate.getDriverName();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getDriverName();
     }
 
@@ -279,7 +279,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetDriverVersion() throws Exception {
         try {
             delegate.getDriverVersion();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getDriverVersion();
     }
 
@@ -287,7 +287,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetExportedKeysStringStringString() throws Exception {
         try {
             delegate.getExportedKeys("foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getExportedKeys("foo","foo","foo");
     }
 
@@ -295,7 +295,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetExtraNameCharacters() throws Exception {
         try {
             delegate.getExtraNameCharacters();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getExtraNameCharacters();
     }
 
@@ -303,7 +303,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetFunctionColumnsStringStringStringString() throws Exception {
         try {
             delegate.getFunctionColumns("foo","foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getFunctionColumns("foo","foo","foo","foo");
     }
 
@@ -311,7 +311,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetFunctionsStringStringString() throws Exception {
         try {
             delegate.getFunctions("foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getFunctions("foo","foo","foo");
     }
 
@@ -319,7 +319,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetIdentifierQuoteString() throws Exception {
         try {
             delegate.getIdentifierQuoteString();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getIdentifierQuoteString();
     }
 
@@ -327,7 +327,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetImportedKeysStringStringString() throws Exception {
         try {
             delegate.getImportedKeys("foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getImportedKeys("foo","foo","foo");
     }
 
@@ -335,7 +335,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetIndexInfoStringStringStringBooleanBoolean() throws Exception {
         try {
             delegate.getIndexInfo("foo","foo","foo",Boolean.TRUE,Boolean.TRUE);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getIndexInfo("foo","foo","foo",Boolean.TRUE,Boolean.TRUE);
     }
 
@@ -343,7 +343,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetJDBCMajorVersion() throws Exception {
         try {
             delegate.getJDBCMajorVersion();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getJDBCMajorVersion();
     }
 
@@ -351,7 +351,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetJDBCMinorVersion() throws Exception {
         try {
             delegate.getJDBCMinorVersion();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getJDBCMinorVersion();
     }
 
@@ -359,7 +359,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxBinaryLiteralLength() throws Exception {
         try {
             delegate.getMaxBinaryLiteralLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxBinaryLiteralLength();
     }
 
@@ -367,7 +367,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxCatalogNameLength() throws Exception {
         try {
             delegate.getMaxCatalogNameLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxCatalogNameLength();
     }
 
@@ -375,7 +375,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxCharLiteralLength() throws Exception {
         try {
             delegate.getMaxCharLiteralLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxCharLiteralLength();
     }
 
@@ -383,7 +383,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxColumnNameLength() throws Exception {
         try {
             delegate.getMaxColumnNameLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxColumnNameLength();
     }
 
@@ -391,7 +391,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxColumnsInGroupBy() throws Exception {
         try {
             delegate.getMaxColumnsInGroupBy();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxColumnsInGroupBy();
     }
 
@@ -399,7 +399,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxColumnsInIndex() throws Exception {
         try {
             delegate.getMaxColumnsInIndex();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxColumnsInIndex();
     }
 
@@ -407,7 +407,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxColumnsInOrderBy() throws Exception {
         try {
             delegate.getMaxColumnsInOrderBy();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxColumnsInOrderBy();
     }
 
@@ -415,7 +415,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxColumnsInSelect() throws Exception {
         try {
             delegate.getMaxColumnsInSelect();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxColumnsInSelect();
     }
 
@@ -423,7 +423,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxColumnsInTable() throws Exception {
         try {
             delegate.getMaxColumnsInTable();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxColumnsInTable();
     }
 
@@ -431,7 +431,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxConnections() throws Exception {
         try {
             delegate.getMaxConnections();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxConnections();
     }
 
@@ -439,7 +439,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxCursorNameLength() throws Exception {
         try {
             delegate.getMaxCursorNameLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxCursorNameLength();
     }
 
@@ -447,7 +447,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxIndexLength() throws Exception {
         try {
             delegate.getMaxIndexLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxIndexLength();
     }
 
@@ -455,7 +455,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxLogicalLobSize() throws Exception {
         try {
             delegate.getMaxLogicalLobSize();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxLogicalLobSize();
     }
 
@@ -463,7 +463,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxProcedureNameLength() throws Exception {
         try {
             delegate.getMaxProcedureNameLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxProcedureNameLength();
     }
 
@@ -471,7 +471,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxRowSize() throws Exception {
         try {
             delegate.getMaxRowSize();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxRowSize();
     }
 
@@ -479,7 +479,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxSchemaNameLength() throws Exception {
         try {
             delegate.getMaxSchemaNameLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxSchemaNameLength();
     }
 
@@ -487,7 +487,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxStatementLength() throws Exception {
         try {
             delegate.getMaxStatementLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxStatementLength();
     }
 
@@ -495,7 +495,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxStatements() throws Exception {
         try {
             delegate.getMaxStatements();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxStatements();
     }
 
@@ -503,7 +503,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxTableNameLength() throws Exception {
         try {
             delegate.getMaxTableNameLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxTableNameLength();
     }
 
@@ -511,7 +511,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxTablesInSelect() throws Exception {
         try {
             delegate.getMaxTablesInSelect();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxTablesInSelect();
     }
 
@@ -519,7 +519,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetMaxUserNameLength() throws Exception {
         try {
             delegate.getMaxUserNameLength();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMaxUserNameLength();
     }
 
@@ -527,7 +527,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetNumericFunctions() throws Exception {
         try {
             delegate.getNumericFunctions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getNumericFunctions();
     }
 
@@ -535,7 +535,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetPrimaryKeysStringStringString() throws Exception {
         try {
             delegate.getPrimaryKeys("foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getPrimaryKeys("foo","foo","foo");
     }
 
@@ -543,7 +543,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetProcedureColumnsStringStringStringString() throws Exception {
         try {
             delegate.getProcedureColumns("foo","foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getProcedureColumns("foo","foo","foo","foo");
     }
 
@@ -551,7 +551,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetProcedureTerm() throws Exception {
         try {
             delegate.getProcedureTerm();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getProcedureTerm();
     }
 
@@ -559,7 +559,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetProceduresStringStringString() throws Exception {
         try {
             delegate.getProcedures("foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getProcedures("foo","foo","foo");
     }
 
@@ -567,7 +567,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetPseudoColumnsStringStringStringString() throws Exception {
         try {
             delegate.getPseudoColumns("foo","foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getPseudoColumns("foo","foo","foo","foo");
     }
 
@@ -575,7 +575,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetResultSetHoldability() throws Exception {
         try {
             delegate.getResultSetHoldability();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getResultSetHoldability();
     }
 
@@ -583,7 +583,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetRowIdLifetime() throws Exception {
         try {
             delegate.getRowIdLifetime();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getRowIdLifetime();
     }
 
@@ -591,7 +591,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetSQLKeywords() throws Exception {
         try {
             delegate.getSQLKeywords();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getSQLKeywords();
     }
 
@@ -599,7 +599,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetSQLStateType() throws Exception {
         try {
             delegate.getSQLStateType();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getSQLStateType();
     }
 
@@ -607,7 +607,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetSchemaTerm() throws Exception {
         try {
             delegate.getSchemaTerm();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getSchemaTerm();
     }
 
@@ -615,7 +615,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetSchemasStringString() throws Exception {
         try {
             delegate.getSchemas("foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getSchemas("foo","foo");
     }
 
@@ -623,7 +623,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetSchemas() throws Exception {
         try {
             delegate.getSchemas();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getSchemas();
     }
 
@@ -631,7 +631,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetSearchStringEscape() throws Exception {
         try {
             delegate.getSearchStringEscape();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getSearchStringEscape();
     }
 
@@ -639,7 +639,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetStringFunctions() throws Exception {
         try {
             delegate.getStringFunctions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getStringFunctions();
     }
 
@@ -647,7 +647,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetSuperTablesStringStringString() throws Exception {
         try {
             delegate.getSuperTables("foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getSuperTables("foo","foo","foo");
     }
 
@@ -655,7 +655,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetSuperTypesStringStringString() throws Exception {
         try {
             delegate.getSuperTypes("foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getSuperTypes("foo","foo","foo");
     }
 
@@ -663,7 +663,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetSystemFunctions() throws Exception {
         try {
             delegate.getSystemFunctions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getSystemFunctions();
     }
 
@@ -671,7 +671,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetTablePrivilegesStringStringString() throws Exception {
         try {
             delegate.getTablePrivileges("foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getTablePrivileges("foo","foo","foo");
     }
 
@@ -679,7 +679,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetTableTypes() throws Exception {
         try {
             delegate.getTableTypes();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getTableTypes();
     }
 
@@ -687,7 +687,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetTablesStringStringStringStringArray() throws Exception {
         try {
             delegate.getTables("foo","foo","foo",(String[]) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getTables("foo","foo","foo",(String[]) null);
     }
 
@@ -695,7 +695,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetTimeDateFunctions() throws Exception {
         try {
             delegate.getTimeDateFunctions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getTimeDateFunctions();
     }
 
@@ -703,7 +703,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetTypeInfo() throws Exception {
         try {
             delegate.getTypeInfo();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getTypeInfo();
     }
 
@@ -711,7 +711,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetUDTsStringStringStringIntegerArray() throws Exception {
         try {
             delegate.getUDTs("foo","foo","foo",(int[]) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getUDTs("foo","foo","foo",(int[]) null);
     }
 
@@ -719,7 +719,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetURL() throws Exception {
         try {
             delegate.getURL();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getURL();
     }
 
@@ -727,7 +727,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetUserName() throws Exception {
         try {
             delegate.getUserName();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getUserName();
     }
 
@@ -735,7 +735,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testGetVersionColumnsStringStringString() throws Exception {
         try {
             delegate.getVersionColumns("foo","foo","foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getVersionColumns("foo","foo","foo");
     }
 
@@ -743,7 +743,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testInsertsAreDetectedInteger() throws Exception {
         try {
             delegate.insertsAreDetected(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).insertsAreDetected(1);
     }
 
@@ -751,7 +751,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testIsCatalogAtStart() throws Exception {
         try {
             delegate.isCatalogAtStart();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).isCatalogAtStart();
     }
 
@@ -759,7 +759,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testIsReadOnly() throws Exception {
         try {
             delegate.isReadOnly();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).isReadOnly();
     }
 
@@ -767,7 +767,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testLocatorsUpdateCopy() throws Exception {
         try {
             delegate.locatorsUpdateCopy();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).locatorsUpdateCopy();
     }
 
@@ -775,7 +775,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testNullPlusNonNullIsNull() throws Exception {
         try {
             delegate.nullPlusNonNullIsNull();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).nullPlusNonNullIsNull();
     }
 
@@ -783,7 +783,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testNullsAreSortedAtEnd() throws Exception {
         try {
             delegate.nullsAreSortedAtEnd();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).nullsAreSortedAtEnd();
     }
 
@@ -791,7 +791,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testNullsAreSortedAtStart() throws Exception {
         try {
             delegate.nullsAreSortedAtStart();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).nullsAreSortedAtStart();
     }
 
@@ -799,7 +799,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testNullsAreSortedHigh() throws Exception {
         try {
             delegate.nullsAreSortedHigh();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).nullsAreSortedHigh();
     }
 
@@ -807,7 +807,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testNullsAreSortedLow() throws Exception {
         try {
             delegate.nullsAreSortedLow();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).nullsAreSortedLow();
     }
 
@@ -815,7 +815,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testOthersDeletesAreVisibleInteger() throws Exception {
         try {
             delegate.othersDeletesAreVisible(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).othersDeletesAreVisible(1);
     }
 
@@ -823,7 +823,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testOthersInsertsAreVisibleInteger() throws Exception {
         try {
             delegate.othersInsertsAreVisible(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).othersInsertsAreVisible(1);
     }
 
@@ -831,7 +831,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testOthersUpdatesAreVisibleInteger() throws Exception {
         try {
             delegate.othersUpdatesAreVisible(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).othersUpdatesAreVisible(1);
     }
 
@@ -839,7 +839,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testOwnDeletesAreVisibleInteger() throws Exception {
         try {
             delegate.ownDeletesAreVisible(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).ownDeletesAreVisible(1);
     }
 
@@ -847,7 +847,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testOwnInsertsAreVisibleInteger() throws Exception {
         try {
             delegate.ownInsertsAreVisible(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).ownInsertsAreVisible(1);
     }
 
@@ -855,7 +855,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testOwnUpdatesAreVisibleInteger() throws Exception {
         try {
             delegate.ownUpdatesAreVisible(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).ownUpdatesAreVisible(1);
     }
 
@@ -863,7 +863,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testStoresLowerCaseIdentifiers() throws Exception {
         try {
             delegate.storesLowerCaseIdentifiers();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).storesLowerCaseIdentifiers();
     }
 
@@ -871,7 +871,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testStoresLowerCaseQuotedIdentifiers() throws Exception {
         try {
             delegate.storesLowerCaseQuotedIdentifiers();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).storesLowerCaseQuotedIdentifiers();
     }
 
@@ -879,7 +879,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testStoresMixedCaseIdentifiers() throws Exception {
         try {
             delegate.storesMixedCaseIdentifiers();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).storesMixedCaseIdentifiers();
     }
 
@@ -887,7 +887,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testStoresMixedCaseQuotedIdentifiers() throws Exception {
         try {
             delegate.storesMixedCaseQuotedIdentifiers();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).storesMixedCaseQuotedIdentifiers();
     }
 
@@ -895,7 +895,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testStoresUpperCaseIdentifiers() throws Exception {
         try {
             delegate.storesUpperCaseIdentifiers();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).storesUpperCaseIdentifiers();
     }
 
@@ -903,7 +903,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testStoresUpperCaseQuotedIdentifiers() throws Exception {
         try {
             delegate.storesUpperCaseQuotedIdentifiers();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).storesUpperCaseQuotedIdentifiers();
     }
 
@@ -911,7 +911,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsANSI92EntryLevelSQL() throws Exception {
         try {
             delegate.supportsANSI92EntryLevelSQL();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsANSI92EntryLevelSQL();
     }
 
@@ -919,7 +919,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsANSI92FullSQL() throws Exception {
         try {
             delegate.supportsANSI92FullSQL();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsANSI92FullSQL();
     }
 
@@ -927,7 +927,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsANSI92IntermediateSQL() throws Exception {
         try {
             delegate.supportsANSI92IntermediateSQL();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsANSI92IntermediateSQL();
     }
 
@@ -935,7 +935,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsAlterTableWithAddColumn() throws Exception {
         try {
             delegate.supportsAlterTableWithAddColumn();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsAlterTableWithAddColumn();
     }
 
@@ -943,7 +943,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsAlterTableWithDropColumn() throws Exception {
         try {
             delegate.supportsAlterTableWithDropColumn();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsAlterTableWithDropColumn();
     }
 
@@ -951,7 +951,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsBatchUpdates() throws Exception {
         try {
             delegate.supportsBatchUpdates();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsBatchUpdates();
     }
 
@@ -959,7 +959,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsCatalogsInDataManipulation() throws Exception {
         try {
             delegate.supportsCatalogsInDataManipulation();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsCatalogsInDataManipulation();
     }
 
@@ -967,7 +967,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsCatalogsInIndexDefinitions() throws Exception {
         try {
             delegate.supportsCatalogsInIndexDefinitions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsCatalogsInIndexDefinitions();
     }
 
@@ -975,7 +975,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsCatalogsInPrivilegeDefinitions() throws Exception {
         try {
             delegate.supportsCatalogsInPrivilegeDefinitions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsCatalogsInPrivilegeDefinitions();
     }
 
@@ -983,7 +983,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsCatalogsInProcedureCalls() throws Exception {
         try {
             delegate.supportsCatalogsInProcedureCalls();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsCatalogsInProcedureCalls();
     }
 
@@ -991,7 +991,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsCatalogsInTableDefinitions() throws Exception {
         try {
             delegate.supportsCatalogsInTableDefinitions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsCatalogsInTableDefinitions();
     }
 
@@ -999,7 +999,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsColumnAliasing() throws Exception {
         try {
             delegate.supportsColumnAliasing();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsColumnAliasing();
     }
 
@@ -1007,7 +1007,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsConvertIntegerInteger() throws Exception {
         try {
             delegate.supportsConvert(1,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsConvert(1,1);
     }
 
@@ -1015,7 +1015,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsConvert() throws Exception {
         try {
             delegate.supportsConvert();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsConvert();
     }
 
@@ -1023,7 +1023,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsCoreSQLGrammar() throws Exception {
         try {
             delegate.supportsCoreSQLGrammar();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsCoreSQLGrammar();
     }
 
@@ -1031,7 +1031,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsCorrelatedSubqueries() throws Exception {
         try {
             delegate.supportsCorrelatedSubqueries();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsCorrelatedSubqueries();
     }
 
@@ -1039,7 +1039,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsDataDefinitionAndDataManipulationTransactions() throws Exception {
         try {
             delegate.supportsDataDefinitionAndDataManipulationTransactions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsDataDefinitionAndDataManipulationTransactions();
     }
 
@@ -1047,7 +1047,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsDataManipulationTransactionsOnly() throws Exception {
         try {
             delegate.supportsDataManipulationTransactionsOnly();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsDataManipulationTransactionsOnly();
     }
 
@@ -1055,7 +1055,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsDifferentTableCorrelationNames() throws Exception {
         try {
             delegate.supportsDifferentTableCorrelationNames();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsDifferentTableCorrelationNames();
     }
 
@@ -1063,7 +1063,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsExpressionsInOrderBy() throws Exception {
         try {
             delegate.supportsExpressionsInOrderBy();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsExpressionsInOrderBy();
     }
 
@@ -1071,7 +1071,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsExtendedSQLGrammar() throws Exception {
         try {
             delegate.supportsExtendedSQLGrammar();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsExtendedSQLGrammar();
     }
 
@@ -1079,7 +1079,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsFullOuterJoins() throws Exception {
         try {
             delegate.supportsFullOuterJoins();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsFullOuterJoins();
     }
 
@@ -1087,7 +1087,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsGetGeneratedKeys() throws Exception {
         try {
             delegate.supportsGetGeneratedKeys();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsGetGeneratedKeys();
     }
 
@@ -1095,7 +1095,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsGroupBy() throws Exception {
         try {
             delegate.supportsGroupBy();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsGroupBy();
     }
 
@@ -1103,7 +1103,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsGroupByBeyondSelect() throws Exception {
         try {
             delegate.supportsGroupByBeyondSelect();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsGroupByBeyondSelect();
     }
 
@@ -1111,7 +1111,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsGroupByUnrelated() throws Exception {
         try {
             delegate.supportsGroupByUnrelated();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsGroupByUnrelated();
     }
 
@@ -1119,7 +1119,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsIntegrityEnhancementFacility() throws Exception {
         try {
             delegate.supportsIntegrityEnhancementFacility();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsIntegrityEnhancementFacility();
     }
 
@@ -1127,7 +1127,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsLikeEscapeClause() throws Exception {
         try {
             delegate.supportsLikeEscapeClause();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsLikeEscapeClause();
     }
 
@@ -1135,7 +1135,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsLimitedOuterJoins() throws Exception {
         try {
             delegate.supportsLimitedOuterJoins();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsLimitedOuterJoins();
     }
 
@@ -1143,7 +1143,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsMinimumSQLGrammar() throws Exception {
         try {
             delegate.supportsMinimumSQLGrammar();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsMinimumSQLGrammar();
     }
 
@@ -1151,7 +1151,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsMixedCaseIdentifiers() throws Exception {
         try {
             delegate.supportsMixedCaseIdentifiers();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsMixedCaseIdentifiers();
     }
 
@@ -1159,7 +1159,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsMixedCaseQuotedIdentifiers() throws Exception {
         try {
             delegate.supportsMixedCaseQuotedIdentifiers();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsMixedCaseQuotedIdentifiers();
     }
 
@@ -1167,7 +1167,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsMultipleOpenResults() throws Exception {
         try {
             delegate.supportsMultipleOpenResults();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsMultipleOpenResults();
     }
 
@@ -1175,7 +1175,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsMultipleResultSets() throws Exception {
         try {
             delegate.supportsMultipleResultSets();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsMultipleResultSets();
     }
 
@@ -1183,7 +1183,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsMultipleTransactions() throws Exception {
         try {
             delegate.supportsMultipleTransactions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsMultipleTransactions();
     }
 
@@ -1191,7 +1191,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsNamedParameters() throws Exception {
         try {
             delegate.supportsNamedParameters();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsNamedParameters();
     }
 
@@ -1199,7 +1199,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsNonNullableColumns() throws Exception {
         try {
             delegate.supportsNonNullableColumns();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsNonNullableColumns();
     }
 
@@ -1207,7 +1207,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsOpenCursorsAcrossCommit() throws Exception {
         try {
             delegate.supportsOpenCursorsAcrossCommit();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsOpenCursorsAcrossCommit();
     }
 
@@ -1215,7 +1215,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsOpenCursorsAcrossRollback() throws Exception {
         try {
             delegate.supportsOpenCursorsAcrossRollback();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsOpenCursorsAcrossRollback();
     }
 
@@ -1223,7 +1223,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsOpenStatementsAcrossCommit() throws Exception {
         try {
             delegate.supportsOpenStatementsAcrossCommit();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsOpenStatementsAcrossCommit();
     }
 
@@ -1231,7 +1231,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsOpenStatementsAcrossRollback() throws Exception {
         try {
             delegate.supportsOpenStatementsAcrossRollback();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsOpenStatementsAcrossRollback();
     }
 
@@ -1239,7 +1239,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsOrderByUnrelated() throws Exception {
         try {
             delegate.supportsOrderByUnrelated();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsOrderByUnrelated();
     }
 
@@ -1247,7 +1247,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsOuterJoins() throws Exception {
         try {
             delegate.supportsOuterJoins();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsOuterJoins();
     }
 
@@ -1255,7 +1255,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsPositionedDelete() throws Exception {
         try {
             delegate.supportsPositionedDelete();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsPositionedDelete();
     }
 
@@ -1263,7 +1263,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsPositionedUpdate() throws Exception {
         try {
             delegate.supportsPositionedUpdate();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsPositionedUpdate();
     }
 
@@ -1271,7 +1271,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsRefCursors() throws Exception {
         try {
             delegate.supportsRefCursors();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsRefCursors();
     }
 
@@ -1279,7 +1279,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsResultSetConcurrencyIntegerInteger() throws Exception {
         try {
             delegate.supportsResultSetConcurrency(1,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsResultSetConcurrency(1,1);
     }
 
@@ -1287,7 +1287,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsResultSetHoldabilityInteger() throws Exception {
         try {
             delegate.supportsResultSetHoldability(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsResultSetHoldability(1);
     }
 
@@ -1295,7 +1295,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsResultSetTypeInteger() throws Exception {
         try {
             delegate.supportsResultSetType(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsResultSetType(1);
     }
 
@@ -1303,7 +1303,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSavepoints() throws Exception {
         try {
             delegate.supportsSavepoints();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSavepoints();
     }
 
@@ -1311,7 +1311,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSchemasInDataManipulation() throws Exception {
         try {
             delegate.supportsSchemasInDataManipulation();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSchemasInDataManipulation();
     }
 
@@ -1319,7 +1319,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSchemasInIndexDefinitions() throws Exception {
         try {
             delegate.supportsSchemasInIndexDefinitions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSchemasInIndexDefinitions();
     }
 
@@ -1327,7 +1327,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSchemasInPrivilegeDefinitions() throws Exception {
         try {
             delegate.supportsSchemasInPrivilegeDefinitions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSchemasInPrivilegeDefinitions();
     }
 
@@ -1335,7 +1335,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSchemasInProcedureCalls() throws Exception {
         try {
             delegate.supportsSchemasInProcedureCalls();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSchemasInProcedureCalls();
     }
 
@@ -1343,7 +1343,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSchemasInTableDefinitions() throws Exception {
         try {
             delegate.supportsSchemasInTableDefinitions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSchemasInTableDefinitions();
     }
 
@@ -1351,7 +1351,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSelectForUpdate() throws Exception {
         try {
             delegate.supportsSelectForUpdate();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSelectForUpdate();
     }
 
@@ -1359,7 +1359,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsStatementPooling() throws Exception {
         try {
             delegate.supportsStatementPooling();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsStatementPooling();
     }
 
@@ -1367,7 +1367,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsStoredFunctionsUsingCallSyntax() throws Exception {
         try {
             delegate.supportsStoredFunctionsUsingCallSyntax();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsStoredFunctionsUsingCallSyntax();
     }
 
@@ -1375,7 +1375,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsStoredProcedures() throws Exception {
         try {
             delegate.supportsStoredProcedures();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsStoredProcedures();
     }
 
@@ -1383,7 +1383,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSubqueriesInComparisons() throws Exception {
         try {
             delegate.supportsSubqueriesInComparisons();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSubqueriesInComparisons();
     }
 
@@ -1391,7 +1391,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSubqueriesInExists() throws Exception {
         try {
             delegate.supportsSubqueriesInExists();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSubqueriesInExists();
     }
 
@@ -1399,7 +1399,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSubqueriesInIns() throws Exception {
         try {
             delegate.supportsSubqueriesInIns();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSubqueriesInIns();
     }
 
@@ -1407,7 +1407,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsSubqueriesInQuantifieds() throws Exception {
         try {
             delegate.supportsSubqueriesInQuantifieds();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsSubqueriesInQuantifieds();
     }
 
@@ -1415,7 +1415,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsTableCorrelationNames() throws Exception {
         try {
             delegate.supportsTableCorrelationNames();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsTableCorrelationNames();
     }
 
@@ -1423,7 +1423,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsTransactionIsolationLevelInteger() throws Exception {
         try {
             delegate.supportsTransactionIsolationLevel(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsTransactionIsolationLevel(1);
     }
 
@@ -1431,7 +1431,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsTransactions() throws Exception {
         try {
             delegate.supportsTransactions();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsTransactions();
     }
 
@@ -1439,7 +1439,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsUnion() throws Exception {
         try {
             delegate.supportsUnion();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsUnion();
     }
 
@@ -1447,7 +1447,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testSupportsUnionAll() throws Exception {
         try {
             delegate.supportsUnionAll();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).supportsUnionAll();
     }
 
@@ -1455,7 +1455,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testUpdatesAreDetectedInteger() throws Exception {
         try {
             delegate.updatesAreDetected(1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).updatesAreDetected(1);
     }
 
@@ -1463,7 +1463,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testUsesLocalFilePerTable() throws Exception {
         try {
             delegate.usesLocalFilePerTable();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).usesLocalFilePerTable();
     }
 
@@ -1471,7 +1471,7 @@ public class TestDelegatingDatabaseMetaData {
     public void testUsesLocalFiles() throws Exception {
         try {
             delegate.usesLocalFiles();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).usesLocalFiles();
     }
 

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
index af60ae2..4bd7162 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
@@ -71,7 +71,7 @@ public class TestDelegatingPreparedStatement {
     public void testAddBatch() throws Exception {
         try {
             delegate.addBatch();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).addBatch();
     }
 
@@ -79,7 +79,7 @@ public class TestDelegatingPreparedStatement {
     public void testClearParameters() throws Exception {
         try {
             delegate.clearParameters();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).clearParameters();
     }
 
@@ -87,7 +87,7 @@ public class TestDelegatingPreparedStatement {
     public void testExecute() throws Exception {
         try {
             delegate.execute();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).execute();
     }
 
@@ -95,7 +95,7 @@ public class TestDelegatingPreparedStatement {
     public void testExecuteLargeUpdate() throws Exception {
         try {
             delegate.executeLargeUpdate();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).executeLargeUpdate();
     }
 
@@ -103,7 +103,7 @@ public class TestDelegatingPreparedStatement {
     public void testExecuteQuery() throws Exception {
         try {
             delegate.executeQuery();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).executeQuery();
     }
 
@@ -111,7 +111,7 @@ public class TestDelegatingPreparedStatement {
     public void testExecuteUpdate() throws Exception {
         try {
             delegate.executeUpdate();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).executeUpdate();
     }
 
@@ -119,7 +119,7 @@ public class TestDelegatingPreparedStatement {
     public void testGetMetaData() throws Exception {
         try {
             delegate.getMetaData();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getMetaData();
     }
 
@@ -127,7 +127,7 @@ public class TestDelegatingPreparedStatement {
     public void testGetParameterMetaData() throws Exception {
         try {
             delegate.getParameterMetaData();
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).getParameterMetaData();
     }
 
@@ -135,7 +135,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetArrayIntegerArray() throws Exception {
         try {
             delegate.setArray(1,(java.sql.Array) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setArray(1,(java.sql.Array) null);
     }
 
@@ -143,7 +143,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetAsciiStreamIntegerInputStreamLong() throws Exception {
         try {
             delegate.setAsciiStream(1,(java.io.InputStream) null,1l);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setAsciiStream(1,(java.io.InputStream) null,1l);
     }
 
@@ -151,7 +151,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetAsciiStreamIntegerInputStreamInteger() throws Exception {
         try {
             delegate.setAsciiStream(1,(java.io.InputStream) null,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setAsciiStream(1,(java.io.InputStream) null,1);
     }
 
@@ -159,7 +159,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetAsciiStreamIntegerInputStream() throws Exception {
         try {
             delegate.setAsciiStream(1,(java.io.InputStream) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setAsciiStream(1,(java.io.InputStream) null);
     }
 
@@ -167,7 +167,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetBigDecimalIntegerBigDecimal() throws Exception {
         try {
             delegate.setBigDecimal(1,java.math.BigDecimal.valueOf(1.0d));
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setBigDecimal(1,java.math.BigDecimal.valueOf(1.0d));
     }
 
@@ -175,7 +175,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetBinaryStreamIntegerInputStreamLong() throws Exception {
         try {
             delegate.setBinaryStream(1,(java.io.InputStream) null,1l);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setBinaryStream(1,(java.io.InputStream) null,1l);
     }
 
@@ -183,7 +183,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetBinaryStreamIntegerInputStream() throws Exception {
         try {
             delegate.setBinaryStream(1,(java.io.InputStream) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setBinaryStream(1,(java.io.InputStream) null);
     }
 
@@ -191,7 +191,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetBinaryStreamIntegerInputStreamInteger() throws Exception {
         try {
             delegate.setBinaryStream(1,(java.io.InputStream) null,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setBinaryStream(1,(java.io.InputStream) null,1);
     }
 
@@ -199,7 +199,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetBlobIntegerBlob() throws Exception {
         try {
             delegate.setBlob(1,(java.sql.Blob) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setBlob(1,(java.sql.Blob) null);
     }
 
@@ -207,7 +207,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetBlobIntegerInputStream() throws Exception {
         try {
             delegate.setBlob(1,(java.io.InputStream) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setBlob(1,(java.io.InputStream) null);
     }
 
@@ -215,7 +215,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetBlobIntegerInputStreamLong() throws Exception {
         try {
             delegate.setBlob(1,(java.io.InputStream) null,1l);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setBlob(1,(java.io.InputStream) null,1l);
     }
 
@@ -223,7 +223,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetBooleanIntegerBoolean() throws Exception {
         try {
             delegate.setBoolean(1,Boolean.TRUE);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setBoolean(1,Boolean.TRUE);
     }
 
@@ -231,7 +231,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetByteIntegerByte() throws Exception {
         try {
             delegate.setByte(1,(byte) 1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setByte(1,(byte) 1);
     }
 
@@ -239,7 +239,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetBytesIntegerByteArray() throws Exception {
         try {
             delegate.setBytes(1,new byte[] { 1 });
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setBytes(1,new byte[] { 1 });
     }
 
@@ -247,7 +247,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetCharacterStreamIntegerReader() throws Exception {
         try {
             delegate.setCharacterStream(1,(java.io.StringReader) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setCharacterStream(1,(java.io.StringReader) null);
     }
 
@@ -255,7 +255,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetCharacterStreamIntegerReaderInteger() throws Exception {
         try {
             delegate.setCharacterStream(1,(java.io.StringReader) null,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setCharacterStream(1,(java.io.StringReader) null,1);
     }
 
@@ -263,7 +263,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetCharacterStreamIntegerReaderLong() throws Exception {
         try {
             delegate.setCharacterStream(1,(java.io.StringReader) null,1l);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setCharacterStream(1,(java.io.StringReader) null,1l);
     }
 
@@ -271,7 +271,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetClobIntegerClob() throws Exception {
         try {
             delegate.setClob(1,(java.sql.Clob) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setClob(1,(java.sql.Clob) null);
     }
 
@@ -279,7 +279,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetClobIntegerReaderLong() throws Exception {
         try {
             delegate.setClob(1,(java.io.StringReader) null,1l);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setClob(1,(java.io.StringReader) null,1l);
     }
 
@@ -287,7 +287,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetClobIntegerReader() throws Exception {
         try {
             delegate.setClob(1,(java.io.StringReader) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setClob(1,(java.io.StringReader) null);
     }
 
@@ -295,7 +295,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetDateIntegerSqlDateCalendar() throws Exception {
         try {
             delegate.setDate(1,new java.sql.Date(1529827548745l),(java.util.Calendar) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setDate(1,new java.sql.Date(1529827548745l),(java.util.Calendar) null);
     }
 
@@ -303,7 +303,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetDateIntegerSqlDate() throws Exception {
         try {
             delegate.setDate(1,new java.sql.Date(1529827548745l));
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setDate(1,new java.sql.Date(1529827548745l));
     }
 
@@ -311,7 +311,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetDoubleIntegerDouble() throws Exception {
         try {
             delegate.setDouble(1,1.0d);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setDouble(1,1.0d);
     }
 
@@ -319,7 +319,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetFloatIntegerFloat() throws Exception {
         try {
             delegate.setFloat(1,1.0f);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setFloat(1,1.0f);
     }
 
@@ -327,7 +327,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetIntIntegerInteger() throws Exception {
         try {
             delegate.setInt(1,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setInt(1,1);
     }
 
@@ -335,7 +335,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetLongIntegerLong() throws Exception {
         try {
             delegate.setLong(1,1l);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setLong(1,1l);
     }
 
@@ -343,7 +343,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetNCharacterStreamIntegerReader() throws Exception {
         try {
             delegate.setNCharacterStream(1,(java.io.StringReader) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setNCharacterStream(1,(java.io.StringReader) null);
     }
 
@@ -351,7 +351,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetNCharacterStreamIntegerReaderLong() throws Exception {
         try {
             delegate.setNCharacterStream(1,(java.io.StringReader) null,1l);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setNCharacterStream(1,(java.io.StringReader) null,1l);
     }
 
@@ -359,7 +359,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetNClobIntegerNClob() throws Exception {
         try {
             delegate.setNClob(1,(java.sql.NClob) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setNClob(1,(java.sql.NClob) null);
     }
 
@@ -367,7 +367,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetNClobIntegerReader() throws Exception {
         try {
             delegate.setNClob(1,(java.io.StringReader) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setNClob(1,(java.io.StringReader) null);
     }
 
@@ -375,7 +375,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetNClobIntegerReaderLong() throws Exception {
         try {
             delegate.setNClob(1,(java.io.StringReader) null,1l);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setNClob(1,(java.io.StringReader) null,1l);
     }
 
@@ -383,7 +383,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetNStringIntegerString() throws Exception {
         try {
             delegate.setNString(1,"foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setNString(1,"foo");
     }
 
@@ -391,7 +391,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetNullIntegerIntegerString() throws Exception {
         try {
             delegate.setNull(1,1,"foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setNull(1,1,"foo");
     }
 
@@ -399,7 +399,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetNullIntegerInteger() throws Exception {
         try {
             delegate.setNull(1,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setNull(1,1);
     }
 
@@ -407,7 +407,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetObjectIntegerObjectSQLType() throws Exception {
         try {
             delegate.setObject(1,System.err,(java.sql.SQLType) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setObject(1,System.err,(java.sql.SQLType) null);
     }
 
@@ -415,7 +415,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetObjectIntegerObjectSQLTypeInteger() throws Exception {
         try {
             delegate.setObject(1,System.err,(java.sql.SQLType) null,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setObject(1,System.err,(java.sql.SQLType) null,1);
     }
 
@@ -423,7 +423,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetObjectIntegerObjectIntegerInteger() throws Exception {
         try {
             delegate.setObject(1,System.err,1,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setObject(1,System.err,1,1);
     }
 
@@ -431,7 +431,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetObjectIntegerObjectInteger() throws Exception {
         try {
             delegate.setObject(1,System.err,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setObject(1,System.err,1);
     }
 
@@ -439,7 +439,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetObjectIntegerObject() throws Exception {
         try {
             delegate.setObject(1,System.err);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setObject(1,System.err);
     }
 
@@ -447,7 +447,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetRefIntegerRef() throws Exception {
         try {
             delegate.setRef(1,(java.sql.Ref) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setRef(1,(java.sql.Ref) null);
     }
 
@@ -455,7 +455,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetRowIdIntegerRowId() throws Exception {
         try {
             delegate.setRowId(1,(java.sql.RowId) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setRowId(1,(java.sql.RowId) null);
     }
 
@@ -463,7 +463,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetSQLXMLIntegerSQLXML() throws Exception {
         try {
             delegate.setSQLXML(1,(java.sql.SQLXML) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setSQLXML(1,(java.sql.SQLXML) null);
     }
 
@@ -471,7 +471,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetShortIntegerShort() throws Exception {
         try {
             delegate.setShort(1,(short) 1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setShort(1,(short) 1);
     }
 
@@ -479,7 +479,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetStringIntegerString() throws Exception {
         try {
             delegate.setString(1,"foo");
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setString(1,"foo");
     }
 
@@ -487,7 +487,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetTimeIntegerTime() throws Exception {
         try {
             delegate.setTime(1,(java.sql.Time) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setTime(1,(java.sql.Time) null);
     }
 
@@ -495,7 +495,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetTimeIntegerTimeCalendar() throws Exception {
         try {
             delegate.setTime(1,(java.sql.Time) null,(java.util.Calendar) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setTime(1,(java.sql.Time) null,(java.util.Calendar) null);
     }
 
@@ -503,7 +503,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetTimestampIntegerTimestamp() throws Exception {
         try {
             delegate.setTimestamp(1,(java.sql.Timestamp) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setTimestamp(1,(java.sql.Timestamp) null);
     }
 
@@ -511,7 +511,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetTimestampIntegerTimestampCalendar() throws Exception {
         try {
             delegate.setTimestamp(1,(java.sql.Timestamp) null,(java.util.Calendar) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setTimestamp(1,(java.sql.Timestamp) null,(java.util.Calendar) null);
     }
 
@@ -519,7 +519,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetURLIntegerUrl() throws Exception {
         try {
             delegate.setURL(1,(java.net.URL) null);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setURL(1,(java.net.URL) null);
     }
 
@@ -527,7 +527,7 @@ public class TestDelegatingPreparedStatement {
     public void testSetUnicodeStreamIntegerInputStreamInteger() throws Exception {
         try {
             delegate.setUnicodeStream(1,(java.io.InputStream) null,1);
-        } catch (SQLException e) {}
+        } catch (final SQLException e) {}
         verify(obj, times(1)).setUnicodeStream(1,(java.io.InputStream) null,1);
     }
 


[2/4] commons-dbcp git commit: Use final.

Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
index f677fde..1d79129 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
@@ -56,7 +56,7 @@ public class TestDelegatingResultSet {
     public void testAbsolutes() throws Exception {
         try {
             delegate.absolute(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).absolute(1);
     }
@@ -65,7 +65,7 @@ public class TestDelegatingResultSet {
     public void testAbsoluteInteger() throws Exception {
         try {
             delegate.absolute(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).absolute(1);
     }
@@ -74,7 +74,7 @@ public class TestDelegatingResultSet {
     public void testAfterLast() throws Exception {
         try {
             delegate.afterLast();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).afterLast();
     }
@@ -83,7 +83,7 @@ public class TestDelegatingResultSet {
     public void testBeforeFirst() throws Exception {
         try {
             delegate.beforeFirst();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).beforeFirst();
     }
@@ -92,7 +92,7 @@ public class TestDelegatingResultSet {
     public void testCancelRowUpdates() throws Exception {
         try {
             delegate.cancelRowUpdates();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).cancelRowUpdates();
     }
@@ -101,7 +101,7 @@ public class TestDelegatingResultSet {
     public void testClearWarnings() throws Exception {
         try {
             delegate.clearWarnings();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).clearWarnings();
     }
@@ -110,7 +110,7 @@ public class TestDelegatingResultSet {
     public void testClose() throws Exception {
         try {
             delegate.close();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).close();
     }
@@ -119,7 +119,7 @@ public class TestDelegatingResultSet {
     public void testDeleteRow() throws Exception {
         try {
             delegate.deleteRow();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).deleteRow();
     }
@@ -128,7 +128,7 @@ public class TestDelegatingResultSet {
     public void testFindColumnString() throws Exception {
         try {
             delegate.findColumn("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).findColumn("foo");
     }
@@ -137,7 +137,7 @@ public class TestDelegatingResultSet {
     public void testFirst() throws Exception {
         try {
             delegate.first();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).first();
     }
@@ -146,7 +146,7 @@ public class TestDelegatingResultSet {
     public void testGetArrayInteger() throws Exception {
         try {
             delegate.getArray(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getArray(1);
     }
@@ -155,7 +155,7 @@ public class TestDelegatingResultSet {
     public void testGetArrayString() throws Exception {
         try {
             delegate.getArray("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getArray("foo");
     }
@@ -164,7 +164,7 @@ public class TestDelegatingResultSet {
     public void testGetAsciiStreamInteger() throws Exception {
         try {
             delegate.getAsciiStream(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getAsciiStream(1);
     }
@@ -173,7 +173,7 @@ public class TestDelegatingResultSet {
     public void testGetAsciiStreamString() throws Exception {
         try {
             delegate.getAsciiStream("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getAsciiStream("foo");
     }
@@ -184,7 +184,7 @@ public class TestDelegatingResultSet {
     public void testGetBigDecimalStringInteger() throws Exception {
         try {
             delegate.getBigDecimal("foo", 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBigDecimal("foo", 1);
     }
@@ -195,7 +195,7 @@ public class TestDelegatingResultSet {
     public void testGetBigDecimalIntegerInteger() throws Exception {
         try {
             delegate.getBigDecimal(1, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBigDecimal(1, 1);
     }
@@ -204,7 +204,7 @@ public class TestDelegatingResultSet {
     public void testGetBigDecimalInteger() throws Exception {
         try {
             delegate.getBigDecimal(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBigDecimal(1);
     }
@@ -213,7 +213,7 @@ public class TestDelegatingResultSet {
     public void testGetBigDecimalString() throws Exception {
         try {
             delegate.getBigDecimal("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBigDecimal("foo");
     }
@@ -222,7 +222,7 @@ public class TestDelegatingResultSet {
     public void testGetBinaryStreamString() throws Exception {
         try {
             delegate.getBinaryStream("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBinaryStream("foo");
     }
@@ -231,7 +231,7 @@ public class TestDelegatingResultSet {
     public void testGetBinaryStreamInteger() throws Exception {
         try {
             delegate.getBinaryStream(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBinaryStream(1);
     }
@@ -240,7 +240,7 @@ public class TestDelegatingResultSet {
     public void testGetBlobString() throws Exception {
         try {
             delegate.getBlob("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBlob("foo");
     }
@@ -249,7 +249,7 @@ public class TestDelegatingResultSet {
     public void testGetBlobInteger() throws Exception {
         try {
             delegate.getBlob(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBlob(1);
     }
@@ -258,7 +258,7 @@ public class TestDelegatingResultSet {
     public void testGetBooleanInteger() throws Exception {
         try {
             delegate.getBoolean(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBoolean(1);
     }
@@ -267,7 +267,7 @@ public class TestDelegatingResultSet {
     public void testGetBooleanString() throws Exception {
         try {
             delegate.getBoolean("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBoolean("foo");
     }
@@ -276,7 +276,7 @@ public class TestDelegatingResultSet {
     public void testGetByteString() throws Exception {
         try {
             delegate.getByte("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getByte("foo");
     }
@@ -285,7 +285,7 @@ public class TestDelegatingResultSet {
     public void testGetByteInteger() throws Exception {
         try {
             delegate.getByte(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getByte(1);
     }
@@ -294,7 +294,7 @@ public class TestDelegatingResultSet {
     public void testGetBytesInteger() throws Exception {
         try {
             delegate.getBytes(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBytes(1);
     }
@@ -303,7 +303,7 @@ public class TestDelegatingResultSet {
     public void testGetBytesString() throws Exception {
         try {
             delegate.getBytes("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getBytes("foo");
     }
@@ -312,7 +312,7 @@ public class TestDelegatingResultSet {
     public void testGetCharacterStreamString() throws Exception {
         try {
             delegate.getCharacterStream("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getCharacterStream("foo");
     }
@@ -321,7 +321,7 @@ public class TestDelegatingResultSet {
     public void testGetCharacterStreamInteger() throws Exception {
         try {
             delegate.getCharacterStream(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getCharacterStream(1);
     }
@@ -330,7 +330,7 @@ public class TestDelegatingResultSet {
     public void testGetClobInteger() throws Exception {
         try {
             delegate.getClob(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getClob(1);
     }
@@ -339,7 +339,7 @@ public class TestDelegatingResultSet {
     public void testGetClobString() throws Exception {
         try {
             delegate.getClob("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getClob("foo");
     }
@@ -348,7 +348,7 @@ public class TestDelegatingResultSet {
     public void testGetConcurrency() throws Exception {
         try {
             delegate.getConcurrency();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getConcurrency();
     }
@@ -357,7 +357,7 @@ public class TestDelegatingResultSet {
     public void testGetCursorName() throws Exception {
         try {
             delegate.getCursorName();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getCursorName();
     }
@@ -366,7 +366,7 @@ public class TestDelegatingResultSet {
     public void testGetDateInteger() throws Exception {
         try {
             delegate.getDate(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getDate(1);
     }
@@ -375,7 +375,7 @@ public class TestDelegatingResultSet {
     public void testGetDateString() throws Exception {
         try {
             delegate.getDate("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getDate("foo");
     }
@@ -384,7 +384,7 @@ public class TestDelegatingResultSet {
     public void testGetDateStringCalendar() throws Exception {
         try {
             delegate.getDate("foo", (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getDate("foo", (java.util.Calendar) null);
     }
@@ -393,7 +393,7 @@ public class TestDelegatingResultSet {
     public void testGetDateIntegerCalendar() throws Exception {
         try {
             delegate.getDate(1, (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getDate(1, (java.util.Calendar) null);
     }
@@ -402,7 +402,7 @@ public class TestDelegatingResultSet {
     public void testGetDoubleString() throws Exception {
         try {
             delegate.getDouble("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getDouble("foo");
     }
@@ -411,7 +411,7 @@ public class TestDelegatingResultSet {
     public void testGetDoubleInteger() throws Exception {
         try {
             delegate.getDouble(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getDouble(1);
     }
@@ -420,7 +420,7 @@ public class TestDelegatingResultSet {
     public void testGetFetchDirection() throws Exception {
         try {
             delegate.getFetchDirection();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getFetchDirection();
     }
@@ -429,7 +429,7 @@ public class TestDelegatingResultSet {
     public void testGetFetchSize() throws Exception {
         try {
             delegate.getFetchSize();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getFetchSize();
     }
@@ -438,7 +438,7 @@ public class TestDelegatingResultSet {
     public void testGetFloatString() throws Exception {
         try {
             delegate.getFloat("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getFloat("foo");
     }
@@ -447,7 +447,7 @@ public class TestDelegatingResultSet {
     public void testGetFloatInteger() throws Exception {
         try {
             delegate.getFloat(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getFloat(1);
     }
@@ -456,7 +456,7 @@ public class TestDelegatingResultSet {
     public void testGetHoldability() throws Exception {
         try {
             delegate.getHoldability();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getHoldability();
     }
@@ -465,7 +465,7 @@ public class TestDelegatingResultSet {
     public void testGetIntInteger() throws Exception {
         try {
             delegate.getInt(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getInt(1);
     }
@@ -474,7 +474,7 @@ public class TestDelegatingResultSet {
     public void testGetIntString() throws Exception {
         try {
             delegate.getInt("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getInt("foo");
     }
@@ -483,7 +483,7 @@ public class TestDelegatingResultSet {
     public void testGetLongInteger() throws Exception {
         try {
             delegate.getLong(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getLong(1);
     }
@@ -492,7 +492,7 @@ public class TestDelegatingResultSet {
     public void testGetLongString() throws Exception {
         try {
             delegate.getLong("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getLong("foo");
     }
@@ -501,7 +501,7 @@ public class TestDelegatingResultSet {
     public void testGetMetaData() throws Exception {
         try {
             delegate.getMetaData();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getMetaData();
     }
@@ -510,7 +510,7 @@ public class TestDelegatingResultSet {
     public void testGetNCharacterStreamString() throws Exception {
         try {
             delegate.getNCharacterStream("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getNCharacterStream("foo");
     }
@@ -519,7 +519,7 @@ public class TestDelegatingResultSet {
     public void testGetNCharacterStreamInteger() throws Exception {
         try {
             delegate.getNCharacterStream(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getNCharacterStream(1);
     }
@@ -528,7 +528,7 @@ public class TestDelegatingResultSet {
     public void testGetNClobString() throws Exception {
         try {
             delegate.getNClob("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getNClob("foo");
     }
@@ -537,7 +537,7 @@ public class TestDelegatingResultSet {
     public void testGetNClobInteger() throws Exception {
         try {
             delegate.getNClob(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getNClob(1);
     }
@@ -546,7 +546,7 @@ public class TestDelegatingResultSet {
     public void testGetNStringString() throws Exception {
         try {
             delegate.getNString("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getNString("foo");
     }
@@ -555,7 +555,7 @@ public class TestDelegatingResultSet {
     public void testGetNStringInteger() throws Exception {
         try {
             delegate.getNString(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getNString(1);
     }
@@ -564,7 +564,7 @@ public class TestDelegatingResultSet {
     public void testGetObjectIntegerClass() throws Exception {
         try {
             delegate.getObject(1, Object.class);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getObject(1, Object.class);
     }
@@ -573,7 +573,7 @@ public class TestDelegatingResultSet {
     public void testGetObjectIntegerMap() throws Exception {
         try {
             delegate.getObject(1, (java.util.Map) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getObject(1, (java.util.Map) null);
     }
@@ -582,7 +582,7 @@ public class TestDelegatingResultSet {
     public void testGetObjectString() throws Exception {
         try {
             delegate.getObject("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getObject("foo");
     }
@@ -591,7 +591,7 @@ public class TestDelegatingResultSet {
     public void testGetObjectStringMap() throws Exception {
         try {
             delegate.getObject("foo", (java.util.Map) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getObject("foo", (java.util.Map) null);
     }
@@ -600,7 +600,7 @@ public class TestDelegatingResultSet {
     public void testGetObjectInteger() throws Exception {
         try {
             delegate.getObject(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getObject(1);
     }
@@ -609,7 +609,7 @@ public class TestDelegatingResultSet {
     public void testGetObjectStringClass() throws Exception {
         try {
             delegate.getObject("foo", Object.class);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getObject("foo", Object.class);
     }
@@ -618,7 +618,7 @@ public class TestDelegatingResultSet {
     public void testGetRefInteger() throws Exception {
         try {
             delegate.getRef(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getRef(1);
     }
@@ -627,7 +627,7 @@ public class TestDelegatingResultSet {
     public void testGetRefString() throws Exception {
         try {
             delegate.getRef("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getRef("foo");
     }
@@ -636,7 +636,7 @@ public class TestDelegatingResultSet {
     public void testGetRow() throws Exception {
         try {
             delegate.getRow();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getRow();
     }
@@ -645,7 +645,7 @@ public class TestDelegatingResultSet {
     public void testGetRowIdString() throws Exception {
         try {
             delegate.getRowId("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getRowId("foo");
     }
@@ -654,7 +654,7 @@ public class TestDelegatingResultSet {
     public void testGetRowIdInteger() throws Exception {
         try {
             delegate.getRowId(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getRowId(1);
     }
@@ -663,7 +663,7 @@ public class TestDelegatingResultSet {
     public void testGetSQLXMLString() throws Exception {
         try {
             delegate.getSQLXML("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getSQLXML("foo");
     }
@@ -672,7 +672,7 @@ public class TestDelegatingResultSet {
     public void testGetSQLXMLInteger() throws Exception {
         try {
             delegate.getSQLXML(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getSQLXML(1);
     }
@@ -681,7 +681,7 @@ public class TestDelegatingResultSet {
     public void testGetShortInteger() throws Exception {
         try {
             delegate.getShort(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getShort(1);
     }
@@ -690,7 +690,7 @@ public class TestDelegatingResultSet {
     public void testGetShortString() throws Exception {
         try {
             delegate.getShort("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getShort("foo");
     }
@@ -706,7 +706,7 @@ public class TestDelegatingResultSet {
     public void testGetStatement() throws Exception {
         try {
             delegate.getStatement();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(0)).getStatement();
     }
@@ -715,7 +715,7 @@ public class TestDelegatingResultSet {
     public void testGetStringInteger() throws Exception {
         try {
             delegate.getString(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getString(1);
     }
@@ -724,7 +724,7 @@ public class TestDelegatingResultSet {
     public void testGetStringString() throws Exception {
         try {
             delegate.getString("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getString("foo");
     }
@@ -733,7 +733,7 @@ public class TestDelegatingResultSet {
     public void testGetTimeInteger() throws Exception {
         try {
             delegate.getTime(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getTime(1);
     }
@@ -742,7 +742,7 @@ public class TestDelegatingResultSet {
     public void testGetTimeIntegerCalendar() throws Exception {
         try {
             delegate.getTime(1, (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getTime(1, (java.util.Calendar) null);
     }
@@ -751,7 +751,7 @@ public class TestDelegatingResultSet {
     public void testGetTimeString() throws Exception {
         try {
             delegate.getTime("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getTime("foo");
     }
@@ -760,7 +760,7 @@ public class TestDelegatingResultSet {
     public void testGetTimeStringCalendar() throws Exception {
         try {
             delegate.getTime("foo", (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getTime("foo", (java.util.Calendar) null);
     }
@@ -769,7 +769,7 @@ public class TestDelegatingResultSet {
     public void testGetTimestampString() throws Exception {
         try {
             delegate.getTimestamp("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getTimestamp("foo");
     }
@@ -778,7 +778,7 @@ public class TestDelegatingResultSet {
     public void testGetTimestampIntegerCalendar() throws Exception {
         try {
             delegate.getTimestamp(1, (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getTimestamp(1, (java.util.Calendar) null);
     }
@@ -787,7 +787,7 @@ public class TestDelegatingResultSet {
     public void testGetTimestampInteger() throws Exception {
         try {
             delegate.getTimestamp(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getTimestamp(1);
     }
@@ -796,7 +796,7 @@ public class TestDelegatingResultSet {
     public void testGetTimestampStringCalendar() throws Exception {
         try {
             delegate.getTimestamp("foo", (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getTimestamp("foo", (java.util.Calendar) null);
     }
@@ -805,7 +805,7 @@ public class TestDelegatingResultSet {
     public void testGetType() throws Exception {
         try {
             delegate.getType();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getType();
     }
@@ -814,7 +814,7 @@ public class TestDelegatingResultSet {
     public void testGetURLInteger() throws Exception {
         try {
             delegate.getURL(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getURL(1);
     }
@@ -823,7 +823,7 @@ public class TestDelegatingResultSet {
     public void testGetURLString() throws Exception {
         try {
             delegate.getURL("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getURL("foo");
     }
@@ -832,7 +832,7 @@ public class TestDelegatingResultSet {
     public void testGetUnicodeStreamString() throws Exception {
         try {
             delegate.getUnicodeStream("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getUnicodeStream("foo");
     }
@@ -841,7 +841,7 @@ public class TestDelegatingResultSet {
     public void testGetUnicodeStreamInteger() throws Exception {
         try {
             delegate.getUnicodeStream(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getUnicodeStream(1);
     }
@@ -850,7 +850,7 @@ public class TestDelegatingResultSet {
     public void testGetWarnings() throws Exception {
         try {
             delegate.getWarnings();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).getWarnings();
     }
@@ -859,7 +859,7 @@ public class TestDelegatingResultSet {
     public void testInsertRow() throws Exception {
         try {
             delegate.insertRow();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).insertRow();
     }
@@ -868,7 +868,7 @@ public class TestDelegatingResultSet {
     public void testIsAfterLast() throws Exception {
         try {
             delegate.isAfterLast();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).isAfterLast();
     }
@@ -877,7 +877,7 @@ public class TestDelegatingResultSet {
     public void testIsBeforeFirst() throws Exception {
         try {
             delegate.isBeforeFirst();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).isBeforeFirst();
     }
@@ -886,7 +886,7 @@ public class TestDelegatingResultSet {
     public void testIsClosed() throws Exception {
         try {
             delegate.isClosed();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).isClosed();
     }
@@ -895,7 +895,7 @@ public class TestDelegatingResultSet {
     public void testIsFirst() throws Exception {
         try {
             delegate.isFirst();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).isFirst();
     }
@@ -904,7 +904,7 @@ public class TestDelegatingResultSet {
     public void testIsLast() throws Exception {
         try {
             delegate.isLast();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).isLast();
     }
@@ -913,7 +913,7 @@ public class TestDelegatingResultSet {
     public void testLast() throws Exception {
         try {
             delegate.last();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).last();
     }
@@ -922,7 +922,7 @@ public class TestDelegatingResultSet {
     public void testMoveToCurrentRow() throws Exception {
         try {
             delegate.moveToCurrentRow();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).moveToCurrentRow();
     }
@@ -931,7 +931,7 @@ public class TestDelegatingResultSet {
     public void testMoveToInsertRow() throws Exception {
         try {
             delegate.moveToInsertRow();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).moveToInsertRow();
     }
@@ -940,7 +940,7 @@ public class TestDelegatingResultSet {
     public void testNext() throws Exception {
         try {
             delegate.next();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).next();
     }
@@ -949,7 +949,7 @@ public class TestDelegatingResultSet {
     public void testPrevious() throws Exception {
         try {
             delegate.previous();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).previous();
     }
@@ -958,7 +958,7 @@ public class TestDelegatingResultSet {
     public void testRefreshRow() throws Exception {
         try {
             delegate.refreshRow();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).refreshRow();
     }
@@ -967,7 +967,7 @@ public class TestDelegatingResultSet {
     public void testRelativeInteger() throws Exception {
         try {
             delegate.relative(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).relative(1);
     }
@@ -976,7 +976,7 @@ public class TestDelegatingResultSet {
     public void testRowDeleted() throws Exception {
         try {
             delegate.rowDeleted();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).rowDeleted();
     }
@@ -985,7 +985,7 @@ public class TestDelegatingResultSet {
     public void testRowInserted() throws Exception {
         try {
             delegate.rowInserted();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).rowInserted();
     }
@@ -994,7 +994,7 @@ public class TestDelegatingResultSet {
     public void testRowUpdated() throws Exception {
         try {
             delegate.rowUpdated();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).rowUpdated();
     }
@@ -1003,7 +1003,7 @@ public class TestDelegatingResultSet {
     public void testSetFetchDirectionInteger() throws Exception {
         try {
             delegate.setFetchDirection(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).setFetchDirection(1);
     }
@@ -1012,7 +1012,7 @@ public class TestDelegatingResultSet {
     public void testSetFetchSizeInteger() throws Exception {
         try {
             delegate.setFetchSize(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).setFetchSize(1);
     }
@@ -1021,7 +1021,7 @@ public class TestDelegatingResultSet {
     public void testUpdateArrayStringArray() throws Exception {
         try {
             delegate.updateArray("foo", (java.sql.Array) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateArray("foo", (java.sql.Array) null);
     }
@@ -1030,7 +1030,7 @@ public class TestDelegatingResultSet {
     public void testUpdateArrayIntegerArray() throws Exception {
         try {
             delegate.updateArray(1, (java.sql.Array) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateArray(1, (java.sql.Array) null);
     }
@@ -1039,7 +1039,7 @@ public class TestDelegatingResultSet {
     public void testUpdateAsciiStreamStringInputStreamInteger() throws Exception {
         try {
             delegate.updateAsciiStream("foo", (java.io.InputStream) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateAsciiStream("foo", (java.io.InputStream) null, 1);
     }
@@ -1048,7 +1048,7 @@ public class TestDelegatingResultSet {
     public void testUpdateAsciiStreamStringInputStreamLong() throws Exception {
         try {
             delegate.updateAsciiStream("foo", (java.io.InputStream) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateAsciiStream("foo", (java.io.InputStream) null, 1l);
     }
@@ -1057,7 +1057,7 @@ public class TestDelegatingResultSet {
     public void testUpdateAsciiStreamIntegerInputStreamInteger() throws Exception {
         try {
             delegate.updateAsciiStream(1, (java.io.InputStream) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateAsciiStream(1, (java.io.InputStream) null, 1);
     }
@@ -1066,7 +1066,7 @@ public class TestDelegatingResultSet {
     public void testUpdateAsciiStreamIntegerInputStream() throws Exception {
         try {
             delegate.updateAsciiStream(1, (java.io.InputStream) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateAsciiStream(1, (java.io.InputStream) null);
     }
@@ -1075,7 +1075,7 @@ public class TestDelegatingResultSet {
     public void testUpdateAsciiStreamIntegerInputStreamLong() throws Exception {
         try {
             delegate.updateAsciiStream(1, (java.io.InputStream) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateAsciiStream(1, (java.io.InputStream) null, 1l);
     }
@@ -1084,7 +1084,7 @@ public class TestDelegatingResultSet {
     public void testUpdateAsciiStreamStringInputStream() throws Exception {
         try {
             delegate.updateAsciiStream("foo", (java.io.InputStream) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateAsciiStream("foo", (java.io.InputStream) null);
     }
@@ -1093,7 +1093,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBigDecimalStringBigDecimal() throws Exception {
         try {
             delegate.updateBigDecimal("foo", java.math.BigDecimal.valueOf(1.0d));
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBigDecimal("foo", java.math.BigDecimal.valueOf(1.0d));
     }
@@ -1102,7 +1102,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBigDecimalIntegerBigDecimal() throws Exception {
         try {
             delegate.updateBigDecimal(1, java.math.BigDecimal.valueOf(1.0d));
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBigDecimal(1, java.math.BigDecimal.valueOf(1.0d));
     }
@@ -1111,7 +1111,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBinaryStreamIntegerInputStream() throws Exception {
         try {
             delegate.updateBinaryStream(1, (java.io.InputStream) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBinaryStream(1, (java.io.InputStream) null);
     }
@@ -1120,7 +1120,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBinaryStreamIntegerInputStreamInteger() throws Exception {
         try {
             delegate.updateBinaryStream(1, (java.io.InputStream) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBinaryStream(1, (java.io.InputStream) null, 1);
     }
@@ -1129,7 +1129,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBinaryStreamIntegerInputStreamLong() throws Exception {
         try {
             delegate.updateBinaryStream(1, (java.io.InputStream) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBinaryStream(1, (java.io.InputStream) null, 1l);
     }
@@ -1138,7 +1138,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBinaryStreamStringInputStreamLong() throws Exception {
         try {
             delegate.updateBinaryStream("foo", (java.io.InputStream) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBinaryStream("foo", (java.io.InputStream) null, 1l);
     }
@@ -1147,7 +1147,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBinaryStreamStringInputStreamInteger() throws Exception {
         try {
             delegate.updateBinaryStream("foo", (java.io.InputStream) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBinaryStream("foo", (java.io.InputStream) null, 1);
     }
@@ -1156,7 +1156,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBinaryStreamStringInputStream() throws Exception {
         try {
             delegate.updateBinaryStream("foo", (java.io.InputStream) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBinaryStream("foo", (java.io.InputStream) null);
     }
@@ -1165,7 +1165,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBlobIntegerBlob() throws Exception {
         try {
             delegate.updateBlob(1, (java.sql.Blob) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBlob(1, (java.sql.Blob) null);
     }
@@ -1174,7 +1174,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBlobStringInputStream() throws Exception {
         try {
             delegate.updateBlob("foo", (java.io.InputStream) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBlob("foo", (java.io.InputStream) null);
     }
@@ -1183,7 +1183,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBlobStringBlob() throws Exception {
         try {
             delegate.updateBlob("foo", (java.sql.Blob) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBlob("foo", (java.sql.Blob) null);
     }
@@ -1192,7 +1192,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBlobStringInputStreamLong() throws Exception {
         try {
             delegate.updateBlob("foo", (java.io.InputStream) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBlob("foo", (java.io.InputStream) null, 1l);
     }
@@ -1201,7 +1201,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBlobIntegerInputStream() throws Exception {
         try {
             delegate.updateBlob(1, (java.io.InputStream) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBlob(1, (java.io.InputStream) null);
     }
@@ -1210,7 +1210,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBlobIntegerInputStreamLong() throws Exception {
         try {
             delegate.updateBlob(1, (java.io.InputStream) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBlob(1, (java.io.InputStream) null, 1l);
     }
@@ -1219,7 +1219,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBooleanIntegerBoolean() throws Exception {
         try {
             delegate.updateBoolean(1, Boolean.TRUE);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBoolean(1, Boolean.TRUE);
     }
@@ -1228,7 +1228,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBooleanStringBoolean() throws Exception {
         try {
             delegate.updateBoolean("foo", Boolean.TRUE);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBoolean("foo", Boolean.TRUE);
     }
@@ -1237,7 +1237,7 @@ public class TestDelegatingResultSet {
     public void testUpdateByteStringByte() throws Exception {
         try {
             delegate.updateByte("foo", (byte) 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateByte("foo", (byte) 1);
     }
@@ -1246,7 +1246,7 @@ public class TestDelegatingResultSet {
     public void testUpdateByteIntegerByte() throws Exception {
         try {
             delegate.updateByte(1, (byte) 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateByte(1, (byte) 1);
     }
@@ -1255,7 +1255,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBytesIntegerByteArray() throws Exception {
         try {
             delegate.updateBytes(1, new byte[] { 1 });
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBytes(1, new byte[] { 1 });
     }
@@ -1264,7 +1264,7 @@ public class TestDelegatingResultSet {
     public void testUpdateBytesStringByteArray() throws Exception {
         try {
             delegate.updateBytes("foo", new byte[] { 1 });
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateBytes("foo", new byte[] { 1 });
     }
@@ -1273,7 +1273,7 @@ public class TestDelegatingResultSet {
     public void testUpdateCharacterStreamIntegerReaderInteger() throws Exception {
         try {
             delegate.updateCharacterStream(1, (java.io.StringReader) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateCharacterStream(1, (java.io.StringReader) null, 1);
     }
@@ -1282,7 +1282,7 @@ public class TestDelegatingResultSet {
     public void testUpdateCharacterStreamIntegerReaderLong() throws Exception {
         try {
             delegate.updateCharacterStream(1, (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateCharacterStream(1, (java.io.StringReader) null, 1l);
     }
@@ -1291,7 +1291,7 @@ public class TestDelegatingResultSet {
     public void testUpdateCharacterStreamStringReaderLong() throws Exception {
         try {
             delegate.updateCharacterStream("foo", (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateCharacterStream("foo", (java.io.StringReader) null, 1l);
     }
@@ -1300,7 +1300,7 @@ public class TestDelegatingResultSet {
     public void testUpdateCharacterStreamIntegerReader() throws Exception {
         try {
             delegate.updateCharacterStream(1, (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateCharacterStream(1, (java.io.StringReader) null);
     }
@@ -1309,7 +1309,7 @@ public class TestDelegatingResultSet {
     public void testUpdateCharacterStreamStringReader() throws Exception {
         try {
             delegate.updateCharacterStream("foo", (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateCharacterStream("foo", (java.io.StringReader) null);
     }
@@ -1318,7 +1318,7 @@ public class TestDelegatingResultSet {
     public void testUpdateCharacterStreamStringReaderInteger() throws Exception {
         try {
             delegate.updateCharacterStream("foo", (java.io.StringReader) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateCharacterStream("foo", (java.io.StringReader) null, 1);
     }
@@ -1327,7 +1327,7 @@ public class TestDelegatingResultSet {
     public void testUpdateClobStringReaderLong() throws Exception {
         try {
             delegate.updateClob("foo", (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateClob("foo", (java.io.StringReader) null, 1l);
     }
@@ -1336,7 +1336,7 @@ public class TestDelegatingResultSet {
     public void testUpdateClobStringReader() throws Exception {
         try {
             delegate.updateClob("foo", (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateClob("foo", (java.io.StringReader) null);
     }
@@ -1345,7 +1345,7 @@ public class TestDelegatingResultSet {
     public void testUpdateClobIntegerReader() throws Exception {
         try {
             delegate.updateClob(1, (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateClob(1, (java.io.StringReader) null);
     }
@@ -1354,7 +1354,7 @@ public class TestDelegatingResultSet {
     public void testUpdateClobIntegerClob() throws Exception {
         try {
             delegate.updateClob(1, (java.sql.Clob) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateClob(1, (java.sql.Clob) null);
     }
@@ -1363,7 +1363,7 @@ public class TestDelegatingResultSet {
     public void testUpdateClobStringClob() throws Exception {
         try {
             delegate.updateClob("foo", (java.sql.Clob) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateClob("foo", (java.sql.Clob) null);
     }
@@ -1372,7 +1372,7 @@ public class TestDelegatingResultSet {
     public void testUpdateClobIntegerReaderLong() throws Exception {
         try {
             delegate.updateClob(1, (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateClob(1, (java.io.StringReader) null, 1l);
     }
@@ -1381,7 +1381,7 @@ public class TestDelegatingResultSet {
     public void testUpdateDateIntegerSqlDate() throws Exception {
         try {
             delegate.updateDate(1, new java.sql.Date(1529827548745l));
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateDate(1, new java.sql.Date(1529827548745l));
     }
@@ -1390,7 +1390,7 @@ public class TestDelegatingResultSet {
     public void testUpdateDateStringSqlDate() throws Exception {
         try {
             delegate.updateDate("foo", new java.sql.Date(1529827548745l));
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateDate("foo", new java.sql.Date(1529827548745l));
     }
@@ -1399,7 +1399,7 @@ public class TestDelegatingResultSet {
     public void testUpdateDoubleIntegerDouble() throws Exception {
         try {
             delegate.updateDouble(1, 1.0d);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateDouble(1, 1.0d);
     }
@@ -1408,7 +1408,7 @@ public class TestDelegatingResultSet {
     public void testUpdateDoubleStringDouble() throws Exception {
         try {
             delegate.updateDouble("foo", 1.0d);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateDouble("foo", 1.0d);
     }
@@ -1417,7 +1417,7 @@ public class TestDelegatingResultSet {
     public void testUpdateFloatStringFloat() throws Exception {
         try {
             delegate.updateFloat("foo", 1.0f);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateFloat("foo", 1.0f);
     }
@@ -1426,7 +1426,7 @@ public class TestDelegatingResultSet {
     public void testUpdateFloatIntegerFloat() throws Exception {
         try {
             delegate.updateFloat(1, 1.0f);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateFloat(1, 1.0f);
     }
@@ -1435,7 +1435,7 @@ public class TestDelegatingResultSet {
     public void testUpdateIntStringInteger() throws Exception {
         try {
             delegate.updateInt("foo", 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateInt("foo", 1);
     }
@@ -1444,7 +1444,7 @@ public class TestDelegatingResultSet {
     public void testUpdateIntIntegerInteger() throws Exception {
         try {
             delegate.updateInt(1, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateInt(1, 1);
     }
@@ -1453,7 +1453,7 @@ public class TestDelegatingResultSet {
     public void testUpdateLongStringLong() throws Exception {
         try {
             delegate.updateLong("foo", 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateLong("foo", 1l);
     }
@@ -1462,7 +1462,7 @@ public class TestDelegatingResultSet {
     public void testUpdateLongIntegerLong() throws Exception {
         try {
             delegate.updateLong(1, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateLong(1, 1l);
     }
@@ -1471,7 +1471,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNCharacterStreamStringReader() throws Exception {
         try {
             delegate.updateNCharacterStream("foo", (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNCharacterStream("foo", (java.io.StringReader) null);
     }
@@ -1480,7 +1480,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNCharacterStreamIntegerReader() throws Exception {
         try {
             delegate.updateNCharacterStream(1, (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNCharacterStream(1, (java.io.StringReader) null);
     }
@@ -1489,7 +1489,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNCharacterStreamStringReaderLong() throws Exception {
         try {
             delegate.updateNCharacterStream("foo", (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNCharacterStream("foo", (java.io.StringReader) null, 1l);
     }
@@ -1498,7 +1498,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNCharacterStreamIntegerReaderLong() throws Exception {
         try {
             delegate.updateNCharacterStream(1, (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNCharacterStream(1, (java.io.StringReader) null, 1l);
     }
@@ -1507,7 +1507,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNClobStringNClob() throws Exception {
         try {
             delegate.updateNClob("foo", (java.sql.NClob) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNClob("foo", (java.sql.NClob) null);
     }
@@ -1516,7 +1516,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNClobIntegerReaderLong() throws Exception {
         try {
             delegate.updateNClob(1, (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNClob(1, (java.io.StringReader) null, 1l);
     }
@@ -1525,7 +1525,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNClobIntegerNClob() throws Exception {
         try {
             delegate.updateNClob(1, (java.sql.NClob) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNClob(1, (java.sql.NClob) null);
     }
@@ -1534,7 +1534,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNClobIntegerReader() throws Exception {
         try {
             delegate.updateNClob(1, (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNClob(1, (java.io.StringReader) null);
     }
@@ -1543,7 +1543,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNClobStringReaderLong() throws Exception {
         try {
             delegate.updateNClob("foo", (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNClob("foo", (java.io.StringReader) null, 1l);
     }
@@ -1552,7 +1552,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNClobStringReader() throws Exception {
         try {
             delegate.updateNClob("foo", (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNClob("foo", (java.io.StringReader) null);
     }
@@ -1561,7 +1561,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNStringIntegerString() throws Exception {
         try {
             delegate.updateNString(1, "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNString(1, "foo");
     }
@@ -1570,7 +1570,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNStringStringString() throws Exception {
         try {
             delegate.updateNString("foo", "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNString("foo", "foo");
     }
@@ -1579,7 +1579,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNullInteger() throws Exception {
         try {
             delegate.updateNull(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNull(1);
     }
@@ -1588,7 +1588,7 @@ public class TestDelegatingResultSet {
     public void testUpdateNullString() throws Exception {
         try {
             delegate.updateNull("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateNull("foo");
     }
@@ -1597,7 +1597,7 @@ public class TestDelegatingResultSet {
     public void testUpdateObjectStringObjectSQLType() throws Exception {
         try {
             delegate.updateObject("foo", System.err, (java.sql.SQLType) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateObject("foo", System.err, (java.sql.SQLType) null);
     }
@@ -1606,7 +1606,7 @@ public class TestDelegatingResultSet {
     public void testUpdateObjectStringObjectSQLTypeInteger() throws Exception {
         try {
             delegate.updateObject("foo", System.err, (java.sql.SQLType) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateObject("foo", System.err, (java.sql.SQLType) null, 1);
     }
@@ -1615,7 +1615,7 @@ public class TestDelegatingResultSet {
     public void testUpdateObjectIntegerObject() throws Exception {
         try {
             delegate.updateObject(1, System.err);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateObject(1, System.err);
     }
@@ -1624,7 +1624,7 @@ public class TestDelegatingResultSet {
     public void testUpdateObjectIntegerObjectSQLTypeInteger() throws Exception {
         try {
             delegate.updateObject(1, System.err, (java.sql.SQLType) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateObject(1, System.err, (java.sql.SQLType) null, 1);
     }
@@ -1635,7 +1635,7 @@ public class TestDelegatingResultSet {
     public void testUpdateObjectStringObjectInteger() throws Exception {
         try {
             delegate.updateObject("foo", System.err, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateObject("foo", System.err, 1);
     }
@@ -1646,7 +1646,7 @@ public class TestDelegatingResultSet {
     public void testUpdateObjectIntegerObjectInteger() throws Exception {
         try {
             delegate.updateObject(1, System.err, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateObject(1, System.err, 1);
     }
@@ -1655,7 +1655,7 @@ public class TestDelegatingResultSet {
     public void testUpdateObjectStringObject() throws Exception {
         try {
             delegate.updateObject("foo", System.err);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateObject("foo", System.err);
     }
@@ -1664,7 +1664,7 @@ public class TestDelegatingResultSet {
     public void testUpdateObjectIntegerObjectSQLType() throws Exception {
         try {
             delegate.updateObject(1, System.err, (java.sql.SQLType) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateObject(1, System.err, (java.sql.SQLType) null);
     }
@@ -1673,7 +1673,7 @@ public class TestDelegatingResultSet {
     public void testUpdateRefIntegerRef() throws Exception {
         try {
             delegate.updateRef(1, (java.sql.Ref) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateRef(1, (java.sql.Ref) null);
     }
@@ -1682,7 +1682,7 @@ public class TestDelegatingResultSet {
     public void testUpdateRefStringRef() throws Exception {
         try {
             delegate.updateRef("foo", (java.sql.Ref) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateRef("foo", (java.sql.Ref) null);
     }
@@ -1691,7 +1691,7 @@ public class TestDelegatingResultSet {
     public void testUpdateRow() throws Exception {
         try {
             delegate.updateRow();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateRow();
     }
@@ -1700,7 +1700,7 @@ public class TestDelegatingResultSet {
     public void testUpdateRowIdStringRowId() throws Exception {
         try {
             delegate.updateRowId("foo", (java.sql.RowId) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateRowId("foo", (java.sql.RowId) null);
     }
@@ -1709,7 +1709,7 @@ public class TestDelegatingResultSet {
     public void testUpdateRowIdIntegerRowId() throws Exception {
         try {
             delegate.updateRowId(1, (java.sql.RowId) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateRowId(1, (java.sql.RowId) null);
     }
@@ -1718,7 +1718,7 @@ public class TestDelegatingResultSet {
     public void testUpdateSQLXMLIntegerSQLXML() throws Exception {
         try {
             delegate.updateSQLXML(1, (java.sql.SQLXML) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateSQLXML(1, (java.sql.SQLXML) null);
     }
@@ -1727,7 +1727,7 @@ public class TestDelegatingResultSet {
     public void testUpdateSQLXMLStringSQLXML() throws Exception {
         try {
             delegate.updateSQLXML("foo", (java.sql.SQLXML) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateSQLXML("foo", (java.sql.SQLXML) null);
     }
@@ -1736,7 +1736,7 @@ public class TestDelegatingResultSet {
     public void testUpdateShortIntegerShort() throws Exception {
         try {
             delegate.updateShort(1, (short) 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateShort(1, (short) 1);
     }
@@ -1745,7 +1745,7 @@ public class TestDelegatingResultSet {
     public void testUpdateShortStringShort() throws Exception {
         try {
             delegate.updateShort("foo", (short) 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateShort("foo", (short) 1);
     }
@@ -1754,7 +1754,7 @@ public class TestDelegatingResultSet {
     public void testUpdateStringIntegerString() throws Exception {
         try {
             delegate.updateString(1, "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateString(1, "foo");
     }
@@ -1763,7 +1763,7 @@ public class TestDelegatingResultSet {
     public void testUpdateStringStringString() throws Exception {
         try {
             delegate.updateString("foo", "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateString("foo", "foo");
     }
@@ -1772,7 +1772,7 @@ public class TestDelegatingResultSet {
     public void testUpdateTimeStringTime() throws Exception {
         try {
             delegate.updateTime("foo", (java.sql.Time) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateTime("foo", (java.sql.Time) null);
     }
@@ -1781,7 +1781,7 @@ public class TestDelegatingResultSet {
     public void testUpdateTimeIntegerTime() throws Exception {
         try {
             delegate.updateTime(1, (java.sql.Time) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateTime(1, (java.sql.Time) null);
     }
@@ -1790,7 +1790,7 @@ public class TestDelegatingResultSet {
     public void testUpdateTimestampIntegerTimestamp() throws Exception {
         try {
             delegate.updateTimestamp(1, (java.sql.Timestamp) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateTimestamp(1, (java.sql.Timestamp) null);
     }
@@ -1799,7 +1799,7 @@ public class TestDelegatingResultSet {
     public void testUpdateTimestampStringTimestamp() throws Exception {
         try {
             delegate.updateTimestamp("foo", (java.sql.Timestamp) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).updateTimestamp("foo", (java.sql.Timestamp) null);
     }
@@ -1808,21 +1808,21 @@ public class TestDelegatingResultSet {
     public void testWasNull() throws Exception {
         try {
             delegate.wasNull();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(rs, times(1)).wasNull();
     }
 
     @Test
     public void testToString() {
-        String toString = delegate.toString();
+        final String toString = delegate.toString();
         assertTrue(toString.contains("DelegatingResultSet"));
         assertTrue(toString.contains("Mock for ResultSet"));
     }
 
     @Test
     public void testWrap() throws SQLException {
-        DelegatingResultSet delegate = (DelegatingResultSet) DelegatingResultSet.wrapResultSet(conn, rs);
+        final DelegatingResultSet delegate = (DelegatingResultSet) DelegatingResultSet.wrapResultSet(conn, rs);
         assertEquals(delegate, delegate.unwrap(ResultSet.class));
         assertEquals(delegate, delegate.unwrap(DelegatingResultSet.class));
         assertEquals(rs, delegate.unwrap(rs.getClass()));

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
index a12dd2e..3f4ce44 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
@@ -105,7 +105,7 @@ public class TestDelegatingStatement {
     public void testAddBatchString() throws Exception {
         try {
             delegate.addBatch("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).addBatch("foo");
     }
@@ -114,7 +114,7 @@ public class TestDelegatingStatement {
     public void testCancel() throws Exception {
         try {
             delegate.cancel();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).cancel();
     }
@@ -123,7 +123,7 @@ public class TestDelegatingStatement {
     public void testClearBatch() throws Exception {
         try {
             delegate.clearBatch();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).clearBatch();
     }
@@ -132,7 +132,7 @@ public class TestDelegatingStatement {
     public void testClearWarnings() throws Exception {
         try {
             delegate.clearWarnings();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).clearWarnings();
     }
@@ -141,7 +141,7 @@ public class TestDelegatingStatement {
     public void testClose() throws Exception {
         try {
             delegate.close();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).close();
     }
@@ -150,7 +150,7 @@ public class TestDelegatingStatement {
     public void testCloseOnCompletion() throws Exception {
         try {
             delegate.closeOnCompletion();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).closeOnCompletion();
     }
@@ -159,7 +159,7 @@ public class TestDelegatingStatement {
     public void testExecuteStringIntegerArray() throws Exception {
         try {
             delegate.execute("foo", (int[]) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).execute("foo", (int[]) null);
     }
@@ -168,7 +168,7 @@ public class TestDelegatingStatement {
     public void testExecuteString() throws Exception {
         try {
             delegate.execute("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).execute("foo");
     }
@@ -177,7 +177,7 @@ public class TestDelegatingStatement {
     public void testExecuteStringStringArray() throws Exception {
         try {
             delegate.execute("foo", (String[]) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).execute("foo", (String[]) null);
     }
@@ -186,7 +186,7 @@ public class TestDelegatingStatement {
     public void testExecuteStringInteger() throws Exception {
         try {
             delegate.execute("foo", 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).execute("foo", 1);
     }
@@ -195,7 +195,7 @@ public class TestDelegatingStatement {
     public void testExecuteBatch() throws Exception {
         try {
             delegate.executeBatch();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeBatch();
     }
@@ -204,7 +204,7 @@ public class TestDelegatingStatement {
     public void testExecuteLargeBatch() throws Exception {
         try {
             delegate.executeLargeBatch();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeLargeBatch();
     }
@@ -213,7 +213,7 @@ public class TestDelegatingStatement {
     public void testExecuteLargeUpdateStringInteger() throws Exception {
         try {
             delegate.executeLargeUpdate("foo", 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeLargeUpdate("foo", 1);
     }
@@ -222,7 +222,7 @@ public class TestDelegatingStatement {
     public void testExecuteLargeUpdateStringIntegerArray() throws Exception {
         try {
             delegate.executeLargeUpdate("foo", (int[]) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeLargeUpdate("foo", (int[]) null);
     }
@@ -231,7 +231,7 @@ public class TestDelegatingStatement {
     public void testExecuteLargeUpdateString() throws Exception {
         try {
             delegate.executeLargeUpdate("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeLargeUpdate("foo");
     }
@@ -240,7 +240,7 @@ public class TestDelegatingStatement {
     public void testExecuteLargeUpdateStringStringArray() throws Exception {
         try {
             delegate.executeLargeUpdate("foo", (String[]) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeLargeUpdate("foo", (String[]) null);
     }
@@ -249,7 +249,7 @@ public class TestDelegatingStatement {
     public void testExecuteQueryString() throws Exception {
         try {
             delegate.executeQuery("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeQuery("foo");
     }
@@ -258,7 +258,7 @@ public class TestDelegatingStatement {
     public void testExecuteUpdateStringIntegerArray() throws Exception {
         try {
             delegate.executeUpdate("foo", (int[]) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeUpdate("foo", (int[]) null);
     }
@@ -267,7 +267,7 @@ public class TestDelegatingStatement {
     public void testExecuteUpdateStringStringArray() throws Exception {
         try {
             delegate.executeUpdate("foo", (String[]) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeUpdate("foo", (String[]) null);
     }
@@ -276,7 +276,7 @@ public class TestDelegatingStatement {
     public void testExecuteUpdateString() throws Exception {
         try {
             delegate.executeUpdate("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeUpdate("foo");
     }
@@ -285,7 +285,7 @@ public class TestDelegatingStatement {
     public void testExecuteUpdateStringInteger() throws Exception {
         try {
             delegate.executeUpdate("foo", 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).executeUpdate("foo", 1);
     }
@@ -300,7 +300,7 @@ public class TestDelegatingStatement {
     public void testGetConnection() throws Exception {
         try {
             delegate.getConnection();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(0)).getConnection();
     }
@@ -309,7 +309,7 @@ public class TestDelegatingStatement {
     public void testGetFetchDirection() throws Exception {
         try {
             delegate.getFetchDirection();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getFetchDirection();
     }
@@ -318,7 +318,7 @@ public class TestDelegatingStatement {
     public void testGetFetchSize() throws Exception {
         try {
             delegate.getFetchSize();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getFetchSize();
     }
@@ -327,7 +327,7 @@ public class TestDelegatingStatement {
     public void testGetGeneratedKeys() throws Exception {
         try {
             delegate.getGeneratedKeys();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getGeneratedKeys();
     }
@@ -336,7 +336,7 @@ public class TestDelegatingStatement {
     public void testGetLargeMaxRows() throws Exception {
         try {
             delegate.getLargeMaxRows();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getLargeMaxRows();
     }
@@ -345,7 +345,7 @@ public class TestDelegatingStatement {
     public void testGetLargeUpdateCount() throws Exception {
         try {
             delegate.getLargeUpdateCount();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getLargeUpdateCount();
     }
@@ -354,7 +354,7 @@ public class TestDelegatingStatement {
     public void testGetMaxFieldSize() throws Exception {
         try {
             delegate.getMaxFieldSize();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getMaxFieldSize();
     }
@@ -363,7 +363,7 @@ public class TestDelegatingStatement {
     public void testGetMaxRows() throws Exception {
         try {
             delegate.getMaxRows();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getMaxRows();
     }
@@ -372,7 +372,7 @@ public class TestDelegatingStatement {
     public void testGetMoreResultsInteger() throws Exception {
         try {
             delegate.getMoreResults(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getMoreResults(1);
     }
@@ -381,7 +381,7 @@ public class TestDelegatingStatement {
     public void testGetMoreResults() throws Exception {
         try {
             delegate.getMoreResults();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getMoreResults();
     }
@@ -390,7 +390,7 @@ public class TestDelegatingStatement {
     public void testGetQueryTimeout() throws Exception {
         try {
             delegate.getQueryTimeout();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getQueryTimeout();
     }
@@ -399,7 +399,7 @@ public class TestDelegatingStatement {
     public void testGetResultSet() throws Exception {
         try {
             delegate.getResultSet();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getResultSet();
     }
@@ -408,7 +408,7 @@ public class TestDelegatingStatement {
     public void testGetResultSetConcurrency() throws Exception {
         try {
             delegate.getResultSetConcurrency();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getResultSetConcurrency();
     }
@@ -417,7 +417,7 @@ public class TestDelegatingStatement {
     public void testGetResultSetHoldability() throws Exception {
         try {
             delegate.getResultSetHoldability();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getResultSetHoldability();
     }
@@ -426,7 +426,7 @@ public class TestDelegatingStatement {
     public void testGetResultSetType() throws Exception {
         try {
             delegate.getResultSetType();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getResultSetType();
     }
@@ -435,7 +435,7 @@ public class TestDelegatingStatement {
     public void testGetUpdateCount() throws Exception {
         try {
             delegate.getUpdateCount();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getUpdateCount();
     }
@@ -444,7 +444,7 @@ public class TestDelegatingStatement {
     public void testGetWarnings() throws Exception {
         try {
             delegate.getWarnings();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getWarnings();
     }
@@ -453,7 +453,7 @@ public class TestDelegatingStatement {
     public void testIsCloseOnCompletion() throws Exception {
         try {
             delegate.isCloseOnCompletion();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).isCloseOnCompletion();
     }
@@ -468,7 +468,7 @@ public class TestDelegatingStatement {
     public void testIsClosed() throws Exception {
         try {
             delegate.isClosed();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(0)).isClosed();
     }
@@ -477,7 +477,7 @@ public class TestDelegatingStatement {
     public void testIsPoolable() throws Exception {
         try {
             delegate.isPoolable();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).isPoolable();
     }
@@ -486,7 +486,7 @@ public class TestDelegatingStatement {
     public void testSetCursorNameString() throws Exception {
         try {
             delegate.setCursorName("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setCursorName("foo");
     }
@@ -495,7 +495,7 @@ public class TestDelegatingStatement {
     public void testSetEscapeProcessingBoolean() throws Exception {
         try {
             delegate.setEscapeProcessing(Boolean.TRUE);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setEscapeProcessing(Boolean.TRUE);
     }
@@ -504,7 +504,7 @@ public class TestDelegatingStatement {
     public void testSetFetchDirectionInteger() throws Exception {
         try {
             delegate.setFetchDirection(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setFetchDirection(1);
     }
@@ -513,7 +513,7 @@ public class TestDelegatingStatement {
     public void testSetFetchSizeInteger() throws Exception {
         try {
             delegate.setFetchSize(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setFetchSize(1);
     }
@@ -522,7 +522,7 @@ public class TestDelegatingStatement {
     public void testSetLargeMaxRowsLong() throws Exception {
         try {
             delegate.setLargeMaxRows(1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setLargeMaxRows(1l);
     }
@@ -531,7 +531,7 @@ public class TestDelegatingStatement {
     public void testSetMaxFieldSizeInteger() throws Exception {
         try {
             delegate.setMaxFieldSize(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setMaxFieldSize(1);
     }
@@ -540,7 +540,7 @@ public class TestDelegatingStatement {
     public void testSetMaxRowsInteger() throws Exception {
         try {
             delegate.setMaxRows(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setMaxRows(1);
     }
@@ -549,7 +549,7 @@ public class TestDelegatingStatement {
     public void testSetPoolableBoolean() throws Exception {
         try {
             delegate.setPoolable(Boolean.TRUE);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setPoolable(Boolean.TRUE);
     }
@@ -558,7 +558,7 @@ public class TestDelegatingStatement {
     public void testSetQueryTimeoutInteger() throws Exception {
         try {
             delegate.setQueryTimeout(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setQueryTimeout(1);
     }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestDriverConnectionFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDriverConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/TestDriverConnectionFactory.java
index 78a5988..9528633 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDriverConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDriverConnectionFactory.java
@@ -32,17 +32,17 @@ public class TestDriverConnectionFactory {
 
     @Test
     public void testDriverConnectionFactoryToString() {
-        DriverConnectionFactory cf = new DriverConnectionFactory(
+        final DriverConnectionFactory cf = new DriverConnectionFactory(
                 new TesterDriver(), "jdbc:apache:commons:testdriver", null);
-        String toString = cf.toString();
+        final String toString = cf.toString();
         assertTrue(toString.contains("jdbc:apache:commons:testdriver"));
     }
 
     @Test
     public void testCreateConnection() throws SQLException {
-        DriverConnectionFactory cf = new DriverConnectionFactory(
+        final DriverConnectionFactory cf = new DriverConnectionFactory(
                 new TesterDriver(), "jdbc:apache:commons:testdriver", null);
-        Connection conn = cf.createConnection();
+        final Connection conn = cf.createConnection();
         assertEquals(0, conn.getMetaData().getDriverMajorVersion());
     }
 }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
index 31de811..f8abce1 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
@@ -69,25 +69,25 @@ public class TestDriverManagerConnectionFactory {
 
     @Test(expected=IndexOutOfBoundsException.class) // thrown by TestDriver due to missing user
     public void testDriverManagerWithoutUser() throws SQLException {
-        DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", null, "pass");
+        final DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", null, "pass");
         cf.createConnection();
     }
 
     @Test(expected=SQLException.class) // thrown by TestDriver due to invalid password
     public void testDriverManagerWithoutPassword() throws SQLException {
-        DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", "user", null);
+        final DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", "user", null);
         cf.createConnection();
     }
 
     @Test(expected=ArrayIndexOutOfBoundsException.class) // thrown by TestDriver due to missing user
     public void testDriverManagerWithoutCredentials() throws SQLException {
-        DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", null,  null);
+        final DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", null,  null);
         cf.createConnection();
     }
 
     @Test
     public void testDriverManagerCredentialsInUrl() throws SQLException {
-        DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver;user=foo;password=bar", null,  null);
+        final DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver;user=foo;password=bar", null,  null);
         cf.createConnection();
     }
 


[4/4] commons-dbcp git commit: Use final.

Posted by gg...@apache.org.
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/82dc4a18
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/82dc4a18
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/82dc4a18

Branch: refs/heads/master
Commit: 82dc4a18c2118323e4b43cc36a77114d0427f5e6
Parents: 5dd2deb
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Jul 8 14:03:10 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Jul 8 14:03:10 2018 -0600

----------------------------------------------------------------------
 .../commons/dbcp2/DelegatingConnection.java     |   2 +-
 .../dbcp2/DelegatingPreparedStatement.java      |   4 +-
 .../commons/dbcp2/DelegatingResultSet.java      |   8 +-
 .../dbcp2/TestBasicDataSourceMXBean.java        |   2 +-
 .../dbcp2/TestDataSourceConnectionFactory.java  |  24 +-
 .../dbcp2/TestDelegatingCallableStatement.java  | 250 ++++++------
 .../dbcp2/TestDelegatingDatabaseMetaData.java   | 348 ++++++++--------
 .../dbcp2/TestDelegatingPreparedStatement.java  | 116 +++---
 .../commons/dbcp2/TestDelegatingResultSet.java  | 392 +++++++++----------
 .../commons/dbcp2/TestDelegatingStatement.java  | 100 ++---
 .../dbcp2/TestDriverConnectionFactory.java      |   8 +-
 .../TestDriverManagerConnectionFactory.java     |   8 +-
 .../dbcp2/TestLifetimeExceededException.java    |   4 +-
 .../apache/commons/dbcp2/TestListException.java |   5 +-
 .../commons/dbcp2/TesterCallableStatement.java  |  16 +-
 .../commons/dbcp2/TesterPreparedStatement.java  |   4 +-
 .../apache/commons/dbcp2/TesterResultSet.java   |   8 +-
 .../cpdsadapter/TestDriverAdapterCPDS.java      |  14 +-
 .../datasources/TestInstanceKeyDataSource.java  |  10 +-
 .../datasources/TestPerUserPoolDataSource.java  | 288 +++++++-------
 .../managed/TestBasicManagedDataSource.java     |   2 +-
 .../dbcp2/managed/TestLocalXaResource.java      | 102 ++---
 .../dbcp2/managed/TestManagedDataSource.java    |   2 +-
 .../managed/TestPoolableManagedConnection.java  |   2 +-
 24 files changed, 860 insertions(+), 859 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index d2ed073..87e1f72 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -227,7 +227,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
                 boolean connectionIsClosed;
                 try {
                     connectionIsClosed = connection.isClosed();
-                } catch (SQLException e) {
+                } catch (final SQLException e) {
                     // not sure what the state is, so assume the connection is open.
                     connectionIsClosed = false;
                 }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
index a25bd48..5d38e03 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
@@ -547,7 +547,7 @@ public class DelegatingPreparedStatement extends DelegatingStatement implements
      * @since 2.5.0
      */
     @Override
-    public void setObject(int parameterIndex, Object x, SQLType targetSqlType) throws SQLException {
+    public void setObject(final int parameterIndex, final Object x, final SQLType targetSqlType) throws SQLException {
         checkOpen();
         try {
             getDelegatePreparedStatement().setObject(parameterIndex, x, targetSqlType);
@@ -560,7 +560,7 @@ public class DelegatingPreparedStatement extends DelegatingStatement implements
      * @since 2.5.0
      */
     @Override
-    public void setObject(int parameterIndex, Object x, SQLType targetSqlType, int scaleOrLength) throws SQLException {
+    public void setObject(final int parameterIndex, final Object x, final SQLType targetSqlType, final int scaleOrLength) throws SQLException {
         checkOpen();
         try {
             getDelegatePreparedStatement().setObject(parameterIndex, x, targetSqlType, scaleOrLength);

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
index 0fb40a2..dcec14f 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
@@ -1866,7 +1866,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
      * @since 2.5.0
      */
     @Override
-    public void updateObject(int columnIndex, Object x, SQLType targetSqlType) throws SQLException {
+    public void updateObject(final int columnIndex, final Object x, final SQLType targetSqlType) throws SQLException {
         try {
             resultSet.updateObject(columnIndex, x, targetSqlType);
         } catch (final SQLException e) {
@@ -1878,7 +1878,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
      * @since 2.5.0
      */
     @Override
-    public void updateObject(int columnIndex, Object x, SQLType targetSqlType, int scaleOrLength) throws SQLException {
+    public void updateObject(final int columnIndex, final Object x, final SQLType targetSqlType, final int scaleOrLength) throws SQLException {
         try {
             resultSet.updateObject(columnIndex, x, targetSqlType, scaleOrLength);
         } catch (final SQLException e) {
@@ -1908,7 +1908,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
      * @since 2.5.0
      */
     @Override
-    public void updateObject(String columnLabel, Object x, SQLType targetSqlType) throws SQLException {
+    public void updateObject(final String columnLabel, final Object x, final SQLType targetSqlType) throws SQLException {
         try {
             resultSet.updateObject(columnLabel, x, targetSqlType);
         } catch (final SQLException e) {
@@ -1920,7 +1920,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
      * @since 2.5.0
      */
     @Override
-    public void updateObject(String columnLabel, Object x, SQLType targetSqlType, int scaleOrLength)
+    public void updateObject(final String columnLabel, final Object x, final SQLType targetSqlType, final int scaleOrLength)
             throws SQLException {
         try {
             resultSet.updateObject(columnLabel, x, targetSqlType, scaleOrLength);

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
index 1106073..b7b8b75 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
@@ -34,7 +34,7 @@ public class TestBasicDataSourceMXBean {
         assertNull(bean.getDefaultSchema());
     }
 
-    private BasicDataSourceMXBean bean = new BasicDataSourceMXBean() {
+    private final BasicDataSourceMXBean bean = new BasicDataSourceMXBean() {
         
         @Override
         public boolean isPoolPreparedStatements() {

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestDataSourceConnectionFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDataSourceConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/TestDataSourceConnectionFactory.java
index 40d46ec..9db6e2d 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDataSourceConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDataSourceConnectionFactory.java
@@ -47,28 +47,28 @@ public class TestDataSourceConnectionFactory {
 
     @Test
     public void testDefaultValues() throws SQLException {
-        Connection conn = factory.createConnection();
+        final Connection conn = factory.createConnection();
         assertNull(((TesterConnection) conn).getUserName());
     }
 
     @Test
     public void testCredentials() throws SQLException {
-        DataSourceConnectionFactory factory = new DataSourceConnectionFactory(datasource, "foo", "bar");
-        Connection conn = factory.createConnection();
+        final DataSourceConnectionFactory factory = new DataSourceConnectionFactory(datasource, "foo", "bar");
+        final Connection conn = factory.createConnection();
         assertEquals("foo", ((TesterConnection) conn).getUserName());
     }
 
     @Test
     public void testEmptyPassword() throws SQLException {
-        DataSourceConnectionFactory factory = new DataSourceConnectionFactory(datasource, "foo", (char[]) null);
-        Connection conn = factory.createConnection();
+        final DataSourceConnectionFactory factory = new DataSourceConnectionFactory(datasource, "foo", (char[]) null);
+        final Connection conn = factory.createConnection();
         assertEquals("foo", ((TesterConnection) conn).getUserName());
     }
 
     @Test
     public void testEmptyUser() throws SQLException {
-        DataSourceConnectionFactory factory = new DataSourceConnectionFactory(datasource, null, new char[] {'a'});
-        Connection conn = factory.createConnection();
+        final DataSourceConnectionFactory factory = new DataSourceConnectionFactory(datasource, null, new char[] {'a'});
+        final Connection conn = factory.createConnection();
         assertNull(((TesterConnection) conn).getUserName());
     }
 
@@ -80,11 +80,11 @@ public class TestDataSourceConnectionFactory {
         }
 
         @Override
-        public void setLogWriter(PrintWriter out) throws SQLException {
+        public void setLogWriter(final PrintWriter out) throws SQLException {
         }
 
         @Override
-        public void setLoginTimeout(int seconds) throws SQLException {
+        public void setLoginTimeout(final int seconds) throws SQLException {
         }
 
         @Override
@@ -98,12 +98,12 @@ public class TestDataSourceConnectionFactory {
         }
 
         @Override
-        public <T> T unwrap(Class<T> iface) throws SQLException {
+        public <T> T unwrap(final Class<T> iface) throws SQLException {
             return null;
         }
 
         @Override
-        public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        public boolean isWrapperFor(final Class<?> iface) throws SQLException {
             return false;
         }
 
@@ -113,7 +113,7 @@ public class TestDataSourceConnectionFactory {
         }
 
         @Override
-        public Connection getConnection(String username, String password) throws SQLException {
+        public Connection getConnection(final String username, final String password) throws SQLException {
             return new TesterConnection(username, password);
         }
     }

http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/82dc4a18/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
index 1f16866..65be421 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
@@ -42,27 +42,27 @@ public class TestDelegatingCallableStatement {
     public void setUp() throws Exception {
         conn = new TesterConnection("test", "test");
         obj = mock(CallableStatement.class);
-        DelegatingConnection<Connection> delegatingConnection = new DelegatingConnection<Connection>(conn);
+        final DelegatingConnection<Connection> delegatingConnection = new DelegatingConnection<Connection>(conn);
         delegate = new DelegatingCallableStatement(delegatingConnection, obj);
     }
 
     @Test
     public void testExecuteQueryReturnsNull() throws Exception {
-        TesterCallableStatement delegateStmt = new TesterCallableStatement(conn,"null");
+        final TesterCallableStatement delegateStmt = new TesterCallableStatement(conn,"null");
         obj = new DelegatingCallableStatement(new DelegatingConnection<Connection>(conn),delegateStmt);
         assertNull(obj.executeQuery());
     }
 
     @Test
     public void testExecuteQueryReturnsNotNull() throws Exception {
-        TesterCallableStatement delegateStmt = new TesterCallableStatement(conn,"select * from foo");
+        final TesterCallableStatement delegateStmt = new TesterCallableStatement(conn,"select * from foo");
         obj = new DelegatingCallableStatement(new DelegatingConnection<Connection>(conn),delegateStmt);
         assertTrue(null != obj.executeQuery());
     }
 
     @Test
     public void testGetDelegate() throws Exception {
-        TesterCallableStatement delegateStmt = new TesterCallableStatement(conn,"select * from foo");
+        final TesterCallableStatement delegateStmt = new TesterCallableStatement(conn,"select * from foo");
         obj = new DelegatingCallableStatement(new DelegatingConnection<Connection>(conn),delegateStmt);
         assertEquals(delegateStmt,((DelegatingCallableStatement)obj).getDelegate());
     }
@@ -71,7 +71,7 @@ public class TestDelegatingCallableStatement {
     public void testGetArrayString() throws Exception {
         try {
             delegate.getArray("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getArray("foo");
     }
@@ -80,7 +80,7 @@ public class TestDelegatingCallableStatement {
     public void testGetArrayInteger() throws Exception {
         try {
             delegate.getArray(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getArray(1);
     }
@@ -89,7 +89,7 @@ public class TestDelegatingCallableStatement {
     public void testGetBigDecimalIntegerInteger() throws Exception {
         try {
             delegate.getBigDecimal(1, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getBigDecimal(1, 1);
     }
@@ -98,7 +98,7 @@ public class TestDelegatingCallableStatement {
     public void testGetBigDecimalInteger() throws Exception {
         try {
             delegate.getBigDecimal(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getBigDecimal(1);
     }
@@ -107,7 +107,7 @@ public class TestDelegatingCallableStatement {
     public void testGetBigDecimalString() throws Exception {
         try {
             delegate.getBigDecimal("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getBigDecimal("foo");
     }
@@ -116,7 +116,7 @@ public class TestDelegatingCallableStatement {
     public void testGetBlobInteger() throws Exception {
         try {
             delegate.getBlob(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getBlob(1);
     }
@@ -125,7 +125,7 @@ public class TestDelegatingCallableStatement {
     public void testGetBlobString() throws Exception {
         try {
             delegate.getBlob("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getBlob("foo");
     }
@@ -134,7 +134,7 @@ public class TestDelegatingCallableStatement {
     public void testGetBooleanInteger() throws Exception {
         try {
             delegate.getBoolean(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getBoolean(1);
     }
@@ -143,7 +143,7 @@ public class TestDelegatingCallableStatement {
     public void testGetBooleanString() throws Exception {
         try {
             delegate.getBoolean("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getBoolean("foo");
     }
@@ -152,7 +152,7 @@ public class TestDelegatingCallableStatement {
     public void testGetByteInteger() throws Exception {
         try {
             delegate.getByte(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getByte(1);
     }
@@ -161,7 +161,7 @@ public class TestDelegatingCallableStatement {
     public void testGetByteString() throws Exception {
         try {
             delegate.getByte("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getByte("foo");
     }
@@ -170,7 +170,7 @@ public class TestDelegatingCallableStatement {
     public void testGetBytesInteger() throws Exception {
         try {
             delegate.getBytes(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getBytes(1);
     }
@@ -179,7 +179,7 @@ public class TestDelegatingCallableStatement {
     public void testGetBytesString() throws Exception {
         try {
             delegate.getBytes("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getBytes("foo");
     }
@@ -188,7 +188,7 @@ public class TestDelegatingCallableStatement {
     public void testGetCharacterStreamInteger() throws Exception {
         try {
             delegate.getCharacterStream(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getCharacterStream(1);
     }
@@ -197,7 +197,7 @@ public class TestDelegatingCallableStatement {
     public void testGetCharacterStreamString() throws Exception {
         try {
             delegate.getCharacterStream("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getCharacterStream("foo");
     }
@@ -206,7 +206,7 @@ public class TestDelegatingCallableStatement {
     public void testGetClobInteger() throws Exception {
         try {
             delegate.getClob(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getClob(1);
     }
@@ -215,7 +215,7 @@ public class TestDelegatingCallableStatement {
     public void testGetClobString() throws Exception {
         try {
             delegate.getClob("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getClob("foo");
     }
@@ -224,7 +224,7 @@ public class TestDelegatingCallableStatement {
     public void testGetDateIntegerCalendar() throws Exception {
         try {
             delegate.getDate(1, (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getDate(1, (java.util.Calendar) null);
     }
@@ -233,7 +233,7 @@ public class TestDelegatingCallableStatement {
     public void testGetDateInteger() throws Exception {
         try {
             delegate.getDate(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getDate(1);
     }
@@ -242,7 +242,7 @@ public class TestDelegatingCallableStatement {
     public void testGetDateString() throws Exception {
         try {
             delegate.getDate("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getDate("foo");
     }
@@ -251,7 +251,7 @@ public class TestDelegatingCallableStatement {
     public void testGetDateStringCalendar() throws Exception {
         try {
             delegate.getDate("foo", (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getDate("foo", (java.util.Calendar) null);
     }
@@ -260,7 +260,7 @@ public class TestDelegatingCallableStatement {
     public void testGetDoubleInteger() throws Exception {
         try {
             delegate.getDouble(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getDouble(1);
     }
@@ -269,7 +269,7 @@ public class TestDelegatingCallableStatement {
     public void testGetDoubleString() throws Exception {
         try {
             delegate.getDouble("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getDouble("foo");
     }
@@ -278,7 +278,7 @@ public class TestDelegatingCallableStatement {
     public void testGetFloatString() throws Exception {
         try {
             delegate.getFloat("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getFloat("foo");
     }
@@ -287,7 +287,7 @@ public class TestDelegatingCallableStatement {
     public void testGetFloatInteger() throws Exception {
         try {
             delegate.getFloat(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getFloat(1);
     }
@@ -296,7 +296,7 @@ public class TestDelegatingCallableStatement {
     public void testGetIntString() throws Exception {
         try {
             delegate.getInt("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getInt("foo");
     }
@@ -305,7 +305,7 @@ public class TestDelegatingCallableStatement {
     public void testGetIntInteger() throws Exception {
         try {
             delegate.getInt(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getInt(1);
     }
@@ -314,7 +314,7 @@ public class TestDelegatingCallableStatement {
     public void testGetLongString() throws Exception {
         try {
             delegate.getLong("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getLong("foo");
     }
@@ -323,7 +323,7 @@ public class TestDelegatingCallableStatement {
     public void testGetLongInteger() throws Exception {
         try {
             delegate.getLong(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getLong(1);
     }
@@ -332,7 +332,7 @@ public class TestDelegatingCallableStatement {
     public void testGetNCharacterStreamInteger() throws Exception {
         try {
             delegate.getNCharacterStream(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getNCharacterStream(1);
     }
@@ -341,7 +341,7 @@ public class TestDelegatingCallableStatement {
     public void testGetNCharacterStreamString() throws Exception {
         try {
             delegate.getNCharacterStream("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getNCharacterStream("foo");
     }
@@ -350,7 +350,7 @@ public class TestDelegatingCallableStatement {
     public void testGetNClobString() throws Exception {
         try {
             delegate.getNClob("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getNClob("foo");
     }
@@ -359,7 +359,7 @@ public class TestDelegatingCallableStatement {
     public void testGetNClobInteger() throws Exception {
         try {
             delegate.getNClob(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getNClob(1);
     }
@@ -368,7 +368,7 @@ public class TestDelegatingCallableStatement {
     public void testGetNStringString() throws Exception {
         try {
             delegate.getNString("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getNString("foo");
     }
@@ -377,7 +377,7 @@ public class TestDelegatingCallableStatement {
     public void testGetNStringInteger() throws Exception {
         try {
             delegate.getNString(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getNString(1);
     }
@@ -386,7 +386,7 @@ public class TestDelegatingCallableStatement {
     public void testGetObjectIntegerClass() throws Exception {
         try {
             delegate.getObject(1, Object.class);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getObject(1, Object.class);
     }
@@ -395,7 +395,7 @@ public class TestDelegatingCallableStatement {
     public void testGetObjectStringClass() throws Exception {
         try {
             delegate.getObject("foo", Object.class);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getObject("foo", Object.class);
     }
@@ -404,7 +404,7 @@ public class TestDelegatingCallableStatement {
     public void testGetObjectIntegerMap() throws Exception {
         try {
             delegate.getObject(1, (java.util.Map) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getObject(1, (java.util.Map) null);
     }
@@ -413,7 +413,7 @@ public class TestDelegatingCallableStatement {
     public void testGetObjectString() throws Exception {
         try {
             delegate.getObject("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getObject("foo");
     }
@@ -422,7 +422,7 @@ public class TestDelegatingCallableStatement {
     public void testGetObjectInteger() throws Exception {
         try {
             delegate.getObject(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getObject(1);
     }
@@ -431,7 +431,7 @@ public class TestDelegatingCallableStatement {
     public void testGetObjectStringMap() throws Exception {
         try {
             delegate.getObject("foo", (java.util.Map) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getObject("foo", (java.util.Map) null);
     }
@@ -440,7 +440,7 @@ public class TestDelegatingCallableStatement {
     public void testGetRefInteger() throws Exception {
         try {
             delegate.getRef(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getRef(1);
     }
@@ -449,7 +449,7 @@ public class TestDelegatingCallableStatement {
     public void testGetRefString() throws Exception {
         try {
             delegate.getRef("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getRef("foo");
     }
@@ -458,7 +458,7 @@ public class TestDelegatingCallableStatement {
     public void testGetRowIdInteger() throws Exception {
         try {
             delegate.getRowId(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getRowId(1);
     }
@@ -467,7 +467,7 @@ public class TestDelegatingCallableStatement {
     public void testGetRowIdString() throws Exception {
         try {
             delegate.getRowId("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getRowId("foo");
     }
@@ -476,7 +476,7 @@ public class TestDelegatingCallableStatement {
     public void testGetSQLXMLString() throws Exception {
         try {
             delegate.getSQLXML("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getSQLXML("foo");
     }
@@ -485,7 +485,7 @@ public class TestDelegatingCallableStatement {
     public void testGetSQLXMLInteger() throws Exception {
         try {
             delegate.getSQLXML(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getSQLXML(1);
     }
@@ -494,7 +494,7 @@ public class TestDelegatingCallableStatement {
     public void testGetShortInteger() throws Exception {
         try {
             delegate.getShort(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getShort(1);
     }
@@ -503,7 +503,7 @@ public class TestDelegatingCallableStatement {
     public void testGetShortString() throws Exception {
         try {
             delegate.getShort("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getShort("foo");
     }
@@ -512,7 +512,7 @@ public class TestDelegatingCallableStatement {
     public void testGetStringInteger() throws Exception {
         try {
             delegate.getString(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getString(1);
     }
@@ -521,7 +521,7 @@ public class TestDelegatingCallableStatement {
     public void testGetStringString() throws Exception {
         try {
             delegate.getString("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getString("foo");
     }
@@ -530,7 +530,7 @@ public class TestDelegatingCallableStatement {
     public void testGetTimeIntegerCalendar() throws Exception {
         try {
             delegate.getTime(1, (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getTime(1, (java.util.Calendar) null);
     }
@@ -539,7 +539,7 @@ public class TestDelegatingCallableStatement {
     public void testGetTimeInteger() throws Exception {
         try {
             delegate.getTime(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getTime(1);
     }
@@ -548,7 +548,7 @@ public class TestDelegatingCallableStatement {
     public void testGetTimeString() throws Exception {
         try {
             delegate.getTime("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getTime("foo");
     }
@@ -557,7 +557,7 @@ public class TestDelegatingCallableStatement {
     public void testGetTimeStringCalendar() throws Exception {
         try {
             delegate.getTime("foo", (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getTime("foo", (java.util.Calendar) null);
     }
@@ -566,7 +566,7 @@ public class TestDelegatingCallableStatement {
     public void testGetTimestampStringCalendar() throws Exception {
         try {
             delegate.getTimestamp("foo", (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getTimestamp("foo", (java.util.Calendar) null);
     }
@@ -575,7 +575,7 @@ public class TestDelegatingCallableStatement {
     public void testGetTimestampString() throws Exception {
         try {
             delegate.getTimestamp("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getTimestamp("foo");
     }
@@ -584,7 +584,7 @@ public class TestDelegatingCallableStatement {
     public void testGetTimestampIntegerCalendar() throws Exception {
         try {
             delegate.getTimestamp(1, (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getTimestamp(1, (java.util.Calendar) null);
     }
@@ -593,7 +593,7 @@ public class TestDelegatingCallableStatement {
     public void testGetTimestampInteger() throws Exception {
         try {
             delegate.getTimestamp(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getTimestamp(1);
     }
@@ -602,7 +602,7 @@ public class TestDelegatingCallableStatement {
     public void testGetURLInteger() throws Exception {
         try {
             delegate.getURL(1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getURL(1);
     }
@@ -611,7 +611,7 @@ public class TestDelegatingCallableStatement {
     public void testGetURLString() throws Exception {
         try {
             delegate.getURL("foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).getURL("foo");
     }
@@ -620,7 +620,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterIntegerSQLType() throws Exception {
         try {
             delegate.registerOutParameter(1, (java.sql.SQLType) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter(1, (java.sql.SQLType) null);
     }
@@ -629,7 +629,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterStringSQLType() throws Exception {
         try {
             delegate.registerOutParameter("foo", (java.sql.SQLType) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter("foo", (java.sql.SQLType) null);
     }
@@ -638,7 +638,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterStringIntegerString() throws Exception {
         try {
             delegate.registerOutParameter("foo", 1, "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter("foo", 1, "foo");
     }
@@ -647,7 +647,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterStringSQLTypeInteger() throws Exception {
         try {
             delegate.registerOutParameter("foo", (java.sql.SQLType) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter("foo", (java.sql.SQLType) null, 1);
     }
@@ -656,7 +656,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterIntegerSQLTypeString() throws Exception {
         try {
             delegate.registerOutParameter(1, (java.sql.SQLType) null, "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter(1, (java.sql.SQLType) null, "foo");
     }
@@ -665,7 +665,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterStringSQLTypeString() throws Exception {
         try {
             delegate.registerOutParameter("foo", (java.sql.SQLType) null, "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter("foo", (java.sql.SQLType) null, "foo");
     }
@@ -674,7 +674,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterIntegerIntegerString() throws Exception {
         try {
             delegate.registerOutParameter(1, 1, "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter(1, 1, "foo");
     }
@@ -683,7 +683,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterIntegerIntegerInteger() throws Exception {
         try {
             delegate.registerOutParameter(1, 1, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter(1, 1, 1);
     }
@@ -692,7 +692,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterIntegerInteger() throws Exception {
         try {
             delegate.registerOutParameter(1, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter(1, 1);
     }
@@ -701,7 +701,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterIntegerSQLTypeInteger() throws Exception {
         try {
             delegate.registerOutParameter(1, (java.sql.SQLType) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter(1, (java.sql.SQLType) null, 1);
     }
@@ -710,7 +710,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterStringIntegerInteger() throws Exception {
         try {
             delegate.registerOutParameter("foo", 1, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter("foo", 1, 1);
     }
@@ -719,7 +719,7 @@ public class TestDelegatingCallableStatement {
     public void testRegisterOutParameterStringInteger() throws Exception {
         try {
             delegate.registerOutParameter("foo", 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).registerOutParameter("foo", 1);
     }
@@ -728,7 +728,7 @@ public class TestDelegatingCallableStatement {
     public void testSetAsciiStreamStringInputStreamInteger() throws Exception {
         try {
             delegate.setAsciiStream("foo", (java.io.InputStream) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setAsciiStream("foo", (java.io.InputStream) null, 1);
     }
@@ -737,7 +737,7 @@ public class TestDelegatingCallableStatement {
     public void testSetAsciiStreamStringInputStream() throws Exception {
         try {
             delegate.setAsciiStream("foo", (java.io.InputStream) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setAsciiStream("foo", (java.io.InputStream) null);
     }
@@ -746,7 +746,7 @@ public class TestDelegatingCallableStatement {
     public void testSetAsciiStreamStringInputStreamLong() throws Exception {
         try {
             delegate.setAsciiStream("foo", (java.io.InputStream) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setAsciiStream("foo", (java.io.InputStream) null, 1l);
     }
@@ -755,7 +755,7 @@ public class TestDelegatingCallableStatement {
     public void testSetBigDecimalStringBigDecimal() throws Exception {
         try {
             delegate.setBigDecimal("foo", java.math.BigDecimal.valueOf(1.0d));
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setBigDecimal("foo", java.math.BigDecimal.valueOf(1.0d));
     }
@@ -764,7 +764,7 @@ public class TestDelegatingCallableStatement {
     public void testSetBinaryStreamStringInputStreamInteger() throws Exception {
         try {
             delegate.setBinaryStream("foo", (java.io.InputStream) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setBinaryStream("foo", (java.io.InputStream) null, 1);
     }
@@ -773,7 +773,7 @@ public class TestDelegatingCallableStatement {
     public void testSetBinaryStreamStringInputStream() throws Exception {
         try {
             delegate.setBinaryStream("foo", (java.io.InputStream) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setBinaryStream("foo", (java.io.InputStream) null);
     }
@@ -782,7 +782,7 @@ public class TestDelegatingCallableStatement {
     public void testSetBinaryStreamStringInputStreamLong() throws Exception {
         try {
             delegate.setBinaryStream("foo", (java.io.InputStream) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setBinaryStream("foo", (java.io.InputStream) null, 1l);
     }
@@ -791,7 +791,7 @@ public class TestDelegatingCallableStatement {
     public void testSetBlobStringInputStreamLong() throws Exception {
         try {
             delegate.setBlob("foo", (java.io.InputStream) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setBlob("foo", (java.io.InputStream) null, 1l);
     }
@@ -800,7 +800,7 @@ public class TestDelegatingCallableStatement {
     public void testSetBlobStringInputStream() throws Exception {
         try {
             delegate.setBlob("foo", (java.io.InputStream) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setBlob("foo", (java.io.InputStream) null);
     }
@@ -809,7 +809,7 @@ public class TestDelegatingCallableStatement {
     public void testSetBlobStringBlob() throws Exception {
         try {
             delegate.setBlob("foo", (java.sql.Blob) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setBlob("foo", (java.sql.Blob) null);
     }
@@ -818,7 +818,7 @@ public class TestDelegatingCallableStatement {
     public void testSetBooleanStringBoolean() throws Exception {
         try {
             delegate.setBoolean("foo", Boolean.TRUE);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setBoolean("foo", Boolean.TRUE);
     }
@@ -827,7 +827,7 @@ public class TestDelegatingCallableStatement {
     public void testSetByteStringByte() throws Exception {
         try {
             delegate.setByte("foo", (byte) 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setByte("foo", (byte) 1);
     }
@@ -836,7 +836,7 @@ public class TestDelegatingCallableStatement {
     public void testSetBytesStringByteArray() throws Exception {
         try {
             delegate.setBytes("foo", new byte[] { 1 });
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setBytes("foo", new byte[] { 1 });
     }
@@ -845,7 +845,7 @@ public class TestDelegatingCallableStatement {
     public void testSetCharacterStreamStringReaderInteger() throws Exception {
         try {
             delegate.setCharacterStream("foo", (java.io.StringReader) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setCharacterStream("foo", (java.io.StringReader) null, 1);
     }
@@ -854,7 +854,7 @@ public class TestDelegatingCallableStatement {
     public void testSetCharacterStreamStringReader() throws Exception {
         try {
             delegate.setCharacterStream("foo", (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setCharacterStream("foo", (java.io.StringReader) null);
     }
@@ -863,7 +863,7 @@ public class TestDelegatingCallableStatement {
     public void testSetCharacterStreamStringReaderLong() throws Exception {
         try {
             delegate.setCharacterStream("foo", (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setCharacterStream("foo", (java.io.StringReader) null, 1l);
     }
@@ -872,7 +872,7 @@ public class TestDelegatingCallableStatement {
     public void testSetClobStringReader() throws Exception {
         try {
             delegate.setClob("foo", (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setClob("foo", (java.io.StringReader) null);
     }
@@ -881,7 +881,7 @@ public class TestDelegatingCallableStatement {
     public void testSetClobStringReaderLong() throws Exception {
         try {
             delegate.setClob("foo", (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setClob("foo", (java.io.StringReader) null, 1l);
     }
@@ -890,7 +890,7 @@ public class TestDelegatingCallableStatement {
     public void testSetClobStringClob() throws Exception {
         try {
             delegate.setClob("foo", (java.sql.Clob) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setClob("foo", (java.sql.Clob) null);
     }
@@ -899,7 +899,7 @@ public class TestDelegatingCallableStatement {
     public void testSetDateStringSqlDateCalendar() throws Exception {
         try {
             delegate.setDate("foo", new java.sql.Date(1529827548745l), (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setDate("foo", new java.sql.Date(1529827548745l), (java.util.Calendar) null);
     }
@@ -908,7 +908,7 @@ public class TestDelegatingCallableStatement {
     public void testSetDateStringSqlDate() throws Exception {
         try {
             delegate.setDate("foo", new java.sql.Date(1529827548745l));
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setDate("foo", new java.sql.Date(1529827548745l));
     }
@@ -917,7 +917,7 @@ public class TestDelegatingCallableStatement {
     public void testSetDoubleStringDouble() throws Exception {
         try {
             delegate.setDouble("foo", 1.0d);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setDouble("foo", 1.0d);
     }
@@ -926,7 +926,7 @@ public class TestDelegatingCallableStatement {
     public void testSetFloatStringFloat() throws Exception {
         try {
             delegate.setFloat("foo", 1.0f);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setFloat("foo", 1.0f);
     }
@@ -935,7 +935,7 @@ public class TestDelegatingCallableStatement {
     public void testSetIntStringInteger() throws Exception {
         try {
             delegate.setInt("foo", 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setInt("foo", 1);
     }
@@ -944,7 +944,7 @@ public class TestDelegatingCallableStatement {
     public void testSetLongStringLong() throws Exception {
         try {
             delegate.setLong("foo", 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setLong("foo", 1l);
     }
@@ -953,7 +953,7 @@ public class TestDelegatingCallableStatement {
     public void testSetNCharacterStreamStringReaderLong() throws Exception {
         try {
             delegate.setNCharacterStream("foo", (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setNCharacterStream("foo", (java.io.StringReader) null, 1l);
     }
@@ -962,7 +962,7 @@ public class TestDelegatingCallableStatement {
     public void testSetNCharacterStreamStringReader() throws Exception {
         try {
             delegate.setNCharacterStream("foo", (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setNCharacterStream("foo", (java.io.StringReader) null);
     }
@@ -971,7 +971,7 @@ public class TestDelegatingCallableStatement {
     public void testSetNClobStringReaderLong() throws Exception {
         try {
             delegate.setNClob("foo", (java.io.StringReader) null, 1l);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setNClob("foo", (java.io.StringReader) null, 1l);
     }
@@ -980,7 +980,7 @@ public class TestDelegatingCallableStatement {
     public void testSetNClobStringReader() throws Exception {
         try {
             delegate.setNClob("foo", (java.io.StringReader) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setNClob("foo", (java.io.StringReader) null);
     }
@@ -989,7 +989,7 @@ public class TestDelegatingCallableStatement {
     public void testSetNClobStringNClob() throws Exception {
         try {
             delegate.setNClob("foo", (java.sql.NClob) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setNClob("foo", (java.sql.NClob) null);
     }
@@ -998,7 +998,7 @@ public class TestDelegatingCallableStatement {
     public void testSetNStringStringString() throws Exception {
         try {
             delegate.setNString("foo", "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setNString("foo", "foo");
     }
@@ -1007,7 +1007,7 @@ public class TestDelegatingCallableStatement {
     public void testSetNullStringInteger() throws Exception {
         try {
             delegate.setNull("foo", 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setNull("foo", 1);
     }
@@ -1016,7 +1016,7 @@ public class TestDelegatingCallableStatement {
     public void testSetNullStringIntegerString() throws Exception {
         try {
             delegate.setNull("foo", 1, "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setNull("foo", 1, "foo");
     }
@@ -1025,7 +1025,7 @@ public class TestDelegatingCallableStatement {
     public void testSetObjectStringObjectIntegerInteger() throws Exception {
         try {
             delegate.setObject("foo", System.err, 1, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setObject("foo", System.err, 1, 1);
     }
@@ -1034,7 +1034,7 @@ public class TestDelegatingCallableStatement {
     public void testSetObjectStringObjectSQLType() throws Exception {
         try {
             delegate.setObject("foo", System.err, (java.sql.SQLType) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setObject("foo", System.err, (java.sql.SQLType) null);
     }
@@ -1043,7 +1043,7 @@ public class TestDelegatingCallableStatement {
     public void testSetObjectStringObjectSQLTypeInteger() throws Exception {
         try {
             delegate.setObject("foo", System.err, (java.sql.SQLType) null, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setObject("foo", System.err, (java.sql.SQLType) null, 1);
     }
@@ -1052,7 +1052,7 @@ public class TestDelegatingCallableStatement {
     public void testSetObjectStringObjectInteger() throws Exception {
         try {
             delegate.setObject("foo", System.err, 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setObject("foo", System.err, 1);
     }
@@ -1061,7 +1061,7 @@ public class TestDelegatingCallableStatement {
     public void testSetObjectStringObject() throws Exception {
         try {
             delegate.setObject("foo", System.err);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setObject("foo", System.err);
     }
@@ -1070,7 +1070,7 @@ public class TestDelegatingCallableStatement {
     public void testSetRowIdStringRowId() throws Exception {
         try {
             delegate.setRowId("foo", (java.sql.RowId) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setRowId("foo", (java.sql.RowId) null);
     }
@@ -1079,7 +1079,7 @@ public class TestDelegatingCallableStatement {
     public void testSetSQLXMLStringSQLXML() throws Exception {
         try {
             delegate.setSQLXML("foo", (java.sql.SQLXML) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setSQLXML("foo", (java.sql.SQLXML) null);
     }
@@ -1088,7 +1088,7 @@ public class TestDelegatingCallableStatement {
     public void testSetShortStringShort() throws Exception {
         try {
             delegate.setShort("foo", (short) 1);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setShort("foo", (short) 1);
     }
@@ -1097,7 +1097,7 @@ public class TestDelegatingCallableStatement {
     public void testSetStringStringString() throws Exception {
         try {
             delegate.setString("foo", "foo");
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setString("foo", "foo");
     }
@@ -1106,7 +1106,7 @@ public class TestDelegatingCallableStatement {
     public void testSetTimeStringTimeCalendar() throws Exception {
         try {
             delegate.setTime("foo", (java.sql.Time) null, (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setTime("foo", (java.sql.Time) null, (java.util.Calendar) null);
     }
@@ -1115,7 +1115,7 @@ public class TestDelegatingCallableStatement {
     public void testSetTimeStringTime() throws Exception {
         try {
             delegate.setTime("foo", (java.sql.Time) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setTime("foo", (java.sql.Time) null);
     }
@@ -1124,7 +1124,7 @@ public class TestDelegatingCallableStatement {
     public void testSetTimestampStringTimestamp() throws Exception {
         try {
             delegate.setTimestamp("foo", (java.sql.Timestamp) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setTimestamp("foo", (java.sql.Timestamp) null);
     }
@@ -1133,7 +1133,7 @@ public class TestDelegatingCallableStatement {
     public void testSetTimestampStringTimestampCalendar() throws Exception {
         try {
             delegate.setTimestamp("foo", (java.sql.Timestamp) null, (java.util.Calendar) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setTimestamp("foo", (java.sql.Timestamp) null, (java.util.Calendar) null);
     }
@@ -1142,7 +1142,7 @@ public class TestDelegatingCallableStatement {
     public void testSetURLStringUrl() throws Exception {
         try {
             delegate.setURL("foo", (java.net.URL) null);
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).setURL("foo", (java.net.URL) null);
     }
@@ -1151,7 +1151,7 @@ public class TestDelegatingCallableStatement {
     public void testWasNull() throws Exception {
         try {
             delegate.wasNull();
-        } catch (SQLException e) {
+        } catch (final SQLException e) {
         }
         verify(obj, times(1)).wasNull();
     }