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

OPEN - issue BATCH-378: RepeatListener is confusing and too generic to use for 'intercepting' a step

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

Open StepListsner with StepExecution.
This commit is contained in:
dsyer
2008-02-28 16:24:46 +00:00
parent 611ab8bfbe
commit e9f0b41eed
6 changed files with 81 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/TaskletStep.java
View File

@@ -83,7 +83,8 @@ public class TaskletStep implements Step, InitializingBean, BeanNameAware {
this.name = name;
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.springframework.batch.core.domain.Step#getStartLimit()
*/
public int getStartLimit() {
@@ -99,7 +100,8 @@ public class TaskletStep implements Step, InitializingBean, BeanNameAware {
this.startLimit = startLimit;
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.springframework.batch.core.domain.Step#isAllowStartIfComplete()
*/
public boolean isAllowStartIfComplete() {
@@ -180,8 +182,14 @@ public class TaskletStep implements Step, InitializingBean, BeanNameAware {
Exception fatalException = null;
try {
listener.open(stepExecution.getJobParameters());
exitStatus = tasklet.execute();
listener.open(stepExecution);
exitStatus = tasklet.execute();
try {
exitStatus = exitStatus.and(listener.close());
}
catch (Exception e) {
logger.error("Encountered an error on listener close.", e);
}
try {
jobRepository.saveOrUpdateExecutionContext(stepExecution);
@@ -193,23 +201,21 @@ public class TaskletStep implements Step, InitializingBean, BeanNameAware {
}
}
catch (RuntimeException e) {
logger.error("Encountered an error running the tasklet");
updateStatus(stepExecution, BatchStatus.FAILED);
throw e;
}
catch (Exception e) {
logger.error("Encountered an error running the tasklet");
updateStatus(stepExecution, BatchStatus.FAILED);
try {
exitStatus = exitStatus.and(listener.onError(e));
}
catch (Exception ex) {
logger.error("Encountered an error on listener close.", ex);
}
if (e instanceof RuntimeException) {
throw (RuntimeException) e;
}
throw new BatchCriticalException(e);
}
finally {
try {
exitStatus = exitStatus.and(listener.close());
}
catch (Exception e) {
logger.error("Encountered an error on listener close.", e);
}
stepExecution.setExitStatus(exitStatus);
stepExecution.setEndTime(new Date());
try {

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java
View File

@@ -105,7 +105,7 @@ public class TaskletStepTests extends TestCase {
public void testSuccessfulExecutionWithListener() throws Exception {
TaskletStep step = new TaskletStep(new StubTasklet(false, false), new JobRepositorySupport());
step.setListener(new StepListenerSupport() {
public void open(JobParameters context) {
public void open(StepExecution context) {
list.add("open");
}
public ExitStatus close() {