OPEN - issue BATCH-773: Refactor and extend ExportedJobLauncher to JobOperator

Fill in a few methods in JobOperator (WIP)

spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java

@@ -19,10 +19,11 @@ package org.springframework.batch.core.job;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.batch.core.UnexpectedJobExecutionException;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParametersIncrementer;
 import org.springframework.batch.core.Step;
+import org.springframework.batch.core.UnexpectedJobExecutionException;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.util.ClassUtils;
 
@@ -88,7 +89,9 @@ public class JobSupport implements BeanNameAware, Job {
 		this.name = name;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.springframework.batch.core.domain.IJob#getName()
 	 */
 	public String getName() {
@@ -104,7 +107,9 @@ public class JobSupport implements BeanNameAware, Job {
 		this.steps.add(step);
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.springframework.batch.core.domain.IJob#getStartLimit()
 	 */
 	public int getStartLimit() {
@@ -119,21 +124,37 @@ public class JobSupport implements BeanNameAware, Job {
 		this.restartable = restartable;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.springframework.batch.core.domain.IJob#isRestartable()
 	 */
 	public boolean isRestartable() {
 		return restartable;
 	}
-	
-	/* (non-Javadoc)
-	 * @see org.springframework.batch.core.domain.Job#run(org.springframework.batch.core.domain.JobExecution)
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.batch.core.domain.Job#run(org.springframework.batch
+	 * .core.domain.JobExecution)
 	 */
 	public void execute(JobExecution execution) throws UnexpectedJobExecutionException {
-		throw new UnsupportedOperationException("JobSupport does not provide an implementation of run().  Use a smarter subclass.");
+		throw new UnsupportedOperationException(
+				"JobSupport does not provide an implementation of run().  Use a smarter subclass.");
 	}
 
 	public String toString() {
 		return ClassUtils.getShortName(getClass()) + ": [name=" + name + "]";
 	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.batch.core.Job#getJobParametersIncrementer()
+	 */
+	public JobParametersIncrementer getJobParametersIncrementer() {
+		return null;
+	}
 }

spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobParametersNotFoundExceptionTests.java

@@ -21,20 +21,20 @@ import org.springframework.batch.core.AbstractExceptionTests;
  * @author Dave Syer
  *
  */
-public class JobParametersIncrementerNotFoundExceptionTests extends AbstractExceptionTests {
+public class JobParametersNotFoundExceptionTests extends AbstractExceptionTests {
 
 	/* (non-Javadoc)
 	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String)
 	 */
 	public Exception getException(String msg) throws Exception {
-		return new JobParametersIncrementerNotFoundException(msg);
+		return new JobParametersNotFoundException(msg);
 	}
 
 	/* (non-Javadoc)
 	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable)
 	 */
 	public Exception getException(String msg, Throwable t) throws Exception {
-		return new JobParametersIncrementerNotFoundException(msg, t);
+		return new JobParametersNotFoundException(msg, t);
 	}
 
 }

spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java

@@ -0,0 +1,190 @@
+/*
+ * Copyright 2006-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.launch.support;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Collections;
+import java.util.Properties;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobInstance;
+import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.configuration.JobLocator;
+import org.springframework.batch.core.converter.DefaultJobParametersConverter;
+import org.springframework.batch.core.explore.BatchMetaDataExplorer;
+import org.springframework.batch.core.job.JobSupport;
+import org.springframework.batch.core.launch.JobInstanceAlreadyExistsException;
+import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.NoSuchJobException;
+import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
+import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
+import org.springframework.batch.core.repository.JobRestartException;
+
+/**
+ * @author Dave Syer
+ * 
+ */
+public class SimpleJobOperatorTests {
+
+	private SimpleJobOperator jobOperator;
+
+	protected Job job;
+
+	private BatchMetaDataExplorer batchMetaDataExplorer;
+
+	private JobParameters jobParameters;
+
+	/**
+	 * @throws Exception
+	 * 
+	 */
+	@Before
+	public void setUp() throws Exception {
+
+		job = new JobSupport("foo") {
+			@Override
+			public JobParametersIncrementer getJobParametersIncrementer() {
+				return new JobParametersIncrementer() {
+					public JobParameters getNext(JobParameters parameters) {
+						return jobParameters;
+					}
+				};
+			}
+		};
+		
+		jobOperator = new SimpleJobOperator();
+		
+		jobOperator.setJobLocator(new JobLocator() {
+			public Job getJob(String name) throws NoSuchJobException {
+				if (name.equals("foo")) {
+					return job;
+				}
+				throw new NoSuchJobException("foo");
+			}
+		});
+		
+		jobOperator.setJobLauncher(new JobLauncher() {
+			public JobExecution run(Job job, JobParameters jobParameters) throws JobExecutionAlreadyRunningException,
+					JobRestartException, JobInstanceAlreadyCompleteException {
+				return new JobExecution(new JobInstance(123L, jobParameters, job.getName()), 999L);
+			}
+		});
+		
+		batchMetaDataExplorer = EasyMock.createNiceMock(BatchMetaDataExplorer.class);
+		
+		jobOperator.setBatchMetaDataExplorer(batchMetaDataExplorer);
+
+		jobOperator.setJobParametersConverter(new DefaultJobParametersConverter() {
+			@Override
+			public JobParameters getJobParameters(Properties props) {
+				assertTrue("Wrong properties",props.containsKey("a"));
+				return jobParameters;
+			}
+		});
+
+		jobOperator.afterPropertiesSet();
+
+	}
+
+	@Test
+	public void testMandatoryProperties() throws Exception {
+		jobOperator = new SimpleJobOperator();
+		try {
+			jobOperator.afterPropertiesSet();
+			fail("Expected IllegalArgumentException");
+		}
+		catch (IllegalArgumentException e) {
+			// expected
+		}
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.springframework.batch.core.launch.support.SimpleJobOperator#startNextInstance(java.lang.String)}
+	 * .
+	 * @throws Exception
+	 */
+	@Test
+	public void testStartNextInstanceSunnyDay() throws Exception {
+		final JobParameters jobParameters = new JobParameters();
+		batchMetaDataExplorer.getLastJobInstances("foo", 1);
+		EasyMock.expectLastCall().andReturn(Collections.singletonList(new JobInstance(321L, jobParameters, "foo")));
+		EasyMock.replay(batchMetaDataExplorer);
+		Long value = jobOperator.startNextInstance("foo");
+		assertEquals(999, value.longValue());
+		EasyMock.verify(batchMetaDataExplorer);
+	}
+
+	@Test
+	public void testStartNewInstanceSunnyDay() throws Exception {
+		jobParameters = new JobParameters();
+		batchMetaDataExplorer.isJobInstanceExists("foo", jobParameters);
+		EasyMock.expectLastCall().andReturn(false);
+		EasyMock.replay(batchMetaDataExplorer);
+		Long value = jobOperator.start("foo", "a=b");
+		assertEquals(999, value.longValue());
+		EasyMock.verify(batchMetaDataExplorer);
+	}
+
+	@Test
+	public void testStartNewInstanceAlreadyExists() throws Exception {
+		jobParameters = new JobParameters();
+		batchMetaDataExplorer.isJobInstanceExists("foo", jobParameters);
+		EasyMock.expectLastCall().andReturn(true);
+		EasyMock.replay(batchMetaDataExplorer);
+		try {
+			jobOperator.start("foo", "a=b");
+			fail("Expected JobInstanceAlreadyExistsException");
+		}
+		catch (JobInstanceAlreadyExistsException e) {
+			// expected
+		}
+		EasyMock.verify(batchMetaDataExplorer);
+	}
+
+	@Test
+	public void testResumeSunnyDay() throws Exception {
+		jobParameters = new JobParameters();
+		batchMetaDataExplorer.getJobExecution(111L);
+		EasyMock.expectLastCall().andReturn(new JobExecution(new JobInstance(123L, jobParameters, job.getName()), 111L));
+		EasyMock.replay(batchMetaDataExplorer);
+		Long value = jobOperator.resume(111L);
+		assertEquals(999, value.longValue());
+		EasyMock.verify(batchMetaDataExplorer);
+	}
+
+	@Test
+	public void testGetSummarySunnyDay() throws Exception {
+		jobParameters = new JobParameters();
+		batchMetaDataExplorer.getJobExecution(111L);
+		JobExecution jobExecution = new JobExecution(new JobInstance(123L, jobParameters, job.getName()), 111L);
+		EasyMock.expectLastCall().andReturn(jobExecution);
+		EasyMock.replay(batchMetaDataExplorer);
+		String value = jobOperator.getSummary(111L);
+		assertEquals(jobExecution.toString(), value);
+		EasyMock.verify(batchMetaDataExplorer);
+	}
+
+
+}