From c55569b51e3ffc91c17073d2f1969b54c2901476 Mon Sep 17 00:00:00 2001 From: Thomas Risberg Date: Tue, 12 May 2009 18:18:05 +0000 Subject: [PATCH] relaxed parameter type from ParameterizedRowMapper to RowMapper --- .../jdbc/core/simple/SimpleJdbcOperations.java | 13 +++++++------ .../jdbc/core/simple/SimpleJdbcTemplate.java | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java index e7aac3aeab..7c5cfe9b06 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java @@ -21,6 +21,7 @@ import java.util.Map; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcOperations; +import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.jdbc.core.namedparam.SqlParameterSource; @@ -159,7 +160,7 @@ public interface SimpleJdbcOperations { * @see JdbcOperations#queryForObject(String, org.springframework.jdbc.core.RowMapper) * @see JdbcOperations#queryForObject(String, Object[], org.springframework.jdbc.core.RowMapper) */ - T queryForObject(String sql, ParameterizedRowMapper rm, Map args) + T queryForObject(String sql, RowMapper rm, Map args) throws DataAccessException; /** @@ -173,7 +174,7 @@ public interface SimpleJdbcOperations { * @see JdbcOperations#queryForObject(String, org.springframework.jdbc.core.RowMapper) * @see JdbcOperations#queryForObject(String, Object[], org.springframework.jdbc.core.RowMapper) */ - T queryForObject(String sql, ParameterizedRowMapper rm, SqlParameterSource args) + T queryForObject(String sql, RowMapper rm, SqlParameterSource args) throws DataAccessException; /** @@ -186,7 +187,7 @@ public interface SimpleJdbcOperations { * @see JdbcOperations#queryForObject(String, org.springframework.jdbc.core.RowMapper) * @see JdbcOperations#queryForObject(String, Object[], org.springframework.jdbc.core.RowMapper) */ - T queryForObject(String sql, ParameterizedRowMapper rm, Object... args) + T queryForObject(String sql, RowMapper rm, Object... args) throws DataAccessException; /** @@ -200,7 +201,7 @@ public interface SimpleJdbcOperations { * @see JdbcOperations#queryForObject(String, org.springframework.jdbc.core.RowMapper) * @see JdbcOperations#queryForObject(String, Object[], org.springframework.jdbc.core.RowMapper) */ - List query(String sql, ParameterizedRowMapper rm, Map args) + List query(String sql, RowMapper rm, Map args) throws DataAccessException; /** @@ -214,7 +215,7 @@ public interface SimpleJdbcOperations { * @see JdbcOperations#queryForObject(String, org.springframework.jdbc.core.RowMapper) * @see JdbcOperations#queryForObject(String, Object[], org.springframework.jdbc.core.RowMapper) */ - List query(String sql, ParameterizedRowMapper rm, SqlParameterSource args) + List query(String sql, RowMapper rm, SqlParameterSource args) throws DataAccessException; /** @@ -227,7 +228,7 @@ public interface SimpleJdbcOperations { * @see JdbcOperations#queryForObject(String, org.springframework.jdbc.core.RowMapper) * @see JdbcOperations#queryForObject(String, Object[], org.springframework.jdbc.core.RowMapper) */ - List query(String sql, ParameterizedRowMapper rm, Object... args) + List query(String sql, RowMapper rm, Object... args) throws DataAccessException; /** diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java index a4866b8b80..f8b06b612e 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java @@ -29,6 +29,7 @@ import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.SqlParameterValue; import org.springframework.jdbc.core.SqlTypeValue; import org.springframework.jdbc.core.StatementCreatorUtils; +import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; @@ -154,36 +155,36 @@ public class SimpleJdbcTemplate implements SimpleJdbcOperations { } @SuppressWarnings("unchecked") - public T queryForObject(String sql, ParameterizedRowMapper rm, Map args) throws DataAccessException { + public T queryForObject(String sql, RowMapper rm, Map args) throws DataAccessException { return getNamedParameterJdbcOperations().queryForObject(sql, args, rm); } @SuppressWarnings("unchecked") - public T queryForObject(String sql, ParameterizedRowMapper rm, SqlParameterSource args) + public T queryForObject(String sql, RowMapper rm, SqlParameterSource args) throws DataAccessException { return getNamedParameterJdbcOperations().queryForObject(sql, args, rm); } @SuppressWarnings("unchecked") - public T queryForObject(String sql, ParameterizedRowMapper rm, Object... args) throws DataAccessException { + public T queryForObject(String sql, RowMapper rm, Object... args) throws DataAccessException { return (ObjectUtils.isEmpty(args) ? getJdbcOperations().queryForObject(sql, rm): getJdbcOperations().queryForObject(sql, getArguments(args), rm)); } @SuppressWarnings("unchecked") - public List query(String sql, ParameterizedRowMapper rm, Map args) throws DataAccessException { + public List query(String sql, RowMapper rm, Map args) throws DataAccessException { return getNamedParameterJdbcOperations().query(sql, args, rm); } @SuppressWarnings("unchecked") - public List query(String sql, ParameterizedRowMapper rm, SqlParameterSource args) + public List query(String sql, RowMapper rm, SqlParameterSource args) throws DataAccessException { return getNamedParameterJdbcOperations().query(sql, args, rm); } @SuppressWarnings("unchecked") - public List query(String sql, ParameterizedRowMapper rm, Object... args) throws DataAccessException { + public List query(String sql, RowMapper rm, Object... args) throws DataAccessException { return (ObjectUtils.isEmpty(args) ? getJdbcOperations().query(sql, rm) : getJdbcOperations().query(sql, getArguments(args), rm));