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

RESOLVED - BATCH-614: pull properties from SimpleJob to AbstractJob

Browse Source
This commit is contained in:
robokaso
2008-05-07 09:00:36 +00:00
parent 2f17add6b7
commit a81af93e52
3 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java
View File

@@ -20,7 +20,10 @@ import java.util.ArrayList;
import java.util.List;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecutionListener;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.listener.CompositeExecutionJobListener;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.util.ClassUtils;
@@ -41,6 +44,10 @@ public abstract class AbstractJob implements BeanNameAware, Job {
private boolean restartable = false;
private JobRepository jobRepository;
private CompositeExecutionJobListener listener = new CompositeExecutionJobListener();
/**
* Default constructor.
*/
@@ -121,4 +128,45 @@ public abstract class AbstractJob implements BeanNameAware, Job {
public String toString() {
return ClassUtils.getShortName(getClass()) + ": [name=" + name + "]";
}
/**
* Public setter for injecting {@link JobExecutionListener}s. They will all
* be given the listener callbacks at the appropriate point in the job.
*
* @param listeners the listeners to set.
*/
public void setJobExecutionListeners(JobExecutionListener[] listeners) {
for (int i = 0; i < listeners.length; i++) {
this.listener.register(listeners[i]);
}
}
/**
* Register a single listener for the {@link JobExecutionListener}
* callbacks.
*
* @param listener a {@link JobExecutionListener}
*/
public void registerJobExecutionListener(JobExecutionListener listener) {
this.listener.register(listener);
}
/**
* Public setter for the {@link JobRepository} that is needed to manage the
* state of the batch meta domain (jobs, steps, executions) during the life
* of a job.
*
* @param jobRepository
*/
public void setJobRepository(JobRepository jobRepository) {
this.jobRepository = jobRepository;
}
protected JobRepository getJobRepository() {
return jobRepository;
}
protected CompositeExecutionJobListener getCompositeListener() {
return listener;
}
}

60
spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java
View File

@@ -27,11 +27,8 @@ import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobExecutionException;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobInterruptedException;
import org.springframework.batch.core.JobExecutionListener;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.listener.CompositeExecutionJobListener;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.repeat.ExitStatus;
@@ -45,32 +42,6 @@ import org.springframework.batch.repeat.ExitStatus;
*/
public class SimpleJob extends AbstractJob {
private JobRepository jobRepository;
private CompositeExecutionJobListener listener = new CompositeExecutionJobListener();
/**
* Public setter for injecting {@link JobExecutionListener}s. They will all
* be given the listener callbacks at the appropriate point in the job.
*
* @param listeners the listeners to set.
*/
public void setJobExecutionListeners(JobExecutionListener[] listeners) {
for (int i = 0; i < listeners.length; i++) {
this.listener.register(listeners[i]);
}
}
/**
* Register a single listener for the {@link JobExecutionListener}
* callbacks.
*
* @param listener a {@link JobExecutionListener}
*/
public void registerJobExecutionListener(JobExecutionListener listener) {
this.listener.register(listener);
}
/**
* Run the specified job by looping through the steps and delegating to the
* {@link Step}.
@@ -98,7 +69,7 @@ public class SimpleJob extends AbstractJob {
execution.setStartTime(new Date());
updateStatus(execution, BatchStatus.STARTING);
listener.beforeJob(execution);
getCompositeListener().beforeJob(execution);
for (Iterator i = steps.iterator(); i.hasNext();) {
@@ -110,9 +81,9 @@ public class SimpleJob extends AbstractJob {
updateStatus(execution, BatchStatus.STARTED);
currentStepExecution = execution.createStepExecution(step);
StepExecution lastStepExecution = jobRepository.getLastStepExecution(jobInstance, step);
StepExecution lastStepExecution = getJobRepository().getLastStepExecution(jobInstance, step);
boolean isRestart = (jobRepository.getStepExecutionCount(jobInstance, step) > 0 && !lastStepExecution
boolean isRestart = (getJobRepository().getStepExecutionCount(jobInstance, step) > 0 && !lastStepExecution
.getExitStatus().equals(ExitStatus.FINISHED)) ? true : false;
if (isRestart && lastStepExecution != null) {
@@ -129,17 +100,17 @@ public class SimpleJob extends AbstractJob {
updateStatus(execution, BatchStatus.COMPLETED);
listener.afterJob(execution);
getCompositeListener().afterJob(execution);
}
catch (JobInterruptedException e) {
execution.setStatus(BatchStatus.STOPPED);
listener.onInterrupt(execution);
getCompositeListener().onInterrupt(execution);
rethrow(e);
}
catch (Throwable t) {
execution.setStatus(BatchStatus.FAILED);
listener.onError(execution, t);
getCompositeListener().onError(execution, t);
rethrow(t);
}
finally {
@@ -159,14 +130,14 @@ public class SimpleJob extends AbstractJob {
execution.setEndTime(new Date());
execution.setExitStatus(status);
jobRepository.saveOrUpdate(execution);
getJobRepository().saveOrUpdate(execution);
}
}
private void updateStatus(JobExecution jobExecution, BatchStatus status) {
jobExecution.setStatus(status);
jobRepository.saveOrUpdate(jobExecution);
getJobRepository().saveOrUpdate(jobExecution);
}
/*
@@ -177,7 +148,7 @@ public class SimpleJob extends AbstractJob {
BatchStatus stepStatus;
// if the last execution is null, the step has never been executed.
StepExecution lastStepExecution = jobRepository.getLastStepExecution(jobInstance, step);
StepExecution lastStepExecution = getJobRepository().getLastStepExecution(jobInstance, step);
if (lastStepExecution == null) {
stepStatus = BatchStatus.STARTING;
}
@@ -197,7 +168,7 @@ public class SimpleJob extends AbstractJob {
return false;
}
if (jobRepository.getStepExecutionCount(jobInstance, step) < step.getStartLimit()) {
if (getJobRepository().getStepExecutionCount(jobInstance, step) < step.getStartLimit()) {
// step start count is less than start max, return true
return true;
}
@@ -222,15 +193,4 @@ public class SimpleJob extends AbstractJob {
throw new UnexpectedJobExecutionException("Unexpected checked exception in job execution", t);
}
}
/**
* Public setter for the {@link JobRepository} that is needed to manage the
* state of the batch meta domain (jobs, steps, executions) during the life
* of a job.
*
* @param jobRepository
*/
public void setJobRepository(JobRepository jobRepository) {
this.jobRepository = jobRepository;
}
}