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

[BATCH-430] Incremental commit of io package moving

Browse Source
This commit is contained in:
nebhale
2008-03-07 12:55:27 +00:00
parent 8c2901093e
commit 48195945ee
230 changed files with 529 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java
View File

@@ -22,8 +22,8 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.DefaultFieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
/**
* ResultSetExtractor implementation that returns list of FieldSets

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java
View File

@@ -16,8 +16,8 @@
package org.springframework.batch.sample.dao;
import org.springframework.batch.item.transform.ItemTransformer;
import org.springframework.batch.item.writer.DelegatingItemWriter;
import org.springframework.batch.item.writer.ItemTransformer;
import org.springframework.batch.sample.item.writer.OrderWriter;

8
spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderTransformer.java
View File

@@ -21,10 +21,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.transform.LineAggregator;
import org.springframework.batch.item.writer.ItemTransformer;
import org.springframework.batch.item.file.mapping.DefaultFieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.transform.LineAggregator;
import org.springframework.batch.item.transform.ItemTransformer;
import org.springframework.batch.sample.domain.Address;
import org.springframework.batch.sample.domain.BillingInfo;
import org.springframework.batch.sample.domain.Customer;

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

@@ -21,8 +21,8 @@ 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.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.item.reader.DelegatingItemReader;
import org.springframework.batch.sample.domain.Address;
import org.springframework.batch.sample.domain.BillingInfo;

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

@@ -53,7 +53,7 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite
/**
*
* @see org.springframework.batch.io.driving.DrivingQueryItemReader#close(ExecutionContext)
* @see org.springframework.batch.item.database.DrivingQueryItemReader#close(ExecutionContext)
*/
public void close(ExecutionContext executionContext) {
initialized = false;
@@ -65,7 +65,7 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite
/**
*
* @see org.springframework.batch.io.driving.DrivingQueryItemReader#open()
* @see org.springframework.batch.item.database.DrivingQueryItemReader#open()
*/
public void open(ExecutionContext executionContext) {
// Can be called from multiple threads because of lazy initialisation...

6
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/BatchSqlCustomerCreditIncreaseWriter.java
View File

@@ -2,10 +2,10 @@ package org.springframework.batch.sample.item.writer;
import java.math.BigDecimal;
import org.springframework.batch.io.support.BatchSqlUpdateItemWriter;
import org.springframework.batch.item.ClearFailedException;
import org.springframework.batch.item.FlushFailedException;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.database.BatchSqlUpdateItemWriter;
import org.springframework.batch.sample.domain.CustomerCredit;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
@@ -52,7 +52,7 @@ public class BatchSqlCustomerCreditIncreaseWriter implements ItemWriter, Initial
/**
* @throws ClearFailedException
* @see org.springframework.batch.io.support.BatchSqlUpdateItemWriter#clear()
* @see org.springframework.batch.item.database.BatchSqlUpdateItemWriter#clear()
*/
public void clear() throws ClearFailedException {
delegate.clear();
@@ -60,7 +60,7 @@ public class BatchSqlCustomerCreditIncreaseWriter implements ItemWriter, Initial
/**
* @throws FlushFailedException
* @see org.springframework.batch.io.support.BatchSqlUpdateItemWriter#flush()
* @see org.springframework.batch.item.database.BatchSqlUpdateItemWriter#flush()
*/
public void flush() throws FlushFailedException {
delegate.flush();

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseWriter.java
View File

@@ -2,7 +2,7 @@ package org.springframework.batch.sample.item.writer;
import java.math.BigDecimal;
import org.springframework.batch.item.writer.AbstractItemWriter;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.sample.dao.CustomerCreditDao;
import org.springframework.batch.sample.domain.CustomerCredit;

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetter.java
View File

@@ -18,7 +18,7 @@ package org.springframework.batch.sample.item.writer;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import org.springframework.batch.io.support.ItemPreparedStatementSetter;
import org.springframework.batch.item.database.ItemPreparedStatementSetter;
import org.springframework.batch.sample.domain.CustomerCredit;
/**

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateWriter.java
View File

@@ -16,7 +16,7 @@
package org.springframework.batch.sample.item.writer;
import org.springframework.batch.item.writer.AbstractItemWriter;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.sample.dao.CustomerCreditDao;
import org.springframework.batch.sample.domain.CustomerCredit;

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java
View File

@@ -16,7 +16,7 @@
package org.springframework.batch.sample.item.writer;
import org.springframework.batch.item.writer.AbstractItemWriter;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.sample.dao.JdbcCustomerDebitDao;
import org.springframework.batch.sample.domain.CustomerDebit;
import org.springframework.batch.sample.domain.Trade;

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PersonWriter.java
View File

@@ -18,7 +18,7 @@ package org.springframework.batch.sample.item.writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.item.writer.AbstractItemWriter;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.sample.domain.Person;

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PlayerItemWriter.java
View File

@@ -1,6 +1,6 @@
package org.springframework.batch.sample.item.writer;
import org.springframework.batch.item.writer.AbstractItemWriter;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.sample.dao.PlayerDao;
import org.springframework.batch.sample.domain.Player;

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriter.java
View File

@@ -1,6 +1,6 @@
package org.springframework.batch.sample.item.writer;
import org.springframework.batch.item.writer.AbstractItemWriter;
import org.springframework.batch.item.AbstractItemWriter;
/**
* Simulates temporary output trouble - requires to

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/TradeWriter.java
View File

@@ -18,7 +18,7 @@ package org.springframework.batch.sample.item.writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.item.writer.AbstractItemWriter;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.sample.dao.TradeDao;
import org.springframework.batch.sample.domain.Trade;

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/AddressFieldSetMapper.java
View File

@@ -16,8 +16,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.Address;

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/BillingFieldSetMapper.java
View File

@@ -16,8 +16,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.BillingInfo;

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapper.java
View File

@@ -16,8 +16,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.Customer;

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/GameMapper.java
View File

@@ -1,7 +1,7 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.Game;
public class GameMapper implements FieldSetMapper {

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapper.java
View File

@@ -16,8 +16,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.Order;

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapper.java
View File

@@ -16,8 +16,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.LineItem;

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerMapper.java
View File

@@ -1,7 +1,7 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.Player;
public class PlayerMapper implements FieldSetMapper {

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapper.java
View File

@@ -16,8 +16,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.ShippingInfo;

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java
View File

@@ -16,8 +16,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.item.reader.AggregateItemReader;
import org.springframework.batch.sample.domain.Trade;

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeWriter.java
View File

@@ -17,10 +17,10 @@
package org.springframework.batch.sample.tasklet;
import org.springframework.batch.core.tasklet.Tasklet;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ItemStream;
import org.springframework.batch.item.ItemStreamException;
import org.springframework.batch.item.writer.AbstractItemWriter;
import org.springframework.batch.sample.dao.TradeDao;
import org.springframework.batch.sample.domain.Trade;
import org.springframework.util.Assert;

4
spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml
View File

@@ -24,7 +24,7 @@
<bean id="itemWriter" class="org.springframework.batch.sample.item.writer.BatchSqlCustomerCreditIncreaseWriter">
<property name="delegate">
<bean class="org.springframework.batch.io.support.BatchSqlUpdateItemWriter">
<bean class="org.springframework.batch.item.database.BatchSqlUpdateItemWriter">
<property name="jdbcTemplate" ref="jdbcTemplate" />
<property name="sql"><value><![CDATA[UPDATE CUSTOMER SET CREDIT=? WHERE ID=?]]></value></property>
<property name="itemPreparedStatementSetter">
@@ -34,7 +34,7 @@
</property>
</bean>
<bean id="itemReader" class="org.springframework.batch.io.cursor.JdbcCursorItemReader">
<bean id="itemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
<property name="dataSource" ref="dataSource" />
<property name="sql" value="SELECT id, name, credit FROM customer " />
<property name="mapper">

14
spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
View File

@@ -16,7 +16,7 @@
<property name="streams" ref="fileInputTemplate" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.reader.ValidatingItemReader">
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileInputTemplate" />
<property name="validator"
@@ -46,14 +46,14 @@
<!-- INFRASTRUCTURE SETUP -->
<bean id="fileInputTemplate"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource" value="classpath:data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportTradeDataStep.txt" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />
</bean>
<bean id="fileInputTemplate2"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource" value="classpath:data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportPersonDataStep.txt" />
<property name="lineTokenizer" ref="fixedFileDescriptor2" />
<property name="fieldSetMapper" ref="fieldSetMapper2" />
@@ -61,13 +61,13 @@
</bean>
<bean id="fixedFileDescriptor"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="names" value="ISIN,Quantity,price, CUSTOMER" />
<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
</bean>
<bean id="fixedFileDescriptor2"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="names"
value="Title, FirstName, LastName, Age, Address.AddrLine1, children[0].name, children[1].name" />
<property name="columns"
@@ -101,12 +101,12 @@
</bean>
<bean id="fieldSetMapper"
class="org.springframework.batch.io.file.mapping.BeanWrapperFieldSetMapper">
class="org.springframework.batch.item.file.mapping.BeanWrapperFieldSetMapper">
<property name="prototypeBeanName" value="trade" />
</bean>
<bean id="fieldSetMapper2"
class="org.springframework.batch.io.file.mapping.BeanWrapperFieldSetMapper">
class="org.springframework.batch.item.file.mapping.BeanWrapperFieldSetMapper">
<property name="prototypeBeanName" value="person" />
</bean>

10
spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
View File

@@ -15,7 +15,7 @@
<property name="streams" ref="fileInputTemplate" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.reader.ValidatingItemReader">
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileInputTemplate" />
<property name="validator" ref="fixedValidator" />
@@ -42,14 +42,14 @@
<!-- INFRASTRUCTURE SETUP -->
<bean id="fileInputTemplate"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />
</bean>
<bean id="fixedFileDescriptor"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="names" value="ISIN, Quantity, Price, Customer" />
<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
</bean>
@@ -81,12 +81,12 @@
</property>
</bean>
<bean class="org.springframework.batch.io.file.FlatFileItemWriter"
<bean class="org.springframework.batch.item.file.FlatFileItemWriter"
id="flatFileOutputSource">
<property name="resource" ref="customerFileLocator" />
<property name="fieldSetUnmapper">
<bean
class="org.springframework.batch.io.file.mapping.PassThroughFieldSetMapper" />
class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper" />
</property>
</bean>

6
spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
View File

@@ -15,7 +15,7 @@
<property name="streams" ref="fileInputTemplate" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.reader.ValidatingItemReader">
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileInputTemplate" />
<property name="validator" ref="fixedValidator" />
@@ -35,7 +35,7 @@
<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
<bean id="testInputTemplate"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />
@@ -45,7 +45,7 @@
autowire-candidate="false"/>
<bean id="fixedFileDescriptor"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="names" value="ISIN, Quantity, Price, Customer" />
<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
</bean>

10
spring-batch-samples/src/main/resources/jobs/footballJob.xml
View File

@@ -59,12 +59,12 @@
</bean>
<bean id="playerFileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/footballjob/input/${player.file.name}" />
<property name="lineTokenizer">
<bean
class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
class="org.springframework.batch.item.file.transform.DelimitedLineTokenizer">
<property name="names"
value="ID,lastName,firstName,position,birthYear,debutYear" />
</bean>
@@ -76,12 +76,12 @@
</bean>
<bean id="gameFileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/footballjob/input/${games.file.name}" />
<property name="lineTokenizer">
<bean
class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
class="org.springframework.batch.item.file.transform.DelimitedLineTokenizer">
<property name="names"
value="id,year,team,week,opponent,completes,attempts,passingYards,passingTd,interceptions,rushes,rushYards,receptions,receptionYards,totalTd" />
</bean>
@@ -93,7 +93,7 @@
</bean>
<bean id="playerSummarizationSource"
class="org.springframework.batch.io.cursor.JdbcCursorItemReader">
class="org.springframework.batch.item.database.JdbcCursorItemReader">
<property name="dataSource" ref="dataSource" />
<property name="mapper">
<bean

4
spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
View File

@@ -27,7 +27,7 @@
<!-- This is a framework class that needs a delegate and also needs to be registered as a RepeatInterceptor in the chunk -->
<bean id="hibernateOutputSource"
class="org.springframework.batch.io.support.HibernateAwareItemWriter">
class="org.springframework.batch.item.database.HibernateAwareItemWriter">
<property name="sessionFactory" ref="sessionFactory" />
<property name="delegate" ref="hibernateCreditWriter" />
</bean>
@@ -43,7 +43,7 @@
</bean>
<bean id="hibernateItemReader"
class="org.springframework.batch.io.cursor.HibernateCursorItemReader">
class="org.springframework.batch.item.database.HibernateCursorItemReader">
<property name="queryString" value="from CustomerCredit" />
<property name="sessionFactory" ref="sessionFactory" />
</bean>

4
spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
View File

@@ -34,14 +34,14 @@
</bean>
<bean id="ibatisItemReader"
class="org.springframework.batch.io.driving.IbatisDrivingQueryItemReader">
class="org.springframework.batch.item.database.IbatisDrivingQueryItemReader">
<property name="detailsQueryId" value="getCustomerCreditById" />
<property name="sqlMapClient" ref="sqlMapClient" />
<property name="keyGenerator" ref="ibatisKeyGenerator" />
</bean>
<bean id="ibatisKeyGenerator"
class="org.springframework.batch.io.driving.support.IbatisKeyGenerator">
class="org.springframework.batch.item.database.support.IbatisKeyGenerator">
<property name="drivingQueryId" value="getAllCustomerCreditIds" />
<property name="sqlMapClient" ref="sqlMapClient" />
</bean>

14
spring-batch-samples/src/main/resources/jobs/multilineJob.xml
View File

@@ -20,11 +20,11 @@
</property>
<property name="itemWriter">
<bean
class="org.springframework.batch.io.file.FlatFileItemWriter">
class="org.springframework.batch.item.file.FlatFileItemWriter">
<property name="resource"
value="file:target/test-outputs/20070122.testStream.multilineStep.txt" />
<property name="fieldSetUnmapper">
<bean class="org.springframework.batch.io.file.mapping.PassThroughFieldSetMapper"/>
<bean class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper"/>
</property>
</bean>
</property>
@@ -33,7 +33,7 @@
</bean>
<bean id="fileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/multilineJob/input/20070122.teststream.multilineStep.txt" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
@@ -45,7 +45,7 @@
class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
<bean id="fixedFileDescriptor"
class="org.springframework.batch.io.file.transform.PrefixMatchingCompositeLineTokenizer">
class="org.springframework.batch.item.file.transform.PrefixMatchingCompositeLineTokenizer">
<property name="tokenizers">
<map>
<entry key="BEGIN" value-ref="beginRecordDescriptor" />
@@ -56,17 +56,17 @@
</bean>
<bean id="beginRecordDescriptor"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="columns" value="1-5" />
</bean>
<bean id="endRecordDescriptor"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="columns" value="1-3" />
</bean>
<bean id="tradeRecordDescriptor"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="names" value="ISIN,Quantity,Price,Customer" />
<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
</bean>

6
spring-batch-samples/src/main/resources/jobs/multilineOrderInputDescriptors.xml
View File

@@ -4,7 +4,7 @@
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean id="orderFileDescriptor"
class="org.springframework.batch.io.file.transform.PrefixMatchingCompositeLineTokenizer">
class="org.springframework.batch.item.file.transform.PrefixMatchingCompositeLineTokenizer">
<property name="tokenizers">
<map>
<entry key="HEA" value-ref="headerRecordDescriptor" />
@@ -22,12 +22,12 @@
</bean>
<bean id="defaultLineDescriptor"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="columns" value="1-120" />
</bean>
<bean id="parentLineDescriptor" abstract="true"
class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
class="org.springframework.batch.item.file.transform.DelimitedLineTokenizer">
<property name="delimiter" value=";"/>
</bean>

16
spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml
View File

@@ -9,37 +9,37 @@
http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
<bean id="fileInputTemplate"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource" ref="fileInputLocator" />
<property name="lineTokenizer" ref="orderFileDescriptor" />
<property name="fieldSetMapper">
<bean
class="org.springframework.batch.io.file.mapping.PassThroughFieldSetMapper" />
class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper" />
</property>
</bean>
<bean id="flatFileTransformerOutput"
class="org.springframework.batch.item.writer.ItemTransformerItemWriter">
class="org.springframework.batch.item.transform.ItemTransformerItemWriter">
<property name="delegate" ref="flatFileOutput"/>
<property name="itemTransformer">
<bean
class="org.springframework.batch.io.file.transform.RecursiveCollectionItemTransformer" />
class="org.springframework.batch.item.file.transform.RecursiveCollectionItemTransformer" />
</property>
</bean>
<bean id="flatFileOutput"
class="org.springframework.batch.io.file.FlatFileItemWriter">
class="org.springframework.batch.item.file.FlatFileItemWriter">
<property name="resource" ref="fileOutputLocator" />
<property name="fieldSetUnmapper">
<bean
class="org.springframework.batch.io.file.mapping.PassThroughFieldSetMapper" />
class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper" />
</property>
</bean>
<bean id="delimitedLineAggregator"
class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer" />
class="org.springframework.batch.item.file.transform.DelimitedLineTokenizer" />
<bean id="fixedLineAggregator"
class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator" />
class="org.springframework.batch.item.file.transform.FixedLengthLineAggregator" />
</beans>

2
spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
View File

@@ -22,7 +22,7 @@
</property>
<property name="itemReader">
<bean
class="org.springframework.batch.item.reader.ValidatingItemReader">
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader">
<bean
class="org.springframework.batch.sample.item.reader.OrderItemReader">

12
spring-batch-samples/src/main/resources/jobs/multilineOrderOutputDescriptors.xml
View File

@@ -14,26 +14,26 @@
<entry key="item" value-ref="outputLineItem" />
</util:map>
<bean id="outputHeader" class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
<bean id="outputHeader" class="org.springframework.batch.item.file.transform.FixedLengthLineAggregator"
p:columns="1-12,13-22,23-52" />
<bean id="outputFooter"
class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
class="org.springframework.batch.item.file.transform.FixedLengthLineAggregator"
p:columns="1-10,11-30" />
<bean id="outputCustomer" class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
<bean id="outputCustomer" class="org.springframework.batch.item.file.transform.FixedLengthLineAggregator"
p:columns="1-9,10-19,20-29,30-39,40-49" />
<bean id="outputAddress"
class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
class="org.springframework.batch.item.file.transform.FixedLengthLineAggregator"
p:columns="1-8,9-28,29-38,39-48" />
<bean id="outputBilling"
class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
class="org.springframework.batch.item.file.transform.FixedLengthLineAggregator"
p:columns="1-8,9-18,19-38" />
<bean id="outputLineItem"
class="org.springframework.batch.io.file.transform.FixedLengthLineAggregator"
class="org.springframework.batch.item.file.transform.FixedLengthLineAggregator"
p:columns="1-5,6-15,16-25" />
</beans>

6
spring-batch-samples/src/main/resources/jobs/parallelJob.xml
View File

@@ -18,7 +18,7 @@
<property name="streams" ref="fileInputTemplate" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.reader.ValidatingItemReader">
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileInputTemplate" />
<property name="validator"
@@ -70,7 +70,7 @@
<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
<bean id="testInputTemplate"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />
@@ -81,7 +81,7 @@
</bean>
<bean id="fixedFileDescriptor"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="names" value="ISIN, Quantity, Price, Customer" />
<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
</bean>

6
spring-batch-samples/src/main/resources/jobs/restartSample.xml
View File

@@ -15,7 +15,7 @@
<property name="streams" ref="fileItemReader"/>
<property name="itemReader">
<bean
class="org.springframework.batch.item.reader.ValidatingItemReader">
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="itemReader" />
<property name="validator" ref="fixedValidator" />
@@ -40,14 +40,14 @@
</bean>
<bean id="fileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />
</bean>
<bean id="fixedFileDescriptor"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="names" value="ISIN, Quantity, Price, Customer" />
<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
</bean>

6
spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
View File

@@ -19,7 +19,7 @@
<property name="streams" ref="fileInputTemplate" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.reader.ValidatingItemReader">
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileInputTemplate" />
<property name="validator"
@@ -45,7 +45,7 @@
</bean>
<bean id="tradeSqlItemReader"
class="org.springframework.batch.io.cursor.JdbcCursorItemReader">
class="org.springframework.batch.item.database.JdbcCursorItemReader">
<property name="dataSource" ref="dataSource" />
<property name="sql"
value="SELECT id, quantity, price, customer from TRADE" />
@@ -56,7 +56,7 @@
</bean>
<bean id="customerSqlItemReader"
class="org.springframework.batch.io.cursor.JdbcCursorItemReader">
class="org.springframework.batch.item.database.JdbcCursorItemReader">
<property name="dataSource" ref="dataSource" />
<property name="sql"
value="SELECT id, name, credit FROM customer " />

4
spring-batch-samples/src/main/resources/jobs/simpleJob.xml
View File

@@ -36,7 +36,7 @@
<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
<bean id="testInputTemplate"
class="org.springframework.batch.io.file.FlatFileItemReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="lineTokenizer" ref="tradeTokenizer" />
<property name="fieldSetMapper" ref="tradeMapper" />
@@ -55,7 +55,7 @@
</bean>
<bean id="tradeTokenizer"
class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
<property name="names" value="ISIN, Quantity, Price, Customer" />
<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
</bean>

6
spring-batch-samples/src/main/resources/jobs/tradeJob.xml
View File

@@ -17,7 +17,7 @@
<property name="streams" ref="fileInputTemplate" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.reader.ValidatingItemReader">
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileInputTemplate" />
<property name="validator"
@@ -53,7 +53,7 @@
</bean>
<bean id="tradeSqlItemReader"
class="org.springframework.batch.io.cursor.JdbcCursorItemReader">
class="org.springframework.batch.item.database.JdbcCursorItemReader">
<property name="dataSource" ref="dataSource" />
<property name="sql"
value="SELECT id, quantity, price, customer from TRADE" />
@@ -64,7 +64,7 @@
</bean>
<bean id="customerSqlItemReader"
class="org.springframework.batch.io.cursor.JdbcCursorItemReader">
class="org.springframework.batch.item.database.JdbcCursorItemReader">
<property name="dataSource" ref="dataSource" />
<property name="sql"
value="SELECT id, name, credit FROM customer " />

8
spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
View File

@@ -27,18 +27,18 @@
id="customerReportOutputSource">
<property name="outputSource">
<bean
class="org.springframework.batch.io.file.FlatFileItemWriter"
class="org.springframework.batch.item.file.FlatFileItemWriter"
id="customerFlatFileOutputSource">
<property name="resource" ref="customerFileLocator" />
<property name="fieldSetUnmapper">
<bean
class="org.springframework.batch.io.file.mapping.PassThroughFieldSetMapper" />
class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper" />
</property>
</bean>
</property>
</bean>
<bean class="org.springframework.batch.io.file.FlatFileItemReader"
<bean class="org.springframework.batch.item.file.FlatFileItemReader"
id="fileInputTemplate">
<property name="resource" ref="fileLocator" />
<property name="lineTokenizer" ref="tradeFileDescriptor" />
@@ -49,7 +49,7 @@
</bean>
<bean id="tradeFileDescriptor"
class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
class="org.springframework.batch.item.file.transform.DelimitedLineTokenizer">
<property name="names" value="ISIN, Quantity, Price, Customer" />
</bean>

8
spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
View File

@@ -16,14 +16,14 @@
<bean id="step1" parent="simpleStep">
<property name="itemReader">
<bean
class="org.springframework.batch.io.xml.StaxEventItemReader">
class="org.springframework.batch.item.xml.StaxEventItemReader">
<property name="fragmentRootElementName"
value="trade" />
<property name="resource"
value="data/staxJob/input/20070918.testStream.xmlFileStep.xml" />
<property name="fragmentDeserializer">
<bean
class="org.springframework.batch.io.xml.oxm.UnmarshallingEventReaderDeserializer">
class="org.springframework.batch.item.xml.oxm.UnmarshallingEventReaderDeserializer">
<constructor-arg>
<bean
class="org.springframework.oxm.xstream.XStreamMarshaller">
@@ -40,7 +40,7 @@
</property>
</bean>
<bean class="org.springframework.batch.io.xml.StaxEventItemWriter"
<bean class="org.springframework.batch.item.xml.StaxEventItemWriter"
id="tradeStaxWriter">
<property name="resource"
value="file:target/test-outputs/20070918.testStream.xmlFileStep.output.xml" />
@@ -50,7 +50,7 @@
</bean>
<bean
class="org.springframework.batch.io.xml.oxm.MarshallingEventWriterSerializer"
class="org.springframework.batch.item.xml.oxm.MarshallingEventWriterSerializer"
id="tradeMarshallingSerializer">
<constructor-arg>
<bean

4
spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
View File

@@ -72,8 +72,8 @@
<entry key="int[]">
<bean class="org.springframework.batch.support.IntArrayPropertyEditor" />
</entry>
<entry key="org.springframework.batch.io.file.transform.Range[]">
<bean class="org.springframework.batch.io.file.transform.RangeArrayPropertyEditor" />
<entry key="org.springframework.batch.item.file.transform.Range[]">
<bean class="org.springframework.batch.item.file.transform.RangeArrayPropertyEditor" />
</entry>
<entry key="java.util.Date">
<bean class="org.springframework.beans.propertyeditors.CustomDateEditor">

4
spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
View File

@@ -21,9 +21,9 @@ import java.io.FileReader;
import java.sql.ResultSet;
import java.sql.SQLException;
import org.springframework.batch.io.file.FlatFileItemReader;
import org.springframework.batch.io.file.transform.LineTokenizer;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.file.FlatFileItemReader;
import org.springframework.batch.item.file.transform.LineTokenizer;
import org.springframework.batch.sample.domain.Trade;
import org.springframework.batch.sample.mapping.TradeFieldSetMapper;
import org.springframework.core.io.ClassPathResource;

4
spring-batch-samples/src/test/java/org/springframework/batch/sample/StubLineAggregator.java
View File

@@ -16,8 +16,8 @@
package org.springframework.batch.sample;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.transform.LineAggregator;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.transform.LineAggregator;
/**

4
spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java
View File

@@ -9,9 +9,9 @@ import java.util.Map;
import junit.framework.TestCase;
import org.springframework.batch.io.file.transform.LineAggregator;
import org.springframework.batch.item.AbstractItemWriter;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.writer.AbstractItemWriter;
import org.springframework.batch.item.file.transform.LineAggregator;
import org.springframework.batch.sample.StubLineAggregator;
import org.springframework.batch.sample.domain.Address;
import org.springframework.batch.sample.domain.BillingInfo;

2
spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java
View File

@@ -23,7 +23,7 @@ import java.util.HashMap;
import junit.framework.TestCase;
import org.springframework.batch.io.file.transform.DelimitedLineAggregator;
import org.springframework.batch.item.file.transform.DelimitedLineAggregator;
import org.springframework.batch.sample.domain.Address;
import org.springframework.batch.sample.domain.BillingInfo;
import org.springframework.batch.sample.domain.Customer;

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java
View File

@@ -5,10 +5,10 @@ import java.util.Iterator;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.file.mapping.DefaultFieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.Address;
import org.springframework.batch.sample.domain.BillingInfo;
import org.springframework.batch.sample.domain.Customer;

4
spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java
View File

@@ -1,7 +1,7 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import junit.framework.TestCase;

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java
View File

@@ -1,8 +1,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.file.mapping.DefaultFieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.Address;
import org.springframework.batch.sample.mapping.AddressFieldSetMapper;

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java
View File

@@ -1,8 +1,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.file.mapping.DefaultFieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.BillingInfo;
public class BillingFieldSetMapperTests extends AbstractFieldSetMapperTests{

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java
View File

@@ -1,8 +1,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.file.mapping.DefaultFieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.Customer;
import org.springframework.batch.sample.mapping.CustomerFieldSetMapper;

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java
View File

@@ -2,9 +2,9 @@ package org.springframework.batch.sample.mapping;
import java.util.Calendar;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.file.mapping.DefaultFieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.Order;
public class HeaderFieldSetMapperTests extends AbstractFieldSetMapperTests {

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java
View File

@@ -2,9 +2,9 @@ package org.springframework.batch.sample.mapping;
import java.math.BigDecimal;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.file.mapping.DefaultFieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.LineItem;
public class OrderItemFieldSetMapperTests extends AbstractFieldSetMapperTests{

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java
View File

@@ -1,8 +1,8 @@
package org.springframework.batch.sample.mapping;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.file.mapping.DefaultFieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.sample.domain.ShippingInfo;
import org.springframework.batch.sample.mapping.ShippingFieldSetMapper;

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java
View File

@@ -2,9 +2,9 @@ package org.springframework.batch.sample.mapping;
import java.math.BigDecimal;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.file.mapping.DefaultFieldSet;
import org.springframework.batch.item.file.mapping.FieldSet;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.item.reader.AggregateItemReader;
import org.springframework.batch.sample.domain.Trade;
import org.springframework.batch.sample.mapping.TradeFieldSetMapper;

2
spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java
View File

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
import junit.framework.TestCase;
import org.springframework.batch.io.file.FlatFileItemReader;
import org.springframework.batch.item.file.FlatFileItemReader;
import org.springframework.batch.sample.dao.TradeDao;
import org.springframework.batch.sample.domain.Trade;