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
