diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java index 9b7f3c4cc..2c6149ce9 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDao.java @@ -53,8 +53,8 @@ public class FlatFileCustomerCreditDao implements CustomerCreditDao, this.separator = separator; } - public void setOutputSource(ItemWriter outputSource) { - this.itemWriter = outputSource; + public void setItemWriter(ItemWriter itemWriter) { + this.itemWriter = itemWriter; } public void open(ExecutionContext executionContext) throws Exception { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateWriter.java index 2cea41156..aeba2c0f6 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateWriter.java @@ -38,11 +38,8 @@ public class CustomerCreditUpdateWriter extends AbstractItemWriter { this.creditFilter = creditFilter; } - public void setWriter(CustomerCreditDao writer) { - this.dao = writer; + public void setDao(CustomerCreditDao dao) { + this.dao = dao; } - public void close() throws Exception { - } - } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java index 99c33211d..dcbe207ea 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java @@ -41,10 +41,4 @@ public class CustomerUpdateWriter extends AbstractItemWriter { public void setDao(JdbcCustomerDebitDao outputSource) { this.dao = outputSource; } - - public void close() { - } - - public void init() { - } } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/DummyItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/DummyItemWriter.java index e79f9e34a..2c38784b7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/DummyItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/DummyItemWriter.java @@ -15,27 +15,16 @@ */ package org.springframework.batch.sample.item.writer; -import org.springframework.batch.item.ClearFailedException; -import org.springframework.batch.item.FlushFailedException; -import org.springframework.batch.item.ItemWriter; +import org.springframework.batch.item.AbstractItemWriter; /** * @author Dave Syer * */ -public class DummyItemWriter implements ItemWriter { +public class DummyItemWriter extends AbstractItemWriter { public void write(Object item) throws Exception { // NO-OP } - public void close() throws Exception { - } - - public void clear() throws ClearFailedException { - } - - public void flush() throws FlushFailedException { - } - } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PersonWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PersonWriter.java index aea45d10a..1bf1166cc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PersonWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PersonWriter.java @@ -36,9 +36,4 @@ public class PersonWriter extends AbstractItemWriter { log.debug("Processing: " + data); } - public void close() { - } - - public void init() { - } } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PlayerItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PlayerItemWriter.java index 253fd8e54..1e2a0f3b5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PlayerItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PlayerItemWriter.java @@ -6,7 +6,7 @@ import org.springframework.batch.sample.domain.Player; public class PlayerItemWriter extends AbstractItemWriter { - PlayerDao playerDao; + private PlayerDao playerDao; public void write(Object data) throws Exception { playerDao.savePlayer((Player)data); @@ -15,7 +15,5 @@ public class PlayerItemWriter extends AbstractItemWriter { public void setPlayerDao(PlayerDao playerDao) { this.playerDao = playerDao; } - - public void close() throws Exception { - } + } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java index f2bbcf703..1db096a2e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java @@ -84,9 +84,6 @@ public class StagingItemWriter extends JdbcDaoSupport implements StepListener, I }); } - public void close() throws Exception { - } - public void clear() throws ClearFailedException { } diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml index c38096b46..644a3e292 100644 --- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml @@ -45,7 +45,7 @@ + p:dao-ref="customerReportOutputSource" /> diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml index de086ff6d..5b5b9e343 100644 --- a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml +++ b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml @@ -25,7 +25,7 @@ - + diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java index 6dcf52d2d..0038b08d0 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java @@ -25,7 +25,7 @@ public class FlatFileCustomerCreditDaoTests extends TestCase { //create new writer writer = new FlatFileCustomerCreditDao(); - writer.setOutputSource(output); + writer.setItemWriter(output); } public void testOpen() throws Exception { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java index 29b88c909..bc2b00cb7 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java @@ -22,7 +22,7 @@ public class CustomerCreditUpdateProcessorTests extends TestCase { dao = (CustomerCreditDao) daoControl.getMock(); //create processor, set writer and credit filter writer = new CustomerCreditUpdateWriter(); - writer.setWriter(dao); + writer.setDao(dao); writer.setCreditFilter(CREDIT_FILTER); }