Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed remaining warnings under main/java, added TODOs for IbatisDrivingQueryItemReader and MultipleColumnJdbcKeyCollector

Browse Source
This commit is contained in:
robokaso
2008-07-24 08:52:13 +00:00
parent 0fd9b3e4c6
commit a07daf3d3a
6 changed files with 26 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriter.java
View File

@@ -65,7 +65,7 @@ public class BatchSqlUpdateItemWriter<T> extends AbstractTransactionalResourceIt
private JdbcOperations jdbcTemplate;
private ItemPreparedStatementSetter preparedStatementSetter;
private ItemPreparedStatementSetter<T> preparedStatementSetter;
private String sql;
@@ -95,7 +95,7 @@ public class BatchSqlUpdateItemWriter<T> extends AbstractTransactionalResourceIt
* @param preparedStatementSetter the {@link ItemPreparedStatementSetter} to
* set
*/
public void setItemPreparedStatementSetter(ItemPreparedStatementSetter preparedStatementSetter) {
public void setItemPreparedStatementSetter(ItemPreparedStatementSetter<T> preparedStatementSetter) {
this.preparedStatementSetter = preparedStatementSetter;
}
@@ -129,7 +129,7 @@ public class BatchSqlUpdateItemWriter<T> extends AbstractTransactionalResourceIt
int[] values = (int[]) jdbcTemplate.execute(sql, new PreparedStatementCallback() {
public Object doInPreparedStatement(PreparedStatement ps) throws SQLException, DataAccessException {
for (Object item : processed) {
for (T item : processed) {
preparedStatementSetter.setValues(item, ps);
ps.addBatch();
}

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisDrivingQueryItemReader.java
View File

@@ -27,9 +27,13 @@ import com.ibatis.sqlmap.client.SqlMapClient;
* The writer is thread safe after its properties are set (normal singleton
* behaviour).
*
* TODO remove this class? It does not return keys so it shouldn't extend
* DrivingQueryItemReader
*
* @author Lucas Ward
* @see IbatisKeyCollector
*/
@SuppressWarnings("unchecked")
public class IbatisDrivingQueryItemReader extends DrivingQueryItemReader {
private String detailsQueryId;

13
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/ColumnMapItemPreparedStatementSetter.java
View File

@@ -5,10 +5,7 @@ package org.springframework.batch.item.database.support;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import org.springframework.batch.item.database.ItemPreparedStatementSetter;
import org.springframework.jdbc.core.ColumnMapRowMapper;
@@ -27,15 +24,13 @@ import org.springframework.util.Assert;
* @see ItemPreparedStatementSetter
* @see ColumnMapRowMapper
*/
public class ColumnMapItemPreparedStatementSetter implements ItemPreparedStatementSetter {
public class ColumnMapItemPreparedStatementSetter implements ItemPreparedStatementSetter<Map<String, Object>> {
public void setValues(Object item, PreparedStatement ps) throws SQLException {
public void setValues(Map<String, Object> item, PreparedStatement ps) throws SQLException {
Assert.isInstanceOf(Map.class, item, "Input to map PreparedStatement parameters must be of type Map.");
Set keySet = ((Map)item).entrySet();
int counter = 1;
for(Iterator it = keySet.iterator(); it.hasNext();){
Entry entry = (Entry)it.next();
StatementCreatorUtils.setParameterValue(ps, counter, SqlTypeValue.TYPE_UNKNOWN, entry.getValue());
for(Object value : item.values()){
StatementCreatorUtils.setParameterValue(ps, counter, SqlTypeValue.TYPE_UNKNOWN, value);
counter++;
}
}

17
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/MultipleColumnJdbcKeyCollector.java
View File

@@ -44,10 +44,14 @@ import org.springframework.util.StringUtils;
* {@link #setPreparedStatementSetter(ItemPreparedStatementSetter)} and
* {@link #setKeyMapper(RowMapper)} are thread-safe (true for default values).
*
*
* @author Lucas Ward
*
* @see DrivingQueryItemReader
* @see ItemPreparedStatementSetter
*
* TODO this class has nothing to do with "multiple columns" other than default
* values form keyMapper and preparedStatementSetter. This should be sorted out for 2.0
*/
public class MultipleColumnJdbcKeyCollector<T> extends ExecutionContextUserSupport implements KeyCollector<T> {
@@ -57,6 +61,7 @@ public class MultipleColumnJdbcKeyCollector<T> extends ExecutionContextUserSuppo
private RowMapper keyMapper = new ColumnMapRowMapper();
@SuppressWarnings("unchecked")
private ItemPreparedStatementSetter preparedStatementSetter = new ColumnMapItemPreparedStatementSetter();
private String sql;
@@ -96,7 +101,7 @@ public class MultipleColumnJdbcKeyCollector<T> extends ExecutionContextUserSuppo
+ " in order to restart.");
if (executionContext.size() > 0) {
Object key = executionContext.get(getKey(CURRENT_KEY));
T key = (T) executionContext.get(getKey(CURRENT_KEY));
return jdbcTemplate.query(restartSql, new PreparedStatementSetterKeyWrapper(key, preparedStatementSetter),
keyMapper);
}
@@ -162,17 +167,17 @@ public class MultipleColumnJdbcKeyCollector<T> extends ExecutionContextUserSuppo
this.jdbcTemplate = jdbcTemplate;
}
public void setPreparedStatementSetter(ItemPreparedStatementSetter preparedStatementSetter) {
public void setPreparedStatementSetter(ItemPreparedStatementSetter<T> preparedStatementSetter) {
this.preparedStatementSetter = preparedStatementSetter;
}
private static class PreparedStatementSetterKeyWrapper implements PreparedStatementSetter {
private class PreparedStatementSetterKeyWrapper implements PreparedStatementSetter {
private Object key;
private T key;
private ItemPreparedStatementSetter pss;
private ItemPreparedStatementSetter<T> pss;
public PreparedStatementSetterKeyWrapper(Object key, ItemPreparedStatementSetter pss) {
public PreparedStatementSetterKeyWrapper(T key, ItemPreparedStatementSetter<T> pss) {
this.key = key;
this.pss = pss;
}

28
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java
View File

@@ -5,12 +5,12 @@ package org.springframework.batch.item.database.support;
import java.sql.PreparedStatement;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.core.CollectionFactory;
/**
* @author Lucas Ward
@@ -19,7 +19,7 @@ public class ColumnMapExecutionContextRowMapperTests extends TestCase {
private ColumnMapItemPreparedStatementSetter mapper;
private Map<Object, Object> key;
private Map<String, Object> key;
private MockControl psControl = MockControl.createControl(PreparedStatement.class);
private PreparedStatement ps;
@@ -31,35 +31,15 @@ public class ColumnMapExecutionContextRowMapperTests extends TestCase {
ps = (PreparedStatement)psControl.getMock();
mapper = new ColumnMapItemPreparedStatementSetter();
key = CollectionFactory.createLinkedCaseInsensitiveMapIfPossible(2);
key = new LinkedHashMap<String, Object>(2);
key.put("1", new Integer(1));
key.put("2", new Integer(2));
}
public void testSetValuesWithInvalidType() throws Exception {
try{
mapper.setValues(new Object(), ps);
fail();
}catch(IllegalArgumentException ex){
//expected
}
}
public void testCreateExecutionContextWithNull() throws Exception{
try{
mapper.setValues(ps, null);
fail();
}catch(IllegalArgumentException ex){
//expected
}
}
public void testCreateExecutionContextFromEmptyKeys() throws Exception {
psControl.replay();
mapper.setValues(new HashMap<Object, Object>(), ps);
mapper.setValues(new HashMap<String, Object>(), ps);
psControl.verify();
}

1
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java
View File

@@ -20,7 +20,6 @@ import java.util.ArrayList;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;