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

IN PROGRESS - BATCH-858: Pause / resume of Job

Browse Source 
updated JobLauncher javadoc and added testcase for the pause-checking responsibility
This commit is contained in:
robokaso
2008-10-21 15:28:20 +00:00
parent 2d3c928fa3
commit 0d8e32282a
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobLauncher.java
View File

@@ -15,6 +15,7 @@
*/ */
package org.springframework.batch.core.launch; package org.springframework.batch.core.launch;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.Job; import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParameters;
@@ -37,12 +38,17 @@ import org.springframework.batch.core.repository.JobExecutionAlreadyRunningExcep
public interface JobLauncher { public interface JobLauncher {
/** /**
* Start a job execution for the given {@link Job} and {@link JobParameters}. If * Start a job execution for the given {@link Job} and {@link JobParameters}
* a JobExecution was able to be created successfully, it will always be returned * . If a JobExecution was able to be created successfully, it will always
* by this method, regardless of whether or not the execution was successful. * be returned by this method, regardless of whether or not the execution
* was successful.
*
* If there exists a past {@link JobExecution} and its status is
* {@link BatchStatus#PAUSED}, the same JobExecution should be continued
* instead of new one created.
* *
* @return the {@link JobExecution} if it returns synchronously. If the * @return the {@link JobExecution} if it returns synchronously. If the
* implementation is asynchronous, the status might well be unknown. * implementation is asynchronous, the status might well be unknown.
* *
* @throws JobExecutionAlreadyRunningException if the JobInstance identified * @throws JobExecutionAlreadyRunningException if the JobInstance identified
* by the properties already has an execution running. * by the properties already has an execution running.

22
spring-batch-core/src/test/java/org/springframework/batch/core/launch/SimpleJobLauncherTests.java
View File

@@ -30,6 +30,7 @@ import java.util.List;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.Job; import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance; import org.springframework.batch.core.JobInstance;
@@ -75,8 +76,6 @@ public class SimpleJobLauncherTests {
JobExecution jobExecution = new JobExecution(null, null); JobExecution jobExecution = new JobExecution(null, null);
// expect(jobRepository.isJobInstanceExists(job.getName(),
// jobParameters)).andReturn(false);
expect(jobRepository.getLastJobExecution(job.getName(), jobParameters)).andReturn(null); expect(jobRepository.getLastJobExecution(job.getName(), jobParameters)).andReturn(null);
expect(jobRepository.createJobExecution(job.getName(), jobParameters)).andReturn(jobExecution); expect(jobRepository.createJobExecution(job.getName(), jobParameters)).andReturn(jobExecution);
replay(jobRepository); replay(jobRepository);
@@ -110,7 +109,6 @@ public class SimpleJobLauncherTests {
testRun(); testRun();
try { try {
reset(jobRepository); reset(jobRepository);
// expect(jobRepository.isJobInstanceExists(job.getName(), jobParameters)).andReturn(true);
expect(jobRepository.getLastJobExecution(job.getName(), jobParameters)).andReturn( expect(jobRepository.getLastJobExecution(job.getName(), jobParameters)).andReturn(
new JobExecution(new JobInstance(1L, jobParameters, job.getName()))); new JobExecution(new JobInstance(1L, jobParameters, job.getName())));
replay(jobRepository); replay(jobRepository);
@@ -189,6 +187,24 @@ public class SimpleJobLauncherTests {
jobLauncher.setJobRepository(jobRepository); jobLauncher.setJobRepository(jobRepository);
jobLauncher.afterPropertiesSet(); // no error jobLauncher.afterPropertiesSet(); // no error
} }
/**
* Same execution is used if the last found has PAUSED status.
*/
@Test
public void testResumePausedInstance() throws Exception {
long id = 9;
JobExecution jobExecution = new JobExecution(null, id);
jobExecution.setStatus(BatchStatus.PAUSED);
expect(jobRepository.getLastJobExecution(job.getName(), jobParameters)).andReturn(jobExecution);
replay(jobRepository);
jobLauncher.afterPropertiesSet();
JobExecution returned = jobLauncher.run(job, jobParameters);
assertEquals(jobExecution, returned);
verify(jobRepository);
}
private boolean contains(String str, String searchStr) { private boolean contains(String str, String searchStr) {
return str.indexOf(searchStr) != -1; return str.indexOf(searchStr) != -1;