From db4b121b224560e7ffb755d5f7bc59cf7a0c329b Mon Sep 17 00:00:00 2001 From: robokaso Date: Thu, 6 Mar 2008 14:36:38 +0000 Subject: [PATCH] RESOLVED - issue BATCH-419: JobListener and StepListener should pass in JobExecution/StepExecution in each method http://jira.springframework.org/browse/BATCH-419 added JobExecution argument to JobListener#afterJob --- .../springframework/batch/core/domain/JobListener.java | 2 +- .../batch/core/listener/JobListenerSupport.java | 2 +- .../springframework/batch/execution/job/SimpleJob.java | 2 +- .../batch/execution/listener/CompositeJobListener.java | 4 ++-- .../batch/execution/job/SimpleJobTests.java | 2 +- .../execution/listener/CompositeJobListenerTests.java | 10 +++++----- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobListener.java index e770a568a..b998d8474 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobListener.java @@ -36,5 +36,5 @@ public interface JobListener { /** * Callback after successful completion of a job. */ - void afterJob(); + void afterJob(JobExecution jobExecution); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerSupport.java index 20a24b5a6..a74f30f55 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerSupport.java @@ -27,7 +27,7 @@ public class JobListenerSupport implements JobListener { /* (non-Javadoc) * @see org.springframework.batch.core.domain.JobListener#afterJob() */ - public void afterJob() { + public void afterJob(JobExecution jobExecution) { } /* (non-Javadoc) 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 a4ef41f54..addd36347 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 @@ -110,7 +110,7 @@ public class SimpleJob extends AbstractJob { updateStatus(execution, BatchStatus.COMPLETED); - listener.afterJob(); + listener.afterJob(execution); } catch (JobInterruptedException e) { 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 15acdcf82..d8436ef81 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 @@ -54,10 +54,10 @@ public class CompositeJobListener implements JobListener { /* (non-Javadoc) * @see org.springframework.batch.core.domain.StepListener#close() */ - public void afterJob() { + public void afterJob(JobExecution jobExecution) { for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { JobListener listener = (JobListener) iterator.next(); - listener.afterJob(); + listener.afterJob(jobExecution); } } 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 6ba68fb5b..692ab2e63 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 @@ -181,7 +181,7 @@ public class SimpleJobTests extends TestCase { public void beforeJob(JobExecution jobExecution) { list.add("before"); } - public void afterJob() { + public void afterJob(JobExecution jobExecution) { list.add("after"); } }}); diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java index 046727f9e..180c87115 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java @@ -43,15 +43,15 @@ public class CompositeJobListenerTests extends TestCase { */ public void testSetListeners() { listener.setListeners(new JobListener[] { new JobListenerSupport() { - public void afterJob() { + public void afterJob(JobExecution jobExecution) { list.add("fail"); } }, new JobListenerSupport() { - public void afterJob() { + public void afterJob(JobExecution jobExecution) { list.add("continue"); } } }); - listener.afterJob(); + listener.afterJob(null); assertEquals(2, list.size()); } @@ -61,11 +61,11 @@ public class CompositeJobListenerTests extends TestCase { */ public void testSetListener() { listener.register(new JobListenerSupport() { - public void afterJob() { + public void afterJob(JobExecution jobExecution) { list.add("fail"); } }); - listener.afterJob(); + listener.afterJob(null); assertEquals(1, list.size()); }