Browse Source

Stop declaring parameters as final in JdbcTemplate

The affected parameters are "effectively final" and are therefore no
longer required to be declared as "final" on modern JDKs.
pull/34917/head
Sam Brannen 7 months ago
parent
commit
f4f0e52003
  1. 26
      spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

26
spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

@ -420,7 +420,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -420,7 +420,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
@Override
public void execute(final String sql) throws DataAccessException {
public void execute(String sql) throws DataAccessException {
if (logger.isDebugEnabled()) {
logger.debug("Executing SQL statement [" + sql + "]");
}
@ -442,7 +442,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -442,7 +442,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
@Override
public <T> @Nullable T query(final String sql, final ResultSetExtractor<T> rse) throws DataAccessException {
public <T> @Nullable T query(String sql, ResultSetExtractor<T> rse) throws DataAccessException {
Assert.notNull(sql, "SQL must not be null");
Assert.notNull(rse, "ResultSetExtractor must not be null");
if (logger.isDebugEnabled()) {
@ -535,7 +535,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -535,7 +535,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
@Override
public int update(final String sql) throws DataAccessException {
public int update(String sql) throws DataAccessException {
Assert.notNull(sql, "SQL must not be null");
if (logger.isDebugEnabled()) {
logger.debug("Executing SQL update [" + sql + "]");
@ -561,7 +561,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -561,7 +561,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
@Override
public int[] batchUpdate(final String... sql) throws DataAccessException {
public int[] batchUpdate(String... sql) throws DataAccessException {
Assert.notEmpty(sql, "SQL array must not be empty");
if (logger.isDebugEnabled()) {
logger.debug("Executing SQL batch update of " + sql.length + " statements");
@ -701,7 +701,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -701,7 +701,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
* @throws DataAccessException if there is any problem
*/
public <T> @Nullable T query(
PreparedStatementCreator psc, final @Nullable PreparedStatementSetter pss, final ResultSetExtractor<T> rse)
PreparedStatementCreator psc, @Nullable PreparedStatementSetter pss, ResultSetExtractor<T> rse)
throws DataAccessException {
Assert.notNull(rse, "ResultSetExtractor must not be null");
@ -936,7 +936,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -936,7 +936,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
return result(query(sql, newArgPreparedStatementSetter(args), new SqlRowSetResultSetExtractor()));
}
protected int update(final PreparedStatementCreator psc, final @Nullable PreparedStatementSetter pss)
protected int update(PreparedStatementCreator psc, @Nullable PreparedStatementSetter pss)
throws DataAccessException {
logger.debug("Executing prepared SQL update");
@ -966,7 +966,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -966,7 +966,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
@Override
public int update(final PreparedStatementCreator psc, final KeyHolder generatedKeyHolder)
public int update(PreparedStatementCreator psc, KeyHolder generatedKeyHolder)
throws DataAccessException {
Assert.notNull(generatedKeyHolder, "KeyHolder must not be null");
@ -999,8 +999,8 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -999,8 +999,8 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
@Override
public int[] batchUpdate(final PreparedStatementCreator psc, final BatchPreparedStatementSetter pss,
final KeyHolder generatedKeyHolder) throws DataAccessException {
public int[] batchUpdate(PreparedStatementCreator psc, BatchPreparedStatementSetter pss,
KeyHolder generatedKeyHolder) throws DataAccessException {
int[] result = execute(psc, getPreparedStatementCallback(pss, generatedKeyHolder));
@ -1009,7 +1009,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -1009,7 +1009,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
@Override
public int[] batchUpdate(String sql, final BatchPreparedStatementSetter pss) throws DataAccessException {
public int[] batchUpdate(String sql, BatchPreparedStatementSetter pss) throws DataAccessException {
if (logger.isDebugEnabled()) {
logger.debug("Executing SQL batch update [" + sql + "]");
}
@ -1029,7 +1029,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -1029,7 +1029,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
@Override
public int[] batchUpdate(String sql, List<Object[]> batchArgs, final int[] argTypes) throws DataAccessException {
public int[] batchUpdate(String sql, List<Object[]> batchArgs, int[] argTypes) throws DataAccessException {
if (batchArgs.isEmpty()) {
return new int[0];
}
@ -1066,8 +1066,8 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -1066,8 +1066,8 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
@Override
public <T> int[][] batchUpdate(String sql, final Collection<T> batchArgs, final int batchSize,
final ParameterizedPreparedStatementSetter<T> pss) throws DataAccessException {
public <T> int[][] batchUpdate(String sql, Collection<T> batchArgs, int batchSize,
ParameterizedPreparedStatementSetter<T> pss) throws DataAccessException {
if (logger.isDebugEnabled()) {
logger.debug("Executing SQL batch update [" + sql + "] with a batch size of " + batchSize);

Loading…
Cancel
Save