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

OPEN - issue BATCH-364: StepScope responsibilities can be assumed by Step (not ApplicationContext)

Browse Source 
http://jira.springframework.org/browse/BATCH-364

Make StreamManager responsible for calling open() and close().
This commit is contained in:
dsyer
2008-02-15 13:44:36 +00:00
parent 66ddfa81f0
commit ec5379ebac
26 changed files with 460 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,8 +23,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.domain.StepExecution;
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.reader.AbstractItemReader;
import org.springframework.batch.item.reader.DelegatingItemReader;
import org.springframework.batch.item.validator.Validator;
import org.springframework.batch.sample.domain.Address;
import org.springframework.batch.sample.domain.BillingInfo;
@@ -33,177 +32,180 @@ import org.springframework.batch.sample.domain.LineItem;
import org.springframework.batch.sample.domain.Order;
import org.springframework.batch.sample.domain.ShippingInfo;
/**
* @author peter.zozom
*
*
*/
public class OrderItemReader extends AbstractItemReader {
private static Log log = LogFactory.getLog(OrderItemReader.class);
private ItemReader inputSource;
private Order order;
private boolean recordFinished;
private FieldSetMapper headerMapper;
private FieldSetMapper customerMapper;
private FieldSetMapper addressMapper;
private FieldSetMapper billingMapper;
private FieldSetMapper itemMapper;
private FieldSetMapper shippingMapper;
private Validator validator;
public class OrderItemReader extends DelegatingItemReader {
private static Log log = LogFactory.getLog(OrderItemReader.class);
/**
* @throws Exception
* @see org.springframework.batch.item.ItemReader#read()
*/
public Object read() throws Exception {
recordFinished = false;
private Order order;
while (!recordFinished) {
process((FieldSet)inputSource.read());
}
private boolean recordFinished;
if (order!=null) {
log.info("Mapped: "+order);
validator.validate(order);
}
private FieldSetMapper headerMapper;
Object result = order;
order = null;
private FieldSetMapper customerMapper;
return result;
}
private FieldSetMapper addressMapper;
/**
* @see org.springframework.batch.execution.io.FieldSetCallback#execute(StepExecution)
*/
private void process(FieldSet fieldSet) {
//finish processing if we hit the end of file
if (fieldSet == null) {
log.debug("FINISHED");
recordFinished = true;
order = null;
private FieldSetMapper billingMapper;
return;
}
private FieldSetMapper itemMapper;
String lineId = fieldSet.readString(0);
private FieldSetMapper shippingMapper;
//start a new Order
if (Order.LINE_ID_HEADER.equals(lineId)) {
log.debug("STARTING NEW RECORD");
order = (Order) headerMapper.mapLine(fieldSet);
private Validator validator;
return;
}
/**
* @throws Exception
* @see org.springframework.batch.item.ItemReader#read()
*/
public Object read() throws Exception {
recordFinished = false;
//mark we are finished with current Order
if (Order.LINE_ID_FOOTER.equals(lineId)) {
log.debug("END OF RECORD");
while (!recordFinished) {
process((FieldSet) getItemReader().read());
}
//Do mapping for footer here, because mapper does not allow to pass an Order object as input.
//Mapper always creates new object
order.setTotalPrice(fieldSet.readBigDecimal("TOTAL_PRICE"));
order.setTotalLines(fieldSet.readInt("TOTAL_LINE_ITEMS"));
order.setTotalItems(fieldSet.readInt("TOTAL_ITEMS"));
if (order != null) {
log.info("Mapped: " + order);
validator.validate(order);
}
recordFinished = true;
Object result = order;
order = null;
return;
}
return result;
}
if (Customer.LINE_ID_BUSINESS_CUST.equals(lineId)) {
log.debug("MAPPING CUSTOMER");
/**
* @see org.springframework.batch.execution.io.FieldSetCallback#execute(StepExecution)
*/
private void process(FieldSet fieldSet) {
// finish processing if we hit the end of file
if (fieldSet == null) {
log.debug("FINISHED");
recordFinished = true;
order = null;
if (order.getCustomer() == null) {
order.setCustomer((Customer) customerMapper.mapLine(fieldSet));
order.getCustomer().setBusinessCustomer(true);
}
return;
}
return;
}
String lineId = fieldSet.readString(0);
if (Customer.LINE_ID_NON_BUSINESS_CUST.equals(lineId)) {
log.debug("MAPPING CUSTOMER");
// start a new Order
if (Order.LINE_ID_HEADER.equals(lineId)) {
log.debug("STARTING NEW RECORD");
order = (Order) headerMapper.mapLine(fieldSet);
if (order.getCustomer() == null) {
order.setCustomer((Customer) customerMapper.mapLine(fieldSet));
order.getCustomer().setBusinessCustomer(false);
}
return;
}
return;
}
// mark we are finished with current Order
if (Order.LINE_ID_FOOTER.equals(lineId)) {
log.debug("END OF RECORD");
if (Address.LINE_ID_BILLING_ADDR.equals(lineId)) {
log.debug("MAPPING BILLING ADDRESS");
order.setBillingAddress((Address) addressMapper.mapLine(fieldSet));
return;
}
// Do mapping for footer here, because mapper does not allow to pass
// an Order object as input.
// Mapper always creates new object
order.setTotalPrice(fieldSet.readBigDecimal("TOTAL_PRICE"));
order.setTotalLines(fieldSet.readInt("TOTAL_LINE_ITEMS"));
order.setTotalItems(fieldSet.readInt("TOTAL_ITEMS"));
if (Address.LINE_ID_SHIPPING_ADDR.equals(lineId)) {
log.debug("MAPPING SHIPPING ADDRESS");
order.setShippingAddress((Address) addressMapper.mapLine(fieldSet));
return;
}
recordFinished = true;
if (BillingInfo.LINE_ID_BILLING_INFO.equals(lineId)) {
log.debug("MAPPING BILLING INFO");
order.setBilling((BillingInfo) billingMapper.mapLine(fieldSet));
return;
}
return;
}
if (ShippingInfo.LINE_ID_SHIPPING_INFO.equals(lineId)) {
log.debug("MAPPING SHIPPING INFO");
order.setShipping((ShippingInfo) shippingMapper.mapLine(fieldSet));
return;
}
if (Customer.LINE_ID_BUSINESS_CUST.equals(lineId)) {
log.debug("MAPPING CUSTOMER");
if (LineItem.LINE_ID_ITEM.equals(lineId)) {
log.debug("MAPPING LINE ITEM");
if (order.getCustomer() == null) {
order.setCustomer((Customer) customerMapper.mapLine(fieldSet));
order.getCustomer().setBusinessCustomer(true);
}
if (order.getLineItems() == null) {
order.setLineItems(new ArrayList());
}
return;
}
order.getLineItems().add(itemMapper.mapLine(fieldSet));
if (Customer.LINE_ID_NON_BUSINESS_CUST.equals(lineId)) {
log.debug("MAPPING CUSTOMER");
return;
}
if (order.getCustomer() == null) {
order.setCustomer((Customer) customerMapper.mapLine(fieldSet));
order.getCustomer().setBusinessCustomer(false);
}
log.debug("Could not map LINE_ID="+lineId);
return;
}
}
if (Address.LINE_ID_BILLING_ADDR.equals(lineId)) {
log.debug("MAPPING BILLING ADDRESS");
order.setBillingAddress((Address) addressMapper.mapLine(fieldSet));
return;
}
public void setAddressMapper(FieldSetMapper addressMapper) {
this.addressMapper = addressMapper;
}
if (Address.LINE_ID_SHIPPING_ADDR.equals(lineId)) {
log.debug("MAPPING SHIPPING ADDRESS");
order.setShippingAddress((Address) addressMapper.mapLine(fieldSet));
return;
}
public void setBillingMapper(FieldSetMapper billingMapper) {
this.billingMapper = billingMapper;
}
if (BillingInfo.LINE_ID_BILLING_INFO.equals(lineId)) {
log.debug("MAPPING BILLING INFO");
order.setBilling((BillingInfo) billingMapper.mapLine(fieldSet));
return;
}
public void setCustomerMapper(FieldSetMapper customerMapper) {
this.customerMapper = customerMapper;
}
if (ShippingInfo.LINE_ID_SHIPPING_INFO.equals(lineId)) {
log.debug("MAPPING SHIPPING INFO");
order.setShipping((ShippingInfo) shippingMapper.mapLine(fieldSet));
return;
}
public void setHeaderMapper(FieldSetMapper headerMapper) {
this.headerMapper = headerMapper;
}
if (LineItem.LINE_ID_ITEM.equals(lineId)) {
log.debug("MAPPING LINE ITEM");
public void setItemReader(ItemReader inputSource) {
this.inputSource = inputSource;
}
if (order.getLineItems() == null) {
order.setLineItems(new ArrayList());
}
public void setItemMapper(FieldSetMapper itemMapper) {
this.itemMapper = itemMapper;
}
order.getLineItems().add(itemMapper.mapLine(fieldSet));
public void setShippingMapper(FieldSetMapper shippingMapper) {
this.shippingMapper = shippingMapper;
}
return;
}
public void setValidator(Validator validator) {
this.validator = validator;
}
log.debug("Could not map LINE_ID=" + lineId);
}
public void setAddressMapper(FieldSetMapper addressMapper) {
this.addressMapper = addressMapper;
}
public void setBillingMapper(FieldSetMapper billingMapper) {
this.billingMapper = billingMapper;
}
public void setCustomerMapper(FieldSetMapper customerMapper) {
this.customerMapper = customerMapper;
}
public void setHeaderMapper(FieldSetMapper headerMapper) {
this.headerMapper = headerMapper;
}
public void setItemMapper(FieldSetMapper itemMapper) {
this.itemMapper = itemMapper;
}
public void setShippingMapper(FieldSetMapper shippingMapper) {
this.shippingMapper = shippingMapper;
}
public void setValidator(Validator validator) {
this.validator = validator;
}
}

11
spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxy.java
View File

@@ -19,6 +19,7 @@ package org.springframework.batch.sample.tasklet;
import org.springframework.batch.io.exception.BatchCriticalException;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.reader.DelegatingItemReader;
/**
* Hacked {@link ItemReader} that throws exception on a given record number
@@ -28,17 +29,11 @@ import org.springframework.batch.item.ItemReader;
* @author Lucas Ward
*
*/
public class ExceptionThrowingItemReaderProxy implements ItemReader {
public class ExceptionThrowingItemReaderProxy extends DelegatingItemReader {
private int counter = 0;
private int throwExceptionOnRecordNumber = 4;
private final ItemReader itemReader;
public ExceptionThrowingItemReaderProxy(ItemReader itemReader) {
this.itemReader = itemReader;
}
/**
* @param throwExceptionOnRecordNumber The number of record on which exception should be thrown
*/
@@ -57,7 +52,7 @@ public class ExceptionThrowingItemReaderProxy implements ItemReader {
throw new BatchCriticalException("Planned failure on count="+counter);
}
return itemReader.read();
return getItemReader().read();
}
}

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

@@ -39,7 +39,7 @@
<bean id="itemReader"
class="org.springframework.batch.sample.tasklet.ExceptionThrowingItemReaderProxy">
<constructor-arg ref="fileItemReader" />
<property name="itemReader" ref="fileItemReader" />
</bean>
<bean id="fileItemReader"

3
spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java
View File

@@ -21,7 +21,8 @@ public class ExceptionThrowingItemReaderProxyTests extends TestCase {
public void testProcess() throws Exception {
//create module and set item processor and iteration count
ExceptionThrowingItemReaderProxy itemReader = new ExceptionThrowingItemReaderProxy(new ListItemReader(new ArrayList() {{
ExceptionThrowingItemReaderProxy itemReader = new ExceptionThrowingItemReaderProxy();
itemReader.setItemReader(new ListItemReader(new ArrayList() {{
add("a");
add("b");
add("c");