From 05609cc2fb154aff2f57f6e598cf3b87bf3f5ab2 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 4 Mar 2008 09:47:22 +0000
Subject: [PATCH] RESOLVED - issue BATCH-404: FactoryBeans for step
 configuration http://jira.springframework.org/browse/BATCH-404 Better name
 for helper method.

---
 .../step/support/BatchListenerFactoryHelper.java          | 8 ++++----
 .../execution/step/support/DefaultStepFactoryBean.java    | 2 +-
 .../step/support/RepeatOperationsStepFactoryBean.java     | 2 +-
 .../src/main/resources/data-source-context.xml            | 6 ------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java
index 6f32e93fb..0e40ab71a 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java
@@ -30,6 +30,7 @@ import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.reader.DelegatingItemReader;
 import org.springframework.batch.item.writer.DelegatingItemWriter;
+import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.RepeatOperations;
 import org.springframework.batch.repeat.listener.RepeatListenerSupport;
@@ -116,7 +117,7 @@ class BatchListenerFactoryHelper {
 	 * @param listeners
 	 * @return
 	 */
-	public RepeatOperations getStepOperations(RepeatOperations stepOperations, BatchListener[] listeners) {
+	public RepeatOperations addChunkListeners(RepeatOperations stepOperations, BatchListener[] listeners) {
 
 		final CompositeChunkListener multicaster = new CompositeChunkListener();
 
@@ -140,11 +141,10 @@ class BatchListenerFactoryHelper {
 
 			RepeatTemplate stepTemplate = (RepeatTemplate) stepOperations;
 			stepTemplate.registerListener(new RepeatListenerSupport() {
-				public void open(RepeatContext context) {
+				public void before(RepeatContext context) {
 					multicaster.beforeChunk();
 				}
-
-				public void close(RepeatContext context) {
+				public void after(RepeatContext context, ExitStatus result) {
 					multicaster.afterChunk();
 				}
 			});
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java
index fb0c0b42c..9a15a55c8 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java
@@ -184,7 +184,7 @@ public class DefaultStepFactoryBean extends AbstractStepFactoryBean {
 		itemReader = helper.getItemReader(itemReader, listeners);
 		itemWriter = helper.getItemWriter(itemWriter, listeners);
 		stepOperations = new RepeatTemplate();
-		stepOperations = (RepeatTemplate) helper.getStepOperations(stepOperations, listeners);
+		stepOperations = (RepeatTemplate) helper.addChunkListeners(stepOperations, listeners);
 
 		// In case they are used by subclasses:
 		setItemReader(itemReader);
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java
index 555a6f891..1d85245af 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java
@@ -123,7 +123,7 @@ public class RepeatOperationsStepFactoryBean extends AbstractStepFactoryBean {
 		StepListener[] stepListeners = helper.getStepListeners(listeners);
 		itemReader = helper.getItemReader(itemReader, listeners);
 		itemWriter = helper.getItemWriter(itemWriter, listeners);
-		RepeatOperations stepOperations = helper.getStepOperations(this.stepOperations, listeners);
+		RepeatOperations stepOperations = helper.addChunkListeners(this.stepOperations, listeners);
 
 		// In case they are used by subclasses:
 		setItemReader(itemReader);
diff --git a/spring-batch-samples/src/main/resources/data-source-context.xml b/spring-batch-samples/src/main/resources/data-source-context.xml
index 317bb73a4..7d0114c0c 100644
--- a/spring-batch-samples/src/main/resources/data-source-context.xml
+++ b/spring-batch-samples/src/main/resources/data-source-context.xml
@@ -61,12 +61,6 @@
 	
 	<bean id="lobHandler" class="${batch.lob.handler.class}"/>
 
-	<bean id="incrementerParent"
-		class="${batch.database.incrementer.class}">
-		<property name="dataSource" ref="dataSource" />
-		<property name="incrementerName" value="ID" />
-	</bean>
-
 	<!--import resource="alt-data-source-context.xml" /-->
 
 </beans>
\ No newline at end of file