From 2844579daefccdbc53cf42d1246a624547703457 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 6 Mar 2008 08:20:01 +0000
Subject: [PATCH] RESOLVED - issue BATCH-421: Different set methods for
 listeners on implementation classes
 http://jira.springframework.org/browse/BATCH-421

---
 .../batch/execution/job/SimpleJob.java        | 27 ++++++++++++++-----
 .../listener/CompositeJobListener.java        |  8 +++---
 .../batch/execution/job/SimpleJobTests.java   |  2 +-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java
index b96bd160f..a4ef41f54 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java
@@ -34,8 +34,8 @@ import org.springframework.batch.repeat.ExitStatus;
 
 /**
  * Simple implementation of (@link Job} interface providing the ability to run a
- * {@link JobExecution}. Sequentially executes a job by iterating it's life of
- * steps.
+ * {@link JobExecution}. Sequentially executes a job by iterating through its
+ * list of steps.
  * 
  * @author Lucas Ward
  * @author Dave Syer
@@ -46,11 +46,25 @@ public class SimpleJob extends AbstractJob {
 
 	private CompositeJobListener listener = new CompositeJobListener();
 
-	public void setListeners(JobListener[] listeners) {
+	/**
+	 * Public setter for injecting {@link JobListener}s. They will all be given
+	 * the {@link JobListener} callbacks at the appropriate point in the job.
+	 * 
+	 * @param listeners the listeners to set.
+	 */
+	public void setJobListeners(JobListener[] listeners) {
 		for (int i = 0; i < listeners.length; i++) {
 			this.listener.register(listeners[i]);
 		}
 	}
+	
+	/**
+	 * Register a single listener for the {@link JobListener} callbacks.
+	 * @param listener a {@link JobListener}
+	 */
+	public void registerListener(JobListener listener) {
+		this.listener.register(listener);
+	}
 
 	/**
 	 * Run the specified job by looping through the steps and delegating to the
@@ -79,7 +93,6 @@ public class SimpleJob extends AbstractJob {
 
 			listener.beforeJob(execution);
 
-			
 			for (Iterator i = steps.iterator(); i.hasNext();) {
 
 				Step step = (Step) i.next();
@@ -91,7 +104,7 @@ public class SimpleJob extends AbstractJob {
 					currentStepExecution = execution.createStepExecution(step);
 
 					step.execute(currentStepExecution);
-					
+
 				}
 			}
 
@@ -119,10 +132,10 @@ public class SimpleJob extends AbstractJob {
 					status = ExitStatus.NOOP.addExitDescription("No steps configured for this job.");
 				}
 			}
-			else if(currentStepExecution != null){
+			else if (currentStepExecution != null) {
 				status = currentStepExecution.getExitStatus();
 			}
-			
+
 			execution.setEndTime(new Date());
 			execution.setExitStatus(status);
 			jobRepository.saveOrUpdate(execution);
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java
index 36f081092..15acdcf82 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java
@@ -43,11 +43,11 @@ public class CompositeJobListener implements JobListener {
 	/**
 	 * Register additional listener.
 	 * 
-	 * @param stepListener
+	 * @param jobListener
 	 */
-	public void register(JobListener stepListener) {
-		if (!listeners.contains(stepListener)) {
-			listeners.add(stepListener);
+	public void register(JobListener jobListener) {
+		if (!listeners.contains(jobListener)) {
+			listeners.add(jobListener);
 		}
 	}
 
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java
index bd3bc2313..6ba68fb5b 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java
@@ -177,7 +177,7 @@ public class SimpleJobTests extends TestCase {
 	}
 
 	public void testRunNormallyWithListener() throws Exception {
-		job.setListeners(new JobListenerSupport[] {new JobListenerSupport() {
+		job.setJobListeners(new JobListenerSupport[] {new JobListenerSupport() {
 			public void beforeJob(JobExecution jobExecution) {
 				list.add("before");
 			}