Repository: commons-dbutils Updated Branches: refs/heads/master 41e682d63 -> e2c137f95
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/MockResultSetMetaData.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/MockResultSetMetaData.java b/src/test/java/org/apache/commons/dbutils/MockResultSetMetaData.java index 92e4f29..2208d33 100644 --- a/src/test/java/org/apache/commons/dbutils/MockResultSetMetaData.java +++ b/src/test/java/org/apache/commons/dbutils/MockResultSetMetaData.java @@ -62,7 +62,7 @@ public class MockResultSetMetaData implements InvocationHandler { public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { - String methodName = method.getName(); + final String methodName = method.getName(); if (methodName.equals("getColumnCount")) { return Integer.valueOf(this.columnNames.length); @@ -70,13 +70,13 @@ public class MockResultSetMetaData implements InvocationHandler { } else if ( methodName.equals("getColumnName")) { - int col = ((Integer) args[0]).intValue() - 1; + final int col = ((Integer) args[0]).intValue() - 1; return this.columnNames[col]; } else if ( methodName.equals("getColumnLabel")) { - int col = ((Integer) args[0]).intValue() - 1; + final int col = ((Integer) args[0]).intValue() - 1; return this.columnLabels[col]; } else if (methodName.equals("hashCode")) { http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/QueryLoaderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/QueryLoaderTest.java b/src/test/java/org/apache/commons/dbutils/QueryLoaderTest.java index 830272c..49901b0 100644 --- a/src/test/java/org/apache/commons/dbutils/QueryLoaderTest.java +++ b/src/test/java/org/apache/commons/dbutils/QueryLoaderTest.java @@ -28,25 +28,25 @@ public class QueryLoaderTest extends BaseTestCase { "/org/apache/commons/dbutils/TestQueries.properties"; public void testLoad() throws IOException { - QueryLoader loader = QueryLoader.instance(); - Map<String,String> q = loader.load(QUERIES); - Map<String,String> q2 = loader.load(QUERIES); + final QueryLoader loader = QueryLoader.instance(); + final Map<String,String> q = loader.load(QUERIES); + final Map<String,String> q2 = loader.load(QUERIES); assertTrue(q == q2); // pointer comparison should return true assertEquals("SELECT * FROM SomeTable", q.get("test.query")); loader.unload(QUERIES); - Map<String,String> q3 = loader.load(QUERIES); + final Map<String,String> q3 = loader.load(QUERIES); assertTrue(q != q3); // pointer comparison should return false } public void testLoadThrowsIllegalArgumentException() throws IOException { - QueryLoader queryLoader = QueryLoader.instance(); + final QueryLoader queryLoader = QueryLoader.instance(); try { queryLoader.load("e"); fail("Expecting exception: IllegalArgumentException"); - } catch(IllegalArgumentException e) { + } catch(final IllegalArgumentException e) { assertEquals("e not found.",e.getMessage()); assertEquals(QueryLoader.class.getName(), e.getStackTrace()[0].getClassName()); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java b/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java index f95ac95..ddf7e8f 100644 --- a/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java +++ b/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java @@ -108,7 +108,7 @@ public class QueryRunnerTest { @Test public void testGoodBatch() throws Exception { - String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; + final String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; callGoodBatch(params); } @@ -116,7 +116,7 @@ public class QueryRunnerTest { @Test public void testGoodBatchPmdTrue() throws Exception { runner = new QueryRunner(dataSource, true); - String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; + final String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; callGoodBatch(params); } @@ -124,14 +124,14 @@ public class QueryRunnerTest { @Test public void testGoodBatchDefaultConstructor() throws Exception { runner = new QueryRunner(); - String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; + final String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; callGoodBatch(conn, params); } @Test public void testNullParamsBatch() throws Exception { - String[][] params = new String[][] { { null, "unit" }, { "test", null } }; + final String[][] params = new String[][] { { null, "unit" }, { "test", null } }; callGoodBatch(params); } @@ -149,7 +149,7 @@ public class QueryRunnerTest { verify(stmt, times(1)).executeBatch(); verify(stmt, times(1)).close(); // make sure the statement is closed verify(conn, times(1)).close(); // make sure the connection is closed - } catch(SQLException e) { + } catch(final SQLException e) { caught = true; } @@ -160,21 +160,21 @@ public class QueryRunnerTest { @Test public void testTooFewParamsBatch() throws Exception { - String[][] params = new String[][] { { "unit" }, { "test" } }; + final String[][] params = new String[][] { { "unit" }, { "test" } }; callBatchWithException("select * from blah where ? = ?", params); } @Test public void testTooManyParamsBatch() throws Exception { - String[][] params = new String[][] { { "unit", "unit", "unit" }, { "test", "test", "test" } }; + final String[][] params = new String[][] { { "unit", "unit", "unit" }, { "test", "test", "test" } }; callBatchWithException("select * from blah where ? = ?", params); } @Test(expected=SQLException.class) public void testNullConnectionBatch() throws Exception { - String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; + final String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; when(meta.getParameterCount()).thenReturn(2); when(dataSource.getConnection()).thenReturn(null); @@ -184,7 +184,7 @@ public class QueryRunnerTest { @Test(expected=SQLException.class) public void testNullSqlBatch() throws Exception { - String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; + final String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; when(meta.getParameterCount()).thenReturn(2); @@ -200,7 +200,7 @@ public class QueryRunnerTest { @Test public void testAddBatchException() throws Exception { - String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; + final String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; doThrow(new SQLException()).when(stmt).addBatch(); @@ -209,7 +209,7 @@ public class QueryRunnerTest { @Test public void testExecuteBatchException() throws Exception { - String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; + final String[][] params = new String[][] { { "unit", "unit" }, { "test", "test" } }; doThrow(new SQLException()).when(stmt).executeBatch(); @@ -289,7 +289,7 @@ public class QueryRunnerTest { verify(results, times(1)).close(); verify(stmt, times(1)).close(); // make sure we closed the statement verify(conn, times(1)).close(); // make sure we closed the connection - } catch(SQLException e) { + } catch(final SQLException e) { caught = true; } @@ -423,7 +423,7 @@ public class QueryRunnerTest { when(results.next()).thenReturn(true).thenReturn(false); when(results.getObject(1)).thenReturn(1L); - Long generatedKey = runner.insert("INSERT INTO blah(col1, col2) VALUES(?,?)", new ScalarHandler<Long>(), "unit", "test"); + final Long generatedKey = runner.insert("INSERT INTO blah(col1, col2) VALUES(?,?)", new ScalarHandler<Long>(), "unit", "test"); verify(stmt, times(1)).executeUpdate(); verify(stmt, times(1)).close(); // make sure we closed the statement @@ -444,12 +444,12 @@ public class QueryRunnerTest { when(results.getMetaData()).thenReturn(resultsMeta); when(resultsMeta.getColumnCount()).thenReturn(1); - ResultSetHandler<List<Object>> handler = new ResultSetHandler<List<Object>>() + final ResultSetHandler<List<Object>> handler = new ResultSetHandler<List<Object>>() { @Override public List<Object> handle(final ResultSet rs) throws SQLException { - List<Object> objects = new ArrayList<>(); + final List<Object> objects = new ArrayList<>(); while (rs.next()) { objects.add(new Object()); @@ -458,13 +458,13 @@ public class QueryRunnerTest { } }; - Object[][] params = new Object[2][2]; + final Object[][] params = new Object[2][2]; params[0][0] = "Test"; params[0][1] = "Blah"; params[1][0] = "Test2"; params[1][1] = "Blah2"; - List<Object> generatedKeys = runner.insertBatch("INSERT INTO blah(col1, col2) VALUES(?,?)", handler, params); + final List<Object> generatedKeys = runner.insertBatch("INSERT INTO blah(col1, col2) VALUES(?,?)", handler, params); verify(stmt, times(2)).addBatch(); verify(stmt, times(1)).executeBatch(); @@ -485,7 +485,7 @@ public class QueryRunnerTest { verify(stmt, times(1)).executeUpdate(); verify(stmt, times(1)).close(); // make sure we closed the statement verify(conn, times(1)).close(); // make sure we closed the connection - } catch(SQLException e) { + } catch(final SQLException e) { caught = true; } @@ -533,8 +533,8 @@ public class QueryRunnerTest { @Test public void testStatementConfiguration() throws Exception { - StatementConfiguration stmtConfig = new StatementConfiguration(1, 2, 3, 4, 5); - QueryRunner queryRunner = new QueryRunner(stmtConfig); + final StatementConfiguration stmtConfig = new StatementConfiguration(1, 2, 3, 4, 5); + final QueryRunner queryRunner = new QueryRunner(stmtConfig); queryRunner.prepareStatement(conn, "select 1"); verify(stmt).setFetchDirection(eq(1)); @@ -573,7 +573,7 @@ public class QueryRunnerTest { // Test single OUT parameter when(meta.getParameterCount()).thenReturn(1); when(call.getObject(1)).thenReturn(42); - OutParameter<Integer> intParam = + final OutParameter<Integer> intParam = new OutParameter<>(Types.INTEGER, Integer.class); result = runner.execute(conn, "{?= call my_proc()}", intParam); @@ -602,7 +602,7 @@ public class QueryRunnerTest { when(call.getObject(1)).thenReturn(24); when(call.getObject(3)).thenReturn("out"); intParam.setValue(null); - OutParameter<String> stringParam = + final OutParameter<String> stringParam = new OutParameter<>(Types.VARCHAR, String.class, "in"); result = runner.execute(conn, "{?= call my_proc(?, ?)}", intParam, "test", stringParam); @@ -641,7 +641,7 @@ public class QueryRunnerTest { // Test single OUT parameter when(meta.getParameterCount()).thenReturn(1); when(call.getObject(1)).thenReturn(42); - OutParameter<Integer> intParam = + final OutParameter<Integer> intParam = new OutParameter<>(Types.INTEGER, Integer.class); result = runner.execute("{?= call my_proc()}", intParam); @@ -670,7 +670,7 @@ public class QueryRunnerTest { when(call.getObject(1)).thenReturn(24); when(call.getObject(3)).thenReturn("out"); intParam.setValue(null); - OutParameter<String> stringParam = + final OutParameter<String> stringParam = new OutParameter<>(Types.VARCHAR, String.class, "in"); result = runner.execute("{?= call my_proc(?, ?)}", intParam, "test", stringParam); @@ -709,7 +709,7 @@ public class QueryRunnerTest { when(meta.getParameterCount()).thenReturn(2); runner.query("{call my_proc(?, ?)}", handler, params); - } catch(SQLException e) { + } catch(final SQLException e) { caught = true; } @@ -779,7 +779,7 @@ public class QueryRunnerTest { } }); when(meta.getParameterCount()).thenReturn(0); - List<Object[]> objects = runner.execute("{call my_proc()}", handler); + final List<Object[]> objects = runner.execute("{call my_proc()}", handler); Assert.assertEquals(3, objects.size()); verify(call, times(1)).execute(); @@ -812,7 +812,7 @@ public class QueryRunnerTest { // Test single OUT parameter when(meta.getParameterCount()).thenReturn(1); when(call.getObject(1)).thenReturn(42); - OutParameter<Integer> intParam = + final OutParameter<Integer> intParam = new OutParameter<>(Types.INTEGER, Integer.class); runner.execute(conn, "{?= call my_proc()}", handler, intParam); @@ -841,7 +841,7 @@ public class QueryRunnerTest { when(call.getObject(1)).thenReturn(24); when(call.getObject(3)).thenReturn("out"); intParam.setValue(null); - OutParameter<String> stringParam = + final OutParameter<String> stringParam = new OutParameter<>(Types.VARCHAR, String.class, "in"); runner.execute(conn, "{?= call my_proc(?, ?)}", handler, intParam, "test", stringParam); @@ -877,7 +877,7 @@ public class QueryRunnerTest { // Test single OUT parameter when(meta.getParameterCount()).thenReturn(1); when(call.getObject(1)).thenReturn(42); - OutParameter<Integer> intParam = + final OutParameter<Integer> intParam = new OutParameter<>(Types.INTEGER, Integer.class); runner.execute("{?= call my_proc()}", handler, intParam); @@ -906,7 +906,7 @@ public class QueryRunnerTest { when(call.getObject(1)).thenReturn(24); when(call.getObject(3)).thenReturn("out"); intParam.setValue(null); - OutParameter<String> stringParam = + final OutParameter<String> stringParam = new OutParameter<>(Types.VARCHAR, String.class, "in"); runner.execute("{?= call my_proc(?, ?)}", handler, intParam, "test", stringParam); @@ -945,7 +945,7 @@ public class QueryRunnerTest { when(meta.getParameterCount()).thenReturn(2); runner.query("{call my_proc(?, ?)}", handler, params); - } catch(SQLException e) { + } catch(final SQLException e) { caught = true; } @@ -1016,14 +1016,14 @@ public class QueryRunnerTest { @Test public void testFillStatementWithBean() throws Exception { - MyBean bean = new MyBean(); + final MyBean bean = new MyBean(); when(meta.getParameterCount()).thenReturn(3); runner.fillStatementWithBean(stmt, bean, new String[] { "a", "b", "c" }); } @Test(expected=NullPointerException.class) public void testFillStatementWithBeanNullNames() throws Exception { - MyBean bean = new MyBean(); + final MyBean bean = new MyBean(); when(meta.getParameterCount()).thenReturn(3); runner.fillStatementWithBean(stmt, bean, new String[] { "a", "b", null }); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java b/src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java index e632f77..23cda5c 100644 --- a/src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java +++ b/src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java @@ -31,7 +31,7 @@ public class ResultSetIteratorTest extends BaseTestCase { public void testNext() { - Iterator<Object[]> iter = new ResultSetIterator(this.rs); + final Iterator<Object[]> iter = new ResultSetIterator(this.rs); Object[] row = null; assertTrue(iter.hasNext()); @@ -55,14 +55,14 @@ public class ResultSetIteratorTest extends BaseTestCase { @Test public void testRethrowThrowsRuntimeException() { - ResultSetIterator resultSetIterator = new ResultSetIterator((ResultSet) null); - Throwable throwable = new Throwable(); - SQLException sQLException = new SQLException(throwable); + final ResultSetIterator resultSetIterator = new ResultSetIterator((ResultSet) null); + final Throwable throwable = new Throwable(); + final SQLException sQLException = new SQLException(throwable); try { resultSetIterator.rethrow(sQLException); fail("Expecting exception: RuntimeException"); - } catch(RuntimeException e) { + } catch(final RuntimeException e) { assertEquals(ResultSetIterator.class.getName(), e.getStackTrace()[0].getClassName()); } @@ -71,8 +71,8 @@ public class ResultSetIteratorTest extends BaseTestCase { @Test public void testCreatesResultSetIteratorTakingThreeArgumentsAndCallsRemove() { - ResultSet resultSet = mock(ResultSet.class); - ResultSetIterator resultSetIterator = new ResultSetIterator(resultSet,null); + final ResultSet resultSet = mock(ResultSet.class); + final ResultSetIterator resultSetIterator = new ResultSetIterator(resultSet,null); resultSetIterator.remove(); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/ServiceLoaderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/ServiceLoaderTest.java b/src/test/java/org/apache/commons/dbutils/ServiceLoaderTest.java index 52f8204..694b80a 100644 --- a/src/test/java/org/apache/commons/dbutils/ServiceLoaderTest.java +++ b/src/test/java/org/apache/commons/dbutils/ServiceLoaderTest.java @@ -38,7 +38,7 @@ public class ServiceLoaderTest { @Test public void testFindsLocalColumnHandler() { boolean found = false; - for (ColumnHandler handler : columns) { + for (final ColumnHandler handler : columns) { // this class is defined outside of the main classes in dbutils if (handler instanceof TestColumnHandler) { found = true; @@ -51,7 +51,7 @@ public class ServiceLoaderTest { @Test public void testFindsLocalPropertyHandler() { boolean found = false; - for (PropertyHandler handler : properties) { + for (final PropertyHandler handler : properties) { // this class is defined outside of the main classes in dbutils if (handler instanceof TestPropertyHandler) { found = true; @@ -68,7 +68,7 @@ public class ServiceLoaderTest { @Test public void testFindMoreThanLocalColumns() { int count = 0; - for (ColumnHandler handler : columns) { + for (final ColumnHandler handler : columns) { count++; } @@ -82,7 +82,7 @@ public class ServiceLoaderTest { @Test public void testFindMoreThanLocalProperties() { int count = 0; - for (PropertyHandler handler : properties) { + for (final PropertyHandler handler : properties) { count++; } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/StatementConfigurationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/StatementConfigurationTest.java b/src/test/java/org/apache/commons/dbutils/StatementConfigurationTest.java index 1e33c4f..7361373 100644 --- a/src/test/java/org/apache/commons/dbutils/StatementConfigurationTest.java +++ b/src/test/java/org/apache/commons/dbutils/StatementConfigurationTest.java @@ -28,7 +28,7 @@ public class StatementConfigurationTest { */ @Test public void testEmptyBuilder() { - StatementConfiguration config = new StatementConfiguration.Builder().build(); + final StatementConfiguration config = new StatementConfiguration.Builder().build(); assertFalse(config.isFetchDirectionSet()); assertFalse(config.isFetchSizeSet()); @@ -42,13 +42,13 @@ public class StatementConfigurationTest { */ @Test public void testBuilder() { - StatementConfiguration.Builder builder = new StatementConfiguration.Builder() + final StatementConfiguration.Builder builder = new StatementConfiguration.Builder() .fetchDirection(1) .fetchSize(2) .maxFieldSize(3) .maxRows(4) .queryTimeout(5); - StatementConfiguration config = builder.build(); + final StatementConfiguration config = builder.build(); assertTrue(config.isFetchDirectionSet()); assertEquals(Integer.valueOf(1), config.getFetchDirection()); @@ -71,7 +71,7 @@ public class StatementConfigurationTest { */ @Test public void testConstructor() { - StatementConfiguration config = new StatementConfiguration(1, 2, 3, 4, 5); + final StatementConfiguration config = new StatementConfiguration(1, 2, 3, 4, 5); assertEquals(Integer.valueOf(1), config.getFetchDirection()); assertEquals(Integer.valueOf(2), config.getFetchSize()); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/ArrayHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/ArrayHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/ArrayHandlerTest.java index 32aec57..c9888bd 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/ArrayHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/ArrayHandlerTest.java @@ -31,8 +31,8 @@ import org.apache.commons.dbutils.ResultSetHandler; public class ArrayHandlerTest extends BaseTestCase { public void testHandle() throws SQLException { - ResultSetHandler<Object[]> h = new ArrayHandler(); - Object[] results = h.handle(this.rs); + final ResultSetHandler<Object[]> h = new ArrayHandler(); + final Object[] results = h.handle(this.rs); assertNotNull(results); assertEquals(COLS, results.length); @@ -42,8 +42,8 @@ public class ArrayHandlerTest extends BaseTestCase { } public void testEmptyResultSetHandle() throws SQLException { - ResultSetHandler<Object[]> h = new ArrayHandler(); - Object[] results = h.handle(this.emptyResultSet); + final ResultSetHandler<Object[]> h = new ArrayHandler(); + final Object[] results = h.handle(this.emptyResultSet); assertThat(results, is(emptyArray())); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/ArrayListHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/ArrayListHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/ArrayListHandlerTest.java index c60da2c..a8013ac 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/ArrayListHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/ArrayListHandlerTest.java @@ -29,13 +29,13 @@ import org.apache.commons.dbutils.ResultSetHandler; public class ArrayListHandlerTest extends BaseTestCase { public void testHandle() throws SQLException { - ResultSetHandler<List<Object[]>> h = new ArrayListHandler(); - List<Object[]> results = h.handle(this.rs); + final ResultSetHandler<List<Object[]>> h = new ArrayListHandler(); + final List<Object[]> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); - Iterator<Object[]> iter = results.iterator(); + final Iterator<Object[]> iter = results.iterator(); Object[] row = null; assertTrue(iter.hasNext()); row = iter.next(); @@ -56,8 +56,8 @@ public class ArrayListHandlerTest extends BaseTestCase { } public void testEmptyResultSetHandle() throws SQLException { - ResultSetHandler<List<Object[]>> h = new ArrayListHandler(); - List<Object[]> results = h.handle(this.emptyResultSet); + final ResultSetHandler<List<Object[]>> h = new ArrayListHandler(); + final List<Object[]> results = h.handle(this.emptyResultSet); assertNotNull(results); assertTrue(results.isEmpty()); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/BeanHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/BeanHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/BeanHandlerTest.java index 6d5e2cb..4a2e0c7 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/BeanHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/BeanHandlerTest.java @@ -28,8 +28,8 @@ import org.apache.commons.dbutils.TestBean; public class BeanHandlerTest extends BaseTestCase { public void testHandle() throws SQLException { - ResultSetHandler<TestBean> h = new BeanHandler<>(TestBean.class); - TestBean results = h.handle(this.rs); + final ResultSetHandler<TestBean> h = new BeanHandler<>(TestBean.class); + final TestBean results = h.handle(this.rs); assertNotNull(results); assertEquals("1", results.getOne()); @@ -39,15 +39,15 @@ public class BeanHandlerTest extends BaseTestCase { } public void testEmptyResultSetHandle() throws SQLException { - ResultSetHandler<TestBean> h = new BeanHandler<>(TestBean.class); - TestBean results = h.handle(this.emptyResultSet); + final ResultSetHandler<TestBean> h = new BeanHandler<>(TestBean.class); + final TestBean results = h.handle(this.emptyResultSet); assertNull(results); } public void testHandleToSuperClass() throws SQLException { - ResultSetHandler<TestBean> h = new BeanHandler<TestBean>(SubTestBean.class); - TestBean results = h.handle(this.rs); + final ResultSetHandler<TestBean> h = new BeanHandler<TestBean>(SubTestBean.class); + final TestBean results = h.handle(this.rs); assertNotNull(results); assertEquals("1", results.getOne()); @@ -57,8 +57,8 @@ public class BeanHandlerTest extends BaseTestCase { } public void testHandleToInterface() throws SQLException { - ResultSetHandler<SubTestBeanInterface> h = new BeanHandler<SubTestBeanInterface>(SubTestBean.class); - SubTestBeanInterface results = h.handle(this.rs); + final ResultSetHandler<SubTestBeanInterface> h = new BeanHandler<SubTestBeanInterface>(SubTestBean.class); + final SubTestBeanInterface results = h.handle(this.rs); assertNotNull(results); assertEquals("1", results.getOne()); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/BeanListHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/BeanListHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/BeanListHandlerTest.java index d5b293b..0284cdf 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/BeanListHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/BeanListHandlerTest.java @@ -30,13 +30,13 @@ import org.apache.commons.dbutils.TestBean; public class BeanListHandlerTest extends BaseTestCase { public void testHandle() throws SQLException { - ResultSetHandler<List<TestBean>> h = new BeanListHandler<>(TestBean.class); - List<TestBean> results = h.handle(this.rs); + final ResultSetHandler<List<TestBean>> h = new BeanListHandler<>(TestBean.class); + final List<TestBean> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); - Iterator<TestBean> iter = results.iterator(); + final Iterator<TestBean> iter = results.iterator(); TestBean row = null; assertTrue(iter.hasNext()); row = iter.next(); @@ -57,21 +57,21 @@ public class BeanListHandlerTest extends BaseTestCase { } public void testEmptyResultSetHandle() throws SQLException { - ResultSetHandler<List<TestBean>> h = new BeanListHandler<>(TestBean.class); - List<TestBean> results = h.handle(this.emptyResultSet); + final ResultSetHandler<List<TestBean>> h = new BeanListHandler<>(TestBean.class); + final List<TestBean> results = h.handle(this.emptyResultSet); assertNotNull(results); assertTrue(results.isEmpty()); } public void testHandleToSuperClass() throws SQLException { - ResultSetHandler<List<TestBean>> h = new BeanListHandler<TestBean>(SubTestBean.class); - List<TestBean> results = h.handle(this.rs); + final ResultSetHandler<List<TestBean>> h = new BeanListHandler<TestBean>(SubTestBean.class); + final List<TestBean> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); - Iterator<TestBean> iter = results.iterator(); + final Iterator<TestBean> iter = results.iterator(); TestBean row = null; assertTrue(iter.hasNext()); row = iter.next(); @@ -95,13 +95,13 @@ public class BeanListHandlerTest extends BaseTestCase { } public void testHandleToInterface() throws SQLException { - ResultSetHandler<List<SubTestBeanInterface>> h = new BeanListHandler<SubTestBeanInterface>(SubTestBean.class); - List<SubTestBeanInterface> results = h.handle(this.rs); + final ResultSetHandler<List<SubTestBeanInterface>> h = new BeanListHandler<SubTestBeanInterface>(SubTestBean.class); + final List<SubTestBeanInterface> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); - Iterator<SubTestBeanInterface> iter = results.iterator(); + final Iterator<SubTestBeanInterface> iter = results.iterator(); SubTestBeanInterface row = null; assertTrue(iter.hasNext()); row = iter.next(); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java index f6f8513..dd19d2d 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/ColumnListHandlerTest.java @@ -28,8 +28,8 @@ import org.apache.commons.dbutils.ResultSetHandler; public class ColumnListHandlerTest extends BaseTestCase { public void testHandle() throws SQLException { - ResultSetHandler<List<String>> h = new ColumnListHandler<>(); - List<String> results = h.handle(this.rs); + final ResultSetHandler<List<String>> h = new ColumnListHandler<>(); + final List<String> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); @@ -39,8 +39,8 @@ public class ColumnListHandlerTest extends BaseTestCase { } public void testColumnIndexHandle() throws SQLException { - ResultSetHandler<List<String>> h = new ColumnListHandler<>(2); - List<String> results = h.handle(this.rs); + final ResultSetHandler<List<String>> h = new ColumnListHandler<>(2); + final List<String> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); @@ -50,8 +50,8 @@ public class ColumnListHandlerTest extends BaseTestCase { } public void testColumnNameHandle() throws SQLException { - ResultSetHandler<List<Integer>> h = new ColumnListHandler<>("intTest"); - List<Integer> results = h.handle(this.rs); + final ResultSetHandler<List<Integer>> h = new ColumnListHandler<>("intTest"); + final List<Integer> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); @@ -61,8 +61,8 @@ public class ColumnListHandlerTest extends BaseTestCase { } public void testEmptyResultSetHandle() throws SQLException { - ResultSetHandler<List<String>> h = new ColumnListHandler<>(); - List<String> results = h.handle(this.emptyResultSet); + final ResultSetHandler<List<String>> h = new ColumnListHandler<>(); + final List<String> results = h.handle(this.emptyResultSet); assertNotNull(results); assertTrue(results.isEmpty()); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java index 8a9f97d..b81c076 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java @@ -26,17 +26,17 @@ import org.apache.commons.dbutils.ResultSetHandler; public class KeyedHandlerTest extends BaseTestCase { public void testHandle() throws SQLException { - ResultSetHandler<Map<String,Map<String,Object>>> h = new KeyedHandler<>(); + final ResultSetHandler<Map<String,Map<String,Object>>> h = new KeyedHandler<>(); - Map<String,Map<String,Object>> results = h.handle(this.rs); + final Map<String,Map<String,Object>> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); Map<String,Object> row = null; - for(Entry<String, Map<String, Object>> entry : results.entrySet()) + for(final Entry<String, Map<String, Object>> entry : results.entrySet()) { - Object key = entry.getKey(); + final Object key = entry.getKey(); assertNotNull(key); row = entry.getValue(); assertNotNull(row); @@ -49,16 +49,16 @@ public class KeyedHandlerTest extends BaseTestCase { } public void testColumnIndexHandle() throws SQLException { - ResultSetHandler<Map<String,Map<String,Object>>> h = new KeyedHandler<>(2); - Map<String,Map<String,Object>> results = h.handle(this.rs); + final ResultSetHandler<Map<String,Map<String,Object>>> h = new KeyedHandler<>(2); + final Map<String,Map<String,Object>> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); Map<String,Object> row = null; - for(Entry<String, Map<String, Object>> entry : results.entrySet()) + for(final Entry<String, Map<String, Object>> entry : results.entrySet()) { - Object key = entry.getKey(); + final Object key = entry.getKey(); assertNotNull(key); row = entry.getValue(); assertNotNull(row); @@ -71,16 +71,16 @@ public class KeyedHandlerTest extends BaseTestCase { } public void testColumnNameHandle() throws SQLException { - ResultSetHandler<Map<Integer,Map<String,Object>>> h = new KeyedHandler<>("intTest"); - Map<Integer,Map<String,Object>> results = h.handle(this.rs); + final ResultSetHandler<Map<Integer,Map<String,Object>>> h = new KeyedHandler<>("intTest"); + final Map<Integer,Map<String,Object>> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); Map<String,Object> row = null; - for(Entry<Integer, Map<String, Object>> entry : results.entrySet()) + for(final Entry<Integer, Map<String, Object>> entry : results.entrySet()) { - Object key = entry.getKey(); + final Object key = entry.getKey(); assertNotNull(key); row = entry.getValue(); assertNotNull(row); @@ -93,8 +93,8 @@ public class KeyedHandlerTest extends BaseTestCase { } public void testEmptyResultSetHandle() throws SQLException { - ResultSetHandler<Map<String,Map<String,Object>>> h = new KeyedHandler<>(); - Map<String,Map<String,Object>> results = h.handle(this.emptyResultSet); + final ResultSetHandler<Map<String,Map<String,Object>>> h = new KeyedHandler<>(); + final Map<String,Map<String,Object>> results = h.handle(this.emptyResultSet); assertNotNull(results); assertTrue(results.isEmpty()); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/MapHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/MapHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/MapHandlerTest.java index 380f4f8..1bbc07e 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/MapHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/MapHandlerTest.java @@ -28,8 +28,8 @@ import org.apache.commons.dbutils.ResultSetHandler; public class MapHandlerTest extends BaseTestCase { public void testHandle() throws SQLException { - ResultSetHandler<Map<String,Object>> h = new MapHandler(); - Map<String,Object> results = h.handle(this.rs); + final ResultSetHandler<Map<String,Object>> h = new MapHandler(); + final Map<String,Object> results = h.handle(this.rs); assertNotNull(results); assertEquals(COLS, results.keySet().size()); @@ -39,8 +39,8 @@ public class MapHandlerTest extends BaseTestCase { } public void testEmptyResultSetHandle() throws SQLException { - ResultSetHandler<Map<String,Object>> h = new MapHandler(); - Map<String,Object> results = h.handle(this.emptyResultSet); + final ResultSetHandler<Map<String,Object>> h = new MapHandler(); + final Map<String,Object> results = h.handle(this.emptyResultSet); assertNull(results); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/MapListHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/MapListHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/MapListHandlerTest.java index c46a38e..e7eb5a7 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/MapListHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/MapListHandlerTest.java @@ -30,13 +30,13 @@ import org.apache.commons.dbutils.ResultSetHandler; public class MapListHandlerTest extends BaseTestCase { public void testHandle() throws SQLException { - ResultSetHandler<List<Map<String,Object>>> h = new MapListHandler(); - List<Map<String,Object>> results = h.handle(this.rs); + final ResultSetHandler<List<Map<String,Object>>> h = new MapListHandler(); + final List<Map<String,Object>> results = h.handle(this.rs); assertNotNull(results); assertEquals(ROWS, results.size()); - Iterator<Map<String,Object>> iter = results.iterator(); + final Iterator<Map<String,Object>> iter = results.iterator(); Map<String,Object> row = null; assertTrue(iter.hasNext()); row = iter.next(); @@ -57,8 +57,8 @@ public class MapListHandlerTest extends BaseTestCase { } public void testEmptyResultSetHandle() throws SQLException { - ResultSetHandler<List<Map<String,Object>>> h = new MapListHandler(); - List<Map<String,Object>> results = h.handle(this.emptyResultSet); + final ResultSetHandler<List<Map<String,Object>>> h = new MapListHandler(); + final List<Map<String,Object>> results = h.handle(this.emptyResultSet); assertNotNull(results); assertTrue(results.isEmpty()); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/ScalarHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/ScalarHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/ScalarHandlerTest.java index ef635fb..a0e1a89 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/ScalarHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/ScalarHandlerTest.java @@ -24,29 +24,29 @@ import org.apache.commons.dbutils.ResultSetHandler; public class ScalarHandlerTest extends BaseTestCase { public void testHandle() throws SQLException { - ResultSetHandler<String> h = new ScalarHandler<>(); - Object results = h.handle(this.rs); + final ResultSetHandler<String> h = new ScalarHandler<>(); + final Object results = h.handle(this.rs); assertNotNull(results); assertEquals("1", results); } public void testColumnIndexHandle() throws SQLException { - ResultSetHandler<String> h = new ScalarHandler<>(2); - Object results = h.handle(this.rs); + final ResultSetHandler<String> h = new ScalarHandler<>(2); + final Object results = h.handle(this.rs); assertNotNull(results); assertEquals("2", results); } public void testColumnNameHandle() throws SQLException { - ResultSetHandler<Integer> h = new ScalarHandler<>("intTest"); - Object results = h.handle(this.rs); + final ResultSetHandler<Integer> h = new ScalarHandler<>("intTest"); + final Object results = h.handle(this.rs); assertNotNull(results); assertEquals(Integer.valueOf(1), results); } public void testEmptyResultSetHandle() throws SQLException { - ResultSetHandler<String> h = new ScalarHandler<>(); - Object results = h.handle(this.emptyResultSet); + final ResultSetHandler<String> h = new ScalarHandler<>(); + final Object results = h.handle(this.emptyResultSet); assertNull(results); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/properties/DatePropertyHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/properties/DatePropertyHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/properties/DatePropertyHandlerTest.java index d3550ce..81380a0 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/properties/DatePropertyHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/properties/DatePropertyHandlerTest.java @@ -59,7 +59,7 @@ public class DatePropertyHandlerTest { @Test public void testApplyTypeOfTimestamp() throws Exception { - Timestamp ts = new Timestamp(new java.util.Date().getTime()); + final Timestamp ts = new Timestamp(new java.util.Date().getTime()); assertEquals(Timestamp.class, handler.apply(java.sql.Timestamp.class, ts).getClass()); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/handlers/properties/PropertyHandlerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/handlers/properties/PropertyHandlerTest.java b/src/test/java/org/apache/commons/dbutils/handlers/properties/PropertyHandlerTest.java index 8d605fe..5b642b2 100644 --- a/src/test/java/org/apache/commons/dbutils/handlers/properties/PropertyHandlerTest.java +++ b/src/test/java/org/apache/commons/dbutils/handlers/properties/PropertyHandlerTest.java @@ -35,7 +35,7 @@ public class PropertyHandlerTest { @Test public void testServiceLoaderFindsMultipleRegistries() { boolean found = false; - for (PropertyHandler handler : loader) { + for (final PropertyHandler handler : loader) { // this class is defined outside of the main classes of dbutils if (handler instanceof TestPropertyHandler) { found = true; @@ -52,7 +52,7 @@ public class PropertyHandlerTest { @Test public void testFoundMoreThanLocal() { int count = 0; - for (PropertyHandler handler : loader) { + for (final PropertyHandler handler : loader) { count++; } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java b/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java index d26f933..906bf8a 100644 --- a/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java +++ b/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java @@ -73,7 +73,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getAsciiStream("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - InputStream stream = new ByteArrayInputStream(new byte[0]); + final InputStream stream = new ByteArrayInputStream(new byte[0]); rs2.setNullAsciiStream(stream); assertNotNull(rs.getAsciiStream(1)); assertEquals(stream, rs.getAsciiStream(1)); @@ -92,7 +92,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getBigDecimal("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - BigDecimal bd = new BigDecimal(5.0); + final BigDecimal bd = new BigDecimal(5.0); rs2.setNullBigDecimal(bd); assertNotNull(rs.getBigDecimal(1)); assertEquals(bd, rs.getBigDecimal(1)); @@ -111,7 +111,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getBinaryStream("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - InputStream stream = new ByteArrayInputStream(new byte[0]); + final InputStream stream = new ByteArrayInputStream(new byte[0]); rs2.setNullBinaryStream(stream); assertNotNull(rs.getBinaryStream(1)); assertEquals(stream, rs.getBinaryStream(1)); @@ -130,7 +130,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getBlob("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - Blob blob = new SqlNullCheckedResultSetMockBlob(); + final Blob blob = new SqlNullCheckedResultSetMockBlob(); rs2.setNullBlob(blob); assertNotNull(rs.getBlob(1)); assertEquals(blob, rs.getBlob(1)); @@ -165,7 +165,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals((byte) 0, rs.getByte("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - byte b = (byte) 10; + final byte b = (byte) 10; rs2.setNullByte(b); assertEquals(b, rs.getByte(1)); assertEquals(b, rs.getByte("column")); @@ -182,7 +182,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getBytes("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - byte[] b = new byte[5]; + final byte[] b = new byte[5]; for (int i = 0; i < 5; i++) { b[0] = (byte) i; } @@ -202,8 +202,8 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { failNotEquals(null, Arrays.toString(expected), Arrays.toString(actual)); } for (int i = 0; i < expected.length; i++) { - byte expectedItem = expected[i]; - byte actualItem = actual[i]; + final byte expectedItem = expected[i]; + final byte actualItem = actual[i]; assertEquals("Array not equal at index " + i, expectedItem, actualItem); } } @@ -218,7 +218,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getCharacterStream("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - Reader reader = new CharArrayReader("this is a string".toCharArray()); + final Reader reader = new CharArrayReader("this is a string".toCharArray()); rs2.setNullCharacterStream(reader); assertNotNull(rs.getCharacterStream(1)); assertEquals(reader, rs.getCharacterStream(1)); @@ -237,7 +237,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getClob("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - Clob clob = new SqlNullCheckedResultSetMockClob(); + final Clob clob = new SqlNullCheckedResultSetMockClob(); rs2.setNullClob(clob); assertNotNull(rs.getClob(1)); assertEquals(clob, rs.getClob(1)); @@ -260,7 +260,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getDate("column", Calendar.getInstance())); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - java.sql.Date date = new java.sql.Date(new java.util.Date().getTime()); + final java.sql.Date date = new java.sql.Date(new java.util.Date().getTime()); rs2.setNullDate(date); assertNotNull(rs.getDate(1)); assertEquals(date, rs.getDate(1)); @@ -283,7 +283,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals(0.0, rs.getDouble("column"), 0.0); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - double d = 10.0; + final double d = 10.0; rs2.setNullDouble(d); assertEquals(d, rs.getDouble(1), 0.0); assertEquals(d, rs.getDouble("column"), 0.0); @@ -299,7 +299,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals(0, rs.getFloat("column"), 0.0); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - float f = 10; + final float f = 10; rs2.setNullFloat(f); assertEquals(f, rs.getFloat(1), 0.0); assertEquals(f, rs.getFloat("column"), 0.0); @@ -314,7 +314,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals(0, rs.getInt("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - int i = 10; + final int i = 10; rs2.setNullInt(i); assertEquals(i, rs.getInt(1)); assertEquals(i, rs.getInt("column")); @@ -329,7 +329,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals(0, rs.getLong("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - long l = 10; + final long l = 10; rs2.setNullLong(l); assertEquals(l, rs.getLong(1)); assertEquals(l, rs.getLong("column")); @@ -349,7 +349,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getObject("column", (Map<String, Class<?>>) null)); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - Object o = new Object(); + final Object o = new Object(); rs2.setNullObject(o); assertNotNull(rs.getObject(1)); assertEquals(o, rs.getObject(1)); @@ -372,7 +372,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getRef("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - Ref ref = new SqlNullCheckedResultSetMockRef(); + final Ref ref = new SqlNullCheckedResultSetMockRef(); rs2.setNullRef(ref); assertNotNull(rs.getRef(1)); assertEquals(ref, rs.getRef(1)); @@ -391,7 +391,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals((short) 0, rs.getShort("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - short s = (short) 10; + final short s = (short) 10; rs2.setNullShort(s); assertEquals(s, rs.getShort(1)); assertEquals(s, rs.getShort("column")); @@ -406,7 +406,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals(null, rs.getString("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - String s = "hello, world"; + final String s = "hello, world"; rs2.setNullString(s); assertEquals(s, rs.getString(1)); assertEquals(s, rs.getString("column")); @@ -426,7 +426,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getTime("column", Calendar.getInstance())); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - Time time = new Time(new java.util.Date().getTime()); + final Time time = new Time(new java.util.Date().getTime()); rs2.setNullTime(time); assertNotNull(rs.getTime(1)); assertEquals(time, rs.getTime(1)); @@ -453,7 +453,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs.getTimestamp("column", Calendar.getInstance())); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - Timestamp ts = new Timestamp(new java.util.Date().getTime()); + final Timestamp ts = new Timestamp(new java.util.Date().getTime()); rs2.setNullTimestamp(ts); assertNotNull(rs.getTimestamp(1)); assertEquals(ts, rs.getTimestamp(1)); @@ -481,9 +481,9 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { new Class[] { Integer.TYPE } ); getUrlString = ResultSet.class.getMethod("getURL", new Class[] { String.class } ); - } catch(NoSuchMethodException e) { + } catch(final NoSuchMethodException e) { // ignore - } catch(SecurityException e) { + } catch(final SecurityException e) { // ignore } if (getUrlInt != null && getUrlString != null) { @@ -494,7 +494,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { new Object[] { "column" } ) ); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - URL u = new URL("http://www.apache.org";); + final URL u = new URL("http://www.apache.org";); rs2.setNullURL(u); assertEquals(u, getUrlInt.invoke(rs, new Object[] { Integer.valueOf(1) } ) ); @@ -510,7 +510,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs2.getNullAsciiStream()); // Set what gets returned to something other than the default - InputStream stream = new ByteArrayInputStream(new byte[0]); + final InputStream stream = new ByteArrayInputStream(new byte[0]); rs2.setNullAsciiStream(stream); assertNotNull(rs.getAsciiStream(1)); assertEquals(stream, rs.getAsciiStream(1)); @@ -526,7 +526,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs2.getNullBigDecimal()); // Set what gets returned to something other than the default - BigDecimal bd = new BigDecimal(5.0); + final BigDecimal bd = new BigDecimal(5.0); rs2.setNullBigDecimal(bd); assertNotNull(rs.getBigDecimal(1)); assertEquals(bd, rs.getBigDecimal(1)); @@ -542,7 +542,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs2.getNullBinaryStream()); // Set what gets returned to something other than the default - InputStream stream = new ByteArrayInputStream(new byte[0]); + final InputStream stream = new ByteArrayInputStream(new byte[0]); rs2.setNullBinaryStream(stream); assertNotNull(rs.getBinaryStream(1)); assertEquals(stream, rs.getBinaryStream(1)); @@ -558,7 +558,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs2.getNullBlob()); // Set what gets returned to something other than the default - Blob blob = new SqlNullCheckedResultSetMockBlob(); + final Blob blob = new SqlNullCheckedResultSetMockBlob(); rs2.setNullBlob(blob); assertNotNull(rs.getBlob(1)); assertEquals(blob, rs.getBlob(1)); @@ -587,7 +587,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals((byte) 0, rs2.getNullByte()); // Set what gets returned to something other than the default - byte b = (byte) 10; + final byte b = (byte) 10; rs2.setNullByte(b); assertEquals(b, rs.getByte(1)); assertEquals(b, rs.getByte("column")); @@ -601,7 +601,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs2.getNullBytes()); // Set what gets returned to something other than the default - byte[] b = new byte[5]; + final byte[] b = new byte[5]; for (int i = 0; i < 5; i++) { b[0] = (byte) i; } @@ -620,7 +620,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs2.getNullCharacterStream()); // Set what gets returned to something other than the default - Reader reader = new CharArrayReader("this is a string".toCharArray()); + final Reader reader = new CharArrayReader("this is a string".toCharArray()); rs2.setNullCharacterStream(reader); assertNotNull(rs.getCharacterStream(1)); assertEquals(reader, rs.getCharacterStream(1)); @@ -636,7 +636,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs2.getNullClob()); // Set what gets returned to something other than the default - Clob clob = new SqlNullCheckedResultSetMockClob(); + final Clob clob = new SqlNullCheckedResultSetMockClob(); rs2.setNullClob(clob); assertNotNull(rs.getClob(1)); assertEquals(clob, rs.getClob(1)); @@ -652,7 +652,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertNull(rs2.getNullDate()); // Set what gets returned to something other than the default - java.sql.Date date = new java.sql.Date(new java.util.Date().getTime()); + final java.sql.Date date = new java.sql.Date(new java.util.Date().getTime()); rs2.setNullDate(date); assertNotNull(rs.getDate(1)); assertEquals(date, rs.getDate(1)); @@ -671,7 +671,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { public void testSetNullDouble() throws SQLException { assertEquals(0.0, rs2.getNullDouble(), 0.0); // Set what gets returned to something other than the default - double d = 10.0; + final double d = 10.0; rs2.setNullDouble(d); assertEquals(d, rs.getDouble(1), 0.0); assertEquals(d, rs.getDouble("column"), 0.0); @@ -683,7 +683,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { public void testSetNullFloat() throws SQLException { assertEquals((float) 0.0, rs2.getNullFloat(), 0.0); // Set what gets returned to something other than the default - float f = (float) 10.0; + final float f = (float) 10.0; rs2.setNullFloat(f); assertEquals(f, rs.getFloat(1), 0.0); assertEquals(f, rs.getFloat("column"), 0.0); @@ -699,7 +699,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals(0, rs.getInt("column")); assertTrue(rs.wasNull()); // Set what gets returned to something other than the default - int i = 10; + final int i = 10; rs2.setNullInt(i); assertEquals(i, rs.getInt(1)); assertEquals(i, rs.getInt("column")); @@ -711,7 +711,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { public void testSetNullLong() throws SQLException { assertEquals(0, rs2.getNullLong()); // Set what gets returned to something other than the default - long l = 10; + final long l = 10; rs2.setNullLong(l); assertEquals(l, rs.getLong(1)); assertEquals(l, rs.getLong("column")); @@ -723,7 +723,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { public void testSetNullObject() throws SQLException { assertNull(rs2.getNullObject()); // Set what gets returned to something other than the default - Object o = new Object(); + final Object o = new Object(); rs2.setNullObject(o); assertNotNull(rs.getObject(1)); assertEquals(o, rs.getObject(1)); @@ -742,7 +742,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals((short) 0, rs2.getNullShort()); // Set what gets returned to something other than the default - short s = (short) 10; + final short s = (short) 10; rs2.setNullShort(s); assertEquals(s, rs.getShort(1)); assertEquals(s, rs.getShort("column")); @@ -755,7 +755,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { public void testSetNullString() throws SQLException { assertEquals(null, rs2.getNullString()); // Set what gets returned to something other than the default - String s = "hello, world"; + final String s = "hello, world"; rs2.setNullString(s); assertEquals(s, rs.getString(1)); assertEquals(s, rs.getString("column")); @@ -767,7 +767,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { public void testSetNullRef() throws SQLException { assertNull(rs2.getNullRef()); // Set what gets returned to something other than the default - Ref ref = new SqlNullCheckedResultSetMockRef(); + final Ref ref = new SqlNullCheckedResultSetMockRef(); rs2.setNullRef(ref); assertNotNull(rs.getRef(1)); assertEquals(ref, rs.getRef(1)); @@ -781,7 +781,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { public void testSetNullTime() throws SQLException { assertEquals(null, rs2.getNullTime()); // Set what gets returned to something other than the default - Time time = new Time(new java.util.Date().getTime()); + final Time time = new Time(new java.util.Date().getTime()); rs2.setNullTime(time); assertNotNull(rs.getTime(1)); assertEquals(time, rs.getTime(1)); @@ -799,7 +799,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { public void testSetNullTimestamp() throws SQLException { assertEquals(null, rs2.getNullTimestamp()); // Set what gets returned to something other than the default - Timestamp ts = new Timestamp(new java.util.Date().getTime()); + final Timestamp ts = new Timestamp(new java.util.Date().getTime()); rs2.setNullTimestamp(ts); assertNotNull(rs.getTimestamp(1)); assertEquals(ts, rs.getTimestamp(1)); @@ -823,7 +823,7 @@ class SqlNullUncheckedMockResultSet implements InvocationHandler { public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { - Class<?> returnType = method.getReturnType(); + final Class<?> returnType = method.getReturnType(); if (method.getName().equals("wasNull")) { return Boolean.TRUE; http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/e2c137f9/src/test/java/org/apache/commons/dbutils/wrappers/StringTrimmedResultSetTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbutils/wrappers/StringTrimmedResultSetTest.java b/src/test/java/org/apache/commons/dbutils/wrappers/StringTrimmedResultSetTest.java index 3df4070..ca14afb 100644 --- a/src/test/java/org/apache/commons/dbutils/wrappers/StringTrimmedResultSetTest.java +++ b/src/test/java/org/apache/commons/dbutils/wrappers/StringTrimmedResultSetTest.java @@ -50,12 +50,12 @@ public class StringTrimmedResultSetTest extends BaseTestCase { */ public void testMultipleWrappers() throws Exception { // Create a ResultSet with data - Object[][] rows = new Object[][] { { null } + final Object[][] rows = new Object[][] { { null } }; ResultSet rs = MockResultSet.create(metaData, rows); // Wrap the ResultSet with a null checked version - SqlNullCheckedResultSet ncrs = new SqlNullCheckedResultSet(rs); + final SqlNullCheckedResultSet ncrs = new SqlNullCheckedResultSet(rs); ncrs.setNullString(" trim this "); rs = ProxyFactory.instance().createResultSet(ncrs);
