Make the meaning of running status consistent

- A running status is STARTING, STARTED, or STOPPING.
- Update related tests.

 Resolves spring-projects#1483

Author: lcmarvin

spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java

@@ -84,10 +84,10 @@ public static BatchStatus max(BatchStatus status1, BatchStatus status2) {
 
 	/**
 	 * Convenience method to decide if a status indicates that work is in progress.
-	 * @return true if the status is STARTING, STARTED
+	 * @return true if the status is STARTING, STARTED, STOPPING
 	 */
 	public boolean isRunning() {
-		return this == STARTING || this == STARTED;
+		return this == STARTING || this == STARTED || this == STOPPING;
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java

@@ -256,10 +256,10 @@ public StepExecution createStepExecution(String stepName) {
 	/**
 	 * Test if this {@link JobExecution} indicates that it is running. Note that this does
 	 * not necessarily mean that it has been persisted.
-	 * @return {@code true} if the end time is null and the start time is not null.
+	 * @return {@code true} if the status is one of the running status.
 	 */
 	public boolean isRunning() {
-		return startTime != null && endTime == null;
+		return status.isRunning();
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobLauncher.java

@@ -106,7 +106,7 @@ public JobExecution run(final Job job, final JobParameters jobParameters)
 			 */
 			for (StepExecution execution : lastExecution.getStepExecutions()) {
 				BatchStatus status = execution.getStatus();
-				if (status.isRunning() || status == BatchStatus.STOPPING) {
+				if (status.isRunning()) {
 					throw new JobExecutionAlreadyRunningException(
 							"A job execution for this job is already running: " + lastExecution);
 				}

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java

@@ -84,7 +84,7 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements
 			+ " from %PREFIX%JOB_EXECUTION where JOB_EXECUTION_ID = ?";
 
 	private static final String GET_RUNNING_EXECUTIONS = "SELECT E.JOB_EXECUTION_ID, E.START_TIME, E.END_TIME, E.STATUS, E.EXIT_CODE, E.EXIT_MESSAGE, E.CREATE_TIME, E.LAST_UPDATED, E.VERSION, "
-			+ "E.JOB_INSTANCE_ID from %PREFIX%JOB_EXECUTION E, %PREFIX%JOB_INSTANCE I where E.JOB_INSTANCE_ID=I.JOB_INSTANCE_ID and I.JOB_NAME=? and E.START_TIME is not NULL and E.END_TIME is NULL order by E.JOB_EXECUTION_ID desc";
+			+ "E.JOB_INSTANCE_ID from %PREFIX%JOB_EXECUTION E, %PREFIX%JOB_INSTANCE I where E.JOB_INSTANCE_ID=I.JOB_INSTANCE_ID and I.JOB_NAME=? and E.STATUS in ('STARTING', 'STARTED', 'STOPPING') order by E.JOB_EXECUTION_ID desc";
 
 	private static final String CURRENT_VERSION_JOB_EXECUTION = "SELECT VERSION FROM %PREFIX%JOB_EXECUTION WHERE JOB_EXECUTION_ID=?";
 

spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java

@@ -121,7 +121,7 @@ public JobExecution createJobExecution(String jobName, JobParameters jobParamete
 
 			// check for running executions and find the last started
 			for (JobExecution execution : executions) {
-				if (execution.isRunning() || execution.isStopping()) {
+				if (execution.isRunning()) {
 					throw new JobExecutionAlreadyRunningException(
 							"A job execution for this job is already running: " + jobInstance);
 				}

spring-batch-core/src/test/java/org/springframework/batch/core/BatchStatusTests.java

@@ -72,6 +72,7 @@ public void testIsRunning() {
 		assertFalse(BatchStatus.COMPLETED.isRunning());
 		assertTrue(BatchStatus.STARTED.isRunning());
 		assertTrue(BatchStatus.STARTING.isRunning());
+		assertTrue(BatchStatus.STOPPING.isRunning());
 	}
 
 	@Test

spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionTests.java

@@ -54,13 +54,19 @@ public void testGetEndTime() {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.core.JobExecution#getEndTime()}.
+	 * Test method for {@link org.springframework.batch.core.JobExecution#isRunning()}.
 	 */
 	@Test
 	public void testIsRunning() {
-		execution.setStartTime(new Date());
+		execution.setStatus(BatchStatus.STARTING);
 		assertTrue(execution.isRunning());
-		execution.setEndTime(new Date(100L));
+		execution.setStatus(BatchStatus.STARTED);
+		assertTrue(execution.isRunning());
+		execution.setStatus(BatchStatus.STOPPING);
+		assertTrue(execution.isRunning());
+		execution.setStatus(BatchStatus.COMPLETED);
+		assertFalse(execution.isRunning());
+		execution.setStatus(BatchStatus.FAILED);
 		assertFalse(execution.isRunning());
 	}
 

spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java

@@ -201,6 +201,7 @@ public void testFindRunningExecutions() {
 		exec.setCreateTime(new Date(0));
 		exec.setStartTime(new Date(1L));
 		exec.setEndTime(new Date(2L));
+		exec.setStatus(BatchStatus.COMPLETED);
 		exec.setLastUpdated(new Date(5L));
 		dao.saveJobExecution(exec);
 
@@ -212,9 +213,17 @@ public void testFindRunningExecutions() {
 		exec.setLastUpdated(new Date(5L));
 		dao.saveJobExecution(exec);
 
+		// Stopping JobExecution as status is STOPPING
+		exec = new JobExecution(jobInstance, jobParameters);
+		exec.setStartTime(new Date(3L));
+		exec.setStatus(BatchStatus.STOPPING);
+		exec.setLastUpdated(new Date(5L));
+		dao.saveJobExecution(exec);
+
 		// Running JobExecution as StartTime is populated but EndTime is null
 		exec = new JobExecution(jobInstance, jobParameters);
 		exec.setStartTime(new Date(2L));
+		exec.setStatus(BatchStatus.STARTED);
 		exec.setLastUpdated(new Date(5L));
 		exec.createStepExecution("step");
 		dao.saveJobExecution(exec);
@@ -228,7 +237,7 @@ public void testFindRunningExecutions() {
 
 		Set<JobExecution> values = dao.findRunningJobExecutions(exec.getJobInstance().getJobName());
 
-		assertEquals(1, values.size());
+		assertEquals(3, values.size());
 		JobExecution value = values.iterator().next();
 		assertEquals(exec, value);
 		assertEquals(5L, value.getLastUpdated().getTime());

spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java

@@ -79,6 +79,7 @@ public void testCreateAndFind() throws Exception {
 		assertEquals(job.getName(), firstExecution.getJobInstance().getJobName());
 
 		jobRepository.update(firstExecution);
+		firstExecution.setStatus(BatchStatus.FAILED);
 		firstExecution.setEndTime(new Date());
 		jobRepository.update(firstExecution);
 		JobExecution secondExecution = jobRepository.createJobExecution(job.getName(), jobParams);
@@ -99,6 +100,7 @@ public void testCreateAndFindWithNoStartDate() throws Exception {
 		JobExecution firstExecution = jobRepository.createJobExecution(job.getName(), jobParameters);
 		firstExecution.setStartTime(new Date(0));
 		firstExecution.setEndTime(new Date(1));
+		firstExecution.setStatus(BatchStatus.COMPLETED);
 		jobRepository.update(firstExecution);
 		JobExecution secondExecution = jobRepository.createJobExecution(job.getName(), jobParameters);
 
@@ -231,4 +233,49 @@ public void testReExecuteWithSameJobParameters() throws Exception {
 		assertNotNull(jobExecution2);
 	}
 
+	/*
+	 * When a job execution is running, JobExecutionAlreadyRunningException should be thrown
+	 * if trying to create any other ones with same job parameters.
+	 */
+	@Transactional
+	@Test
+	public void testReExecuteWithSameJobParametersWhenRunning() throws Exception {
+		JobParameters jobParameters = new JobParametersBuilder()
+				.addString("stringKey", "stringValue")
+				.toJobParameters();
+
+		// jobExecution1 with status STARTING
+		JobExecution jobExecution1 = jobRepository.createJobExecution(job.getName(), jobParameters);
+		try {
+			jobRepository.createJobExecution(job.getName(), jobParameters);
+			fail();
+		}
+		catch (JobExecutionAlreadyRunningException e) {
+			// expected
+		}
+
+		// jobExecution1 with status STARTED
+		jobExecution1.setStatus(BatchStatus.STARTED);
+		jobExecution1.setStartTime(new Date());
+		jobRepository.update(jobExecution1);
+		try {
+			jobRepository.createJobExecution(job.getName(), jobParameters);
+			fail();
+		}
+		catch (JobExecutionAlreadyRunningException e) {
+			// expected
+		}
+
+		// jobExecution1 with status STOPPING
+		jobExecution1.setStatus(BatchStatus.STOPPING);
+		jobRepository.update(jobExecution1);
+		try {
+			jobRepository.createJobExecution(job.getName(), jobParameters);
+			fail();
+		}
+		catch (JobExecutionAlreadyRunningException e) {
+			// expected
+		}
+	}
+
 }