You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/11/21 17:55:08 UTC
[commons-dbutils] branch master updated: Use final.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
The following commit(s) were added to refs/heads/master by this push:
new ce0b5bc Use final.
ce0b5bc is described below
commit ce0b5bc0ae669e7d4d7bc1c2b535b84d9a133237
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 12:55:03 2020 -0500
Use final.
---
src/main/java/org/apache/commons/dbutils/BeanProcessor.java | 4 ++--
src/main/java/org/apache/commons/dbutils/QueryRunner.java | 10 +++++-----
.../commons/dbutils/wrappers/SqlNullCheckedResultSet.java | 4 ++--
src/test/java/org/apache/commons/dbutils/DbUtilsTest.java | 4 ++--
src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java | 6 +++---
.../org/apache/commons/dbutils/handlers/KeyedHandlerTest.java | 2 +-
.../commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
index 462305d..3f32dfd 100644
--- a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
+++ b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
@@ -471,8 +471,8 @@ public class BeanProcessor {
}
for (int i = 0; i < props.length; i++) {
- PropertyDescriptor prop = props[i];
- Column column = prop.getReadMethod().getAnnotation(Column.class);
+ final PropertyDescriptor prop = props[i];
+ final Column column = prop.getReadMethod().getAnnotation(Column.class);
String propertyColumnName = null;
if (column != null) {
propertyColumnName = column.name();
diff --git a/src/main/java/org/apache/commons/dbutils/QueryRunner.java b/src/main/java/org/apache/commons/dbutils/QueryRunner.java
index 2c0e61c..13fd124 100644
--- a/src/main/java/org/apache/commons/dbutils/QueryRunner.java
+++ b/src/main/java/org/apache/commons/dbutils/QueryRunner.java
@@ -184,7 +184,7 @@ public class QueryRunner extends AbstractQueryRunner {
try {
stmt = this.prepareStatement(conn, sql);
- for (Object[] param : params) {
+ for (final Object[] param : params) {
this.fillStatement(stmt, param);
stmt.addBatch();
}
@@ -382,7 +382,7 @@ public class QueryRunner extends AbstractQueryRunner {
try {
if (params != null && params.length > 0) {
- PreparedStatement ps = this.prepareStatement(conn, sql);
+ final PreparedStatement ps = this.prepareStatement(conn, sql);
stmt = ps;
this.fillStatement(ps, params);
rs = this.wrap(ps.executeQuery());
@@ -526,7 +526,7 @@ public class QueryRunner extends AbstractQueryRunner {
try {
if (params != null && params.length > 0) {
- PreparedStatement ps = this.prepareStatement(conn, sql);
+ final PreparedStatement ps = this.prepareStatement(conn, sql);
stmt = ps;
this.fillStatement(ps, params);
rows = ps.executeUpdate();
@@ -650,7 +650,7 @@ public class QueryRunner extends AbstractQueryRunner {
try {
if (params != null && params.length > 0) {
- PreparedStatement ps = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+ final PreparedStatement ps = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
stmt = ps;
this.fillStatement(ps, params);
ps.executeUpdate();
@@ -743,7 +743,7 @@ public class QueryRunner extends AbstractQueryRunner {
try {
stmt = this.prepareStatement(conn, sql, Statement.RETURN_GENERATED_KEYS);
- for (Object[] param : params) {
+ for (final Object[] param : params) {
this.fillStatement(stmt, param);
stmt.addBatch();
}
diff --git a/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java b/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
index 074bbdb..ba9af9a 100644
--- a/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
+++ b/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
@@ -84,7 +84,7 @@ public class SqlNullCheckedResultSet implements InvocationHandler {
static {
final Method[] methods = SqlNullCheckedResultSet.class.getMethods();
- for (Method method : methods) {
+ for (final Method method : methods) {
final String methodName = method.getName();
if (methodName.startsWith(GET_NULL_PREFIX)) {
@@ -356,7 +356,7 @@ public class SqlNullCheckedResultSet implements InvocationHandler {
return null;
}
- Timestamp ts = new Timestamp(this.nullTimestamp.getTime());
+ final Timestamp ts = new Timestamp(this.nullTimestamp.getTime());
ts.setNanos(this.nullTimestamp.getNanos());
return ts;
}
diff --git a/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java b/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java
index 1907c8b..7ad83b1 100644
--- a/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java
+++ b/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java
@@ -312,11 +312,11 @@ public class DbUtilsTest {
proxy.jdbcCompliant();
verify(mockedDriver).jdbcCompliant();
- String url = "testUrl";
+ final String url = "testUrl";
proxy.acceptsURL(url);
verify(mockedDriver).acceptsURL(url);
- Properties props = new Properties();
+ final Properties props = new Properties();
props.setProperty("test", "true");
proxy.connect(url, props);
verify(mockedDriver).connect(url, props);
diff --git a/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java b/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java
index 2802c16..b7da012 100644
--- a/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java
@@ -295,7 +295,7 @@ public class QueryRunnerTest {
try {
when(meta.getParameterCount()).thenReturn(2);
- String sql = "select * from blah where ? = ?";
+ final String sql = "select * from blah where ? = ?";
runner.query(sql, handler, params);
verify(prepStmt, never()).close(); // make sure the statement is still open
@@ -370,7 +370,7 @@ public class QueryRunnerTest {
// call the other variation
when(meta.getParameterCount()).thenReturn(0);
- String sql = "update blah set unit = test";
+ final String sql = "update blah set unit = test";
runner.update(conn, sql);
verify(stmt, times(1)).executeUpdate(sql);
@@ -498,7 +498,7 @@ public class QueryRunnerTest {
try {
when(meta.getParameterCount()).thenReturn(2);
- String sql = "select * from blah where ? = ?";
+ final String sql = "select * from blah where ? = ?";
runner.update(sql, params);
verify(prepStmt, times(1)).executeUpdate();
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 da3fc14..3460d39 100644
--- a/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java
+++ b/src/test/java/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.mock;
public class KeyedHandlerTest extends BaseTestCase {
public void testInjectedRowProcess() throws Exception {
- RowProcessor mockProc = mock(RowProcessor.class);
+ final RowProcessor mockProc = mock(RowProcessor.class);
final ResultSetHandler<Map<String,Map<String,Object>>> h = new KeyedHandler<>(mockProc);
final Map<String,Map<String,Object>> results = h.handle(this.rs);
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 2b4df76..bbaed9b 100644
--- a/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java
+++ b/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java
@@ -831,8 +831,8 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase {
}
public void testWrapResultSet() throws SQLException {
- ResultSet wrappedRs = mock(ResultSet.class);
- ResultSet rs = SqlNullCheckedResultSet.wrap(wrappedRs);
+ final ResultSet wrappedRs = mock(ResultSet.class);
+ final ResultSet rs = SqlNullCheckedResultSet.wrap(wrappedRs);
rs.beforeFirst();
verify(wrappedRs).beforeFirst();
rs.next();