extracted creation of new ArgPreparedStatementSetter and ArgTypePreparedStatementSetter into protected methods to allow sub-classes to override (SPR-3977)

Author: Thomas Risberg

org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

@@ -666,11 +666,11 @@ public <T> T query(String sql, PreparedStatementSetter pss, ResultSetExtractor<T
 	}
 
 	public <T> T query(String sql, Object[] args, int[] argTypes, ResultSetExtractor<T> rse) throws DataAccessException {
-		return query(sql, new ArgTypePreparedStatementSetter(args, argTypes), rse);
+		return query(sql, newArgTypePreparedStatementSetter(args, argTypes), rse);
 	}
 
 	public <T> T query(String sql, Object[] args, ResultSetExtractor<T> rse) throws DataAccessException {
-		return query(sql, new ArgPreparedStatementSetter(args), rse);
+		return query(sql, newArgPreparedStatementSetter(args), rse);
 	}
 
 	public void query(PreparedStatementCreator psc, RowCallbackHandler rch) throws DataAccessException {
@@ -682,11 +682,11 @@ public void query(String sql, PreparedStatementSetter pss, RowCallbackHandler rc
 	}
 
 	public void query(String sql, Object[] args, int[] argTypes, RowCallbackHandler rch) throws DataAccessException {
-		query(sql, new ArgTypePreparedStatementSetter(args, argTypes), rch);
+		query(sql, newArgTypePreparedStatementSetter(args, argTypes), rch);
 	}
 
 	public void query(String sql, Object[] args, RowCallbackHandler rch) throws DataAccessException {
-		query(sql, new ArgPreparedStatementSetter(args), rch);
+		query(sql, newArgPreparedStatementSetter(args), rch);
 	}
 
 	public <T> List<T> query(PreparedStatementCreator psc, RowMapper<T> rowMapper) throws DataAccessException {
@@ -843,11 +843,11 @@ public int update(String sql, PreparedStatementSetter pss) throws DataAccessExce
 	}
 
 	public int update(String sql, Object[] args, int[] argTypes) throws DataAccessException {
-		return update(sql, new ArgTypePreparedStatementSetter(args, argTypes));
+		return update(sql, newArgTypePreparedStatementSetter(args, argTypes));
 	}
 
 	public int update(String sql, Object... args) throws DataAccessException {
-		return update(sql, new ArgPreparedStatementSetter(args));
+		return update(sql, newArgPreparedStatementSetter(args));
 	}
 
 	public int[] batchUpdate(String sql, final BatchPreparedStatementSetter pss) throws DataAccessException {
@@ -1232,6 +1232,28 @@ protected void handleWarnings(SQLWarning warning) throws SQLWarningException {
 		}
 	}
 
+	/**
+	 * Create a new ArgPreparedStatementSetter using the args passed in. This method allows the
+	 * creation to be overridden by sub-classes.
+	 * @param args object array woth arguments
+	 * @return the new ArgPreparedStatementSetter
+	 */
+	protected ArgPreparedStatementSetter newArgPreparedStatementSetter(Object[] args) {
+		return new ArgPreparedStatementSetter(args);
+	}
+
+	/**
+	 * Create a new ArgTypePreparedStatementSetter using the args and argTypes passed in.
+	 * This method allows the creation to be overridden by sub-classes.
+	 * @param args object array woth arguments
+	 * @param argTypes int array of SQLTypes for arguments
+	 * @return the new ArgTypePreparedStatementSetter
+	 */
+	protected ArgTypePreparedStatementSetter newArgTypePreparedStatementSetter(Object[] args, int[] argTypes) {
+		return new ArgTypePreparedStatementSetter(args, argTypes);
+	}
+
+
 	/**
 	 * Determine SQL from potential provider object.
 	 * @param sqlProvider object that's potentially a SqlProvider