* This implementation can run jobs asynchronously. Jobs are stopped by calling - * the stop method in the {@link JobExecutorFacade}, which is a graceful shutdown. + * the stop method in the {@link JobExecutorFacade}, which is a graceful + * shutdown. *
* * @see JobExecutorFacade @@ -99,10 +101,14 @@ public class TaskExecutorJobLauncher extends AbstractJobLauncher implements } /** - * Start the job using the task executor provided. + * Start the job using the task executor provided. An {@link Runnable} is + * passed in by the caller which we need to call in a finally block. * * @throws NoSuchJobConfigurationException * if a job configuration cannot be located. + * + * @see org.springframework.batch.execution.bootstrap.AbstractJobLauncher#doRun(org.springframework.batch.core.domain.JobIdentifier, + * java.lang.Runnable) */ protected ExitStatus doRun(final JobIdentifier jobIdentifier, final Runnable exitCallback) { @@ -118,17 +124,16 @@ public class TaskExecutorJobLauncher extends AbstractJobLauncher implements .publishEvent(new RepeatOperationsApplicationEvent( jobIdentifier, "No such job", RepeatOperationsApplicationEvent.ERROR)); - logger - .error( - "JobConfiguration could not be located inside Runnable for identifier: [" - + jobIdentifier + "]", e); + logger.error( + "JobConfiguration could not be located inside Runnable for identifier: [" + + jobIdentifier + "]", e); } finally { exitCallback.run(); } } }); - return ExitStatus.RUNNING; + return ExitStatus.UNKNOWN; } @@ -177,9 +182,9 @@ public class TaskExecutorJobLauncher extends AbstractJobLauncher implements * be out of date by the time this method is called, so it should be used * for information purposes only. * - * @return Properties representing the last {@link JobExecutionContext} - * objects passed up from the underlying execution. If there are no - * jobs running it will be empty. + * @return Properties representing the {@link JobExecution} objects passed + * up from the underlying execution. If there are no jobs running it + * will be empty. */ public Properties getStatistics() { if (jobExecutorFacade instanceof StatisticsProvider) { @@ -192,7 +197,8 @@ public class TaskExecutorJobLauncher extends AbstractJobLauncher implements /** * Publish the provided message to an external listener if there is one. * - * @param message the message to publish + * @param message + * the message to publish */ private void publish(String message) { if (notificationPublisher != null) { diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java b/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java index 238c4b53e..c17fd2b82 100644 --- a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java +++ b/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java @@ -218,7 +218,7 @@ public class BatchCommandLineLauncher { logger.fatal("Could not locate JobConfiguration \"" + jobName + "\"", e); status = new ExitStatus(false, - JobLauncher.NO_SUCH_JOB_CONFIGURATION); + ExitCodeMapper.NO_SUCH_JOB_CONFIGURATION); } catch (Throwable t) { logger.fatal(t); status = exceptionClassifier.classifyForExitCode(t); diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java b/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java index cb594b15c..8f92659b0 100644 --- a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java +++ b/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java @@ -16,6 +16,8 @@ public interface ExitCodeMapper { static int JVM_EXITCODE_COMPLETED = 0; static int JVM_EXITCODE_GENERIC_ERROR = 1; static int JVM_EXITCODE_JOB_CONFIGURATION_ERROR = 2; + public static final String NO_SUCH_JOB_CONFIGURATION = "NO_SUCH_JOB_CONFIGURATION"; + public static final String JOB_CONFIGURATION_NOT_PROVIDED = "JOB_CONFIGURATION_NOT_PROVIDED"; /** * Transform the exitcode known by the batchframework into an exitcode in the diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java b/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java index 59d2f42be..74c546625 100644 --- a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java +++ b/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java @@ -21,7 +21,6 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.execution.bootstrap.JobLauncher; import org.springframework.batch.repeat.ExitStatus; @@ -46,9 +45,9 @@ public class SimpleJvmExitCodeMapper implements ExitCodeMapper { new Integer(JVM_EXITCODE_COMPLETED)); mapping.put(ExitStatus.FAILED.getExitCode(), new Integer(JVM_EXITCODE_GENERIC_ERROR)); - mapping.put(JobLauncher.JOB_CONFIGURATION_NOT_PROVIDED, + mapping.put(ExitCodeMapper.JOB_CONFIGURATION_NOT_PROVIDED, new Integer(JVM_EXITCODE_JOB_CONFIGURATION_ERROR)); - mapping.put(JobLauncher.NO_SUCH_JOB_CONFIGURATION, + mapping.put(ExitCodeMapper.NO_SUCH_JOB_CONFIGURATION, new Integer(JVM_EXITCODE_JOB_CONFIGURATION_ERROR)); } diff --git a/execution/src/main/java/org/springframework/batch/execution/facade/JobExecutionListener.java b/execution/src/main/java/org/springframework/batch/execution/facade/JobExecutionListener.java new file mode 100644 index 000000000..87a6be06e --- /dev/null +++ b/execution/src/main/java/org/springframework/batch/execution/facade/JobExecutionListener.java @@ -0,0 +1,43 @@ +/* + * 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.execution.facade; + +import org.springframework.batch.core.domain.JobExecution; + +/** + * Listener interface for the job execution lifecycle. + * + * @author Dave Syer + * + */ +public interface JobExecutionListener { + + /** + * Callback for the start of a job, before any steps are processed. + * + * @param execution + * the current {@link JobExecution} + */ + void before(JobExecution execution); + + /** + * Callback for the start of a job, after all steps are processed, or on an + * error. + * + * @param execution + */ + void after(JobExecution execution); +} diff --git a/execution/src/main/java/org/springframework/batch/execution/facade/JobExecutorFacade.java b/execution/src/main/java/org/springframework/batch/execution/facade/JobExecutorFacade.java index 0e4c3020b..797f093fd 100644 --- a/execution/src/main/java/org/springframework/batch/execution/facade/JobExecutorFacade.java +++ b/execution/src/main/java/org/springframework/batch/execution/facade/JobExecutorFacade.java @@ -24,8 +24,7 @@ import org.springframework.batch.repeat.ExitStatus; * Interface which defines a facade for running jobs. The interface is * intentionally minimal, and depends only on simple java types, so that the * facade can be used to launch a job from basic environments like a command - * line or a JMX console. TODO: remove dependency on - * {@link JobIdentifier}? + * line or a JMX console. TODO: remove dependency on {@link JobIdentifier}? * * @author Lucas Ward * @author Dave Syer @@ -35,21 +34,25 @@ public interface JobExecutorFacade { /** * Start a job execution identifiable by the {@link JobIdentifier}. * Implementations normally require a job configuration to be locatable - * corresponding to the {@link JobIdentifier}, preferably matching - * them at least by name. - * @param runtimeInformation + * corresponding to the {@link JobIdentifier}, preferably matching them at + * least by name. + * + * @param jobIdentifier * * @throws NoSuchJobConfigurationException */ - ExitStatus start(JobIdentifier runtimeInformation) throws NoSuchJobConfigurationException; + ExitStatus start(JobIdentifier jobIdentifier) + throws NoSuchJobConfigurationException; /** * Stop the job execution that was started with this runtime information. - * @param runtimeInformation the {@link JobIdentifier}. - * @throws NoSuchJobExecutionException if a job with this runtime - * information is not running + * + * @param jobIdentifier + * the {@link JobIdentifier}. + * @throws NoSuchJobExecutionException + * if a job with this runtime information is not running */ - void stop(JobIdentifier runtimeInformation) throws NoSuchJobExecutionException; + void stop(JobIdentifier jobIdentifier) throws NoSuchJobExecutionException; /** * Simple check for whether or not there are jobs in progress. Can be used diff --git a/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java b/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java index dcf58e607..08ded6198 100644 --- a/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java +++ b/execution/src/main/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacade.java @@ -48,7 +48,8 @@ import org.springframework.util.Assert; * @author Dave Syer * */ -public class SimpleJobExecutorFacade implements JobExecutorFacade, StatisticsProvider { +public class SimpleJobExecutorFacade implements JobExecutorFacade, + JobExecutionListener, StatisticsProvider { private JobExecutor jobExecutor; @@ -81,18 +82,23 @@ public class SimpleJobExecutorFacade implements JobExecutorFacade, StatisticsPro /** * Setter for the job execution registry. The default should be adequate so * this setter method is mainly used for testing. - * @param jobExecutionRegistry the jobExecutionRegistry to set + * + * @param jobExecutionRegistry + * the jobExecutionRegistry to set */ - public void setJobExecutionRegistry(JobExecutionRegistry jobExecutionRegistry) { + public void setJobExecutionRegistry( + JobExecutionRegistry jobExecutionRegistry) { this.jobExecutionRegistry = jobExecutionRegistry; } /** * Setter for injection of {@link JobConfigurationLocator}. * - * @param jobConfigurationLocator the jobConfigurationLocator to set + * @param jobConfigurationLocator + * the jobConfigurationLocator to set */ - public void setJobConfigurationLocator(JobConfigurationLocator jobConfigurationLocator) { + public void setJobConfigurationLocator( + JobConfigurationLocator jobConfigurationLocator) { this.jobConfigurationLocator = jobConfigurationLocator; } @@ -101,67 +107,101 @@ public class SimpleJobExecutorFacade implements JobExecutorFacade, StatisticsPro * {@link JobIdentifier} and the {@link JobConfigurationLocator}. * * @see org.springframework.batch.execution.facade.JobExecutorFacade#start(org.springframework.batch.execution.common.domain.JobConfiguration, - * org.springframework.batch.core.domain.JobIdentifier) + * org.springframework.batch.core.domain.JobIdentifier) * - * @throws IllegalArgumentException if the {@link JobIdentifier} is null or - * its name is null - * @throws IllegalStateException if the {@link JobConfigurationLocator} does - * not contain a {@link JobConfiguration} with the name provided. - * @throws IllegalStateException if the {@link JobExecutor} is null - * @throws IllegalStateException if the {@link JobConfigurationLocator} is - * null + * @throws IllegalArgumentException + * if the {@link JobIdentifier} is null or its name is null + * @throws IllegalStateException + * if the {@link JobConfigurationLocator} does not contain a + * {@link JobConfiguration} with the name provided. + * @throws IllegalStateException + * if the {@link JobExecutor} is null + * @throws IllegalStateException + * if the {@link JobConfigurationLocator} is null * */ - public ExitStatus start(JobIdentifier jobIdentifier) throws NoSuchJobConfigurationException { + public ExitStatus start(JobIdentifier jobIdentifier) + throws NoSuchJobConfigurationException { Assert.notNull(jobIdentifier, "JobIdentifier must not be null."); - Assert.notNull(jobIdentifier.getName(), "JobIdentifier name must not be null."); + Assert.notNull(jobIdentifier.getName(), + "JobIdentifier name must not be null."); - Assert.state(!jobExecutionRegistry.isRegistered(jobIdentifier), - "A job with this JobRuntimeInformation is already executing in this container"); + Assert + .state(!jobExecutionRegistry.isRegistered(jobIdentifier), + "A job with this JobRuntimeInformation is already executing in this container"); Assert.state(jobExecutor != null, "JobExecutor must be provided."); - Assert.state(jobConfigurationLocator != null, "JobConfigurationLocator must be provided."); + Assert.state(jobConfigurationLocator != null, + "JobConfigurationLocator must be provided."); JobConfiguration jobConfiguration = jobConfigurationLocator .getJobConfiguration(jobIdentifier.getName()); - JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, jobIdentifier); + JobInstance job = jobRepository.findOrCreateJob(jobConfiguration, + jobIdentifier); JobExecution jobExecution = jobExecutionRegistry.register(job); - - ExitStatus exitStatus = ExitStatus.FAILED; + try { - synchronized (mutex) { - running++; - } - exitStatus = jobExecutor.run(jobConfiguration, jobExecution); - } - finally { - synchronized (mutex) { - // assume execution is synchronous so when we get to here we are - // not running any more - running--; - } - jobExecutionRegistry.unregister(jobIdentifier); + + this.before(jobExecution); + + jobExecutor.run(jobConfiguration, jobExecution); + + } finally { + + this.after(jobExecution); + } - return exitStatus; + return jobExecution.getExitStatus(); + } + + /** + * Internal accounting for the job execution. Callback at start of job. + * + * @param execution + */ + public void before(JobExecution execution) { + synchronized (mutex) { + running++; + } + } + + /** + * Internal accounting for the job execution. Callback at end of job. + * + * @param execution + */ + public void after(JobExecution execution) { + synchronized (mutex) { + // assume execution is synchronous so when we get to here we are + // not running any more + running--; + } + jobExecutionRegistry.unregister(execution.getJobIdentifier()); } /* * (non-Javadoc) + * * @see org.springframework.batch.container.BatchContainer#stop(org.springframework.batch.container.common.runtime.JobRuntimeInformation) */ - public void stop(JobIdentifier runtimeInformation) throws NoSuchJobExecutionException { - JobExecution jobExecutionContext = jobExecutionRegistry.get(runtimeInformation); + public void stop(JobIdentifier runtimeInformation) + throws NoSuchJobExecutionException { + JobExecution jobExecutionContext = jobExecutionRegistry + .get(runtimeInformation); if (jobExecutionContext == null) { - throw new NoSuchJobExecutionException("No such Job is executing: [" + runtimeInformation + "]"); + throw new NoSuchJobExecutionException("No such Job is executing: [" + + runtimeInformation + "]"); } - for (Iterator iter = jobExecutionContext.getStepContexts().iterator(); iter.hasNext();) { + for (Iterator iter = jobExecutionContext.getStepContexts().iterator(); iter + .hasNext();) { RepeatContext context = (RepeatContext) iter.next(); context.setTerminateOnly(); } - for (Iterator iter = jobExecutionContext.getChunkContexts().iterator(); iter.hasNext();) { + for (Iterator iter = jobExecutionContext.getChunkContexts().iterator(); iter + .hasNext();) { RepeatContext context = (RepeatContext) iter.next(); context.setTerminateOnly(); } @@ -191,20 +231,23 @@ public class SimpleJobExecutorFacade implements JobExecutorFacade, StatisticsPro public Properties getStatistics() { int i = 0; Properties props = new Properties(); - for (Iterator iter = jobExecutionRegistry.findAll().iterator(); iter.hasNext();) { + for (Iterator iter = jobExecutionRegistry.findAll().iterator(); iter + .hasNext();) { JobExecution element = (JobExecution) iter.next(); i++; String runtime = "job" + i; props.setProperty(runtime, "" + element.getJobIdentifier()); int j = 0; - for (Iterator iterator = element.getStepContexts().iterator(); iterator.hasNext();) { + for (Iterator iterator = element.getStepContexts().iterator(); iterator + .hasNext();) { RepeatContext context = (RepeatContext) iterator.next(); j++; props.setProperty(runtime + ".step" + j, "" + context); } j = 0; - for (Iterator iterator = element.getChunkContexts().iterator(); iterator.hasNext();) { + for (Iterator iterator = element.getChunkContexts().iterator(); iterator + .hasNext();) { RepeatContext context = (RepeatContext) iterator.next(); j++; props.setProperty(runtime + ".chunk" + j, "" + context); diff --git a/execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJobLauncherTests.java b/execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJobLauncherTests.java index 1dde4fd85..01d132d6a 100644 --- a/execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJobLauncherTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJobLauncherTests.java @@ -22,6 +22,7 @@ import org.springframework.batch.core.configuration.JobConfiguration; import org.springframework.batch.core.configuration.NoSuchJobConfigurationException; import org.springframework.batch.core.domain.JobIdentifier; import org.springframework.batch.core.runtime.SimpleJobIdentifierFactory; +import org.springframework.batch.execution.facade.JobExecutionListener; import org.springframework.batch.execution.facade.JobExecutorFacade; import org.springframework.batch.repeat.ExitStatus; import org.springframework.core.task.SimpleAsyncTaskExecutor; @@ -109,6 +110,7 @@ public class SimpleJobLauncherTests extends TestCase { } private class InterruptibleFacade implements JobExecutorFacade { + /* * (non-Javadoc) * @see org.springframework.batch.container.BatchContainer#run() @@ -126,13 +128,18 @@ public class SimpleJobLauncherTests extends TestCase { //return ExitStatus.FAILED; } - } public ExitStatus start(JobIdentifier runtimeInformation) { run(); return ExitStatus.FAILED; } + + public ExitStatus start(JobIdentifier jobIdentifier, + JobExecutionListener listener) + throws NoSuchJobConfigurationException { + throw new UnsupportedOperationException("Not implemented"); + } public void stop(JobIdentifier runtimeInformation) { // not needed diff --git a/execution/src/test/java/org/springframework/batch/execution/bootstrap/TaskExecutorJobLauncherTests.java b/execution/src/test/java/org/springframework/batch/execution/bootstrap/TaskExecutorJobLauncherTests.java index 9835db96e..de16c3b52 100644 --- a/execution/src/test/java/org/springframework/batch/execution/bootstrap/TaskExecutorJobLauncherTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/bootstrap/TaskExecutorJobLauncherTests.java @@ -30,6 +30,7 @@ import org.springframework.batch.core.configuration.NoSuchJobConfigurationExcept import org.springframework.batch.core.domain.JobIdentifier; import org.springframework.batch.core.runtime.SimpleJobIdentifier; import org.springframework.batch.core.runtime.SimpleJobIdentifierFactory; +import org.springframework.batch.execution.facade.JobExecutionListener; import org.springframework.batch.execution.facade.JobExecutorFacade; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.interceptor.RepeatOperationsApplicationEvent; @@ -148,12 +149,18 @@ public class TaskExecutorJobLauncherTests extends TestCase { } } } + + public ExitStatus start(JobIdentifier jobIdentifier, + JobExecutionListener listener) + throws NoSuchJobConfigurationException { + throw new UnsupportedOperationException("Not implemented"); + } public ExitStatus start(JobIdentifier runtimeInformation) { start(); return ExitStatus.FAILED; } - + public void stop(JobIdentifier runtimeInformation) { running = false; } diff --git a/execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java b/execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java index f8ff2f578..60e35fd38 100644 --- a/execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java @@ -21,7 +21,6 @@ import java.util.Map; import junit.framework.TestCase; -import org.springframework.batch.execution.bootstrap.JobLauncher; import org.springframework.batch.repeat.ExitStatus; public class SimpleJvmExitCodeMapperTests extends TestCase { @@ -39,8 +38,8 @@ public class SimpleJvmExitCodeMapperTests extends TestCase { Map ecm2Map = new HashMap(); ecm2Map.put(ExitStatus.FINISHED.getExitCode(), new Integer(-1)); ecm2Map.put(ExitStatus.FAILED.getExitCode(), new Integer(-2)); - ecm2Map.put(JobLauncher.JOB_CONFIGURATION_NOT_PROVIDED, new Integer(-3)); - ecm2Map.put(JobLauncher.NO_SUCH_JOB_CONFIGURATION, new Integer(-3)); + ecm2Map.put(ExitCodeMapper.JOB_CONFIGURATION_NOT_PROVIDED, new Integer(-3)); + ecm2Map.put(ExitCodeMapper.NO_SUCH_JOB_CONFIGURATION, new Integer(-3)); ecm2.setMapping(ecm2Map); } @@ -56,10 +55,10 @@ public class SimpleJvmExitCodeMapperTests extends TestCase { ecm.getExitCode(ExitStatus.FAILED.getExitCode()), ExitCodeMapper.JVM_EXITCODE_GENERIC_ERROR); assertEquals( - ecm.getExitCode(JobLauncher.JOB_CONFIGURATION_NOT_PROVIDED), + ecm.getExitCode(ExitCodeMapper.JOB_CONFIGURATION_NOT_PROVIDED), ExitCodeMapper.JVM_EXITCODE_JOB_CONFIGURATION_ERROR); assertEquals( - ecm.getExitCode(JobLauncher.NO_SUCH_JOB_CONFIGURATION), + ecm.getExitCode(ExitCodeMapper.NO_SUCH_JOB_CONFIGURATION), ExitCodeMapper.JVM_EXITCODE_JOB_CONFIGURATION_ERROR); } @@ -70,9 +69,9 @@ public class SimpleJvmExitCodeMapperTests extends TestCase { assertEquals( ecm2.getExitCode(ExitStatus.FAILED.getExitCode()), -2); assertEquals( - ecm2.getExitCode(JobLauncher.JOB_CONFIGURATION_NOT_PROVIDED), -3); + ecm2.getExitCode(ExitCodeMapper.JOB_CONFIGURATION_NOT_PROVIDED), -3); assertEquals( - ecm2.getExitCode(JobLauncher.NO_SUCH_JOB_CONFIGURATION), -3); + ecm2.getExitCode(ExitCodeMapper.NO_SUCH_JOB_CONFIGURATION), -3); } public void testGetExitCodeWithCustomCode() { diff --git a/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacaderTests.java b/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacadeTests.java similarity index 77% rename from execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacaderTests.java rename to execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacadeTests.java index 0da37fbca..913093c37 100644 --- a/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacaderTests.java +++ b/execution/src/test/java/org/springframework/batch/execution/facade/SimpleJobExecutorFacadeTests.java @@ -44,9 +44,9 @@ import org.springframework.batch.repeat.context.RepeatContextSupport; * @author Lucas Ward * @author Dave Syer */ -public class SimpleJobExecutorFacaderTests extends TestCase { +public class SimpleJobExecutorFacadeTests extends TestCase { - SimpleJobExecutorFacade simpleContainer = new SimpleJobExecutorFacade(); + SimpleJobExecutorFacade jobExecutorFacade = new SimpleJobExecutorFacade(); JobExecutor jobExecutor; @@ -68,41 +68,50 @@ public class SimpleJobExecutorFacaderTests extends TestCase { super.setUp(); jobConfiguration.setName("TestJob"); - jobExecutor = (JobExecutor) jobLifecycleControl.getMock(); - simpleContainer.setJobExecutor(jobExecutor); + jobExecutorFacade.setJobExecutor(jobExecutor); jobRepository = (JobRepository) jobRepositoryControl.getMock(); - simpleContainer.setJobRepository(jobRepository); + jobExecutorFacade.setJobRepository(jobRepository); } public void testNormalStart() throws Exception { - final SimpleJobIdentifier jobRuntimeInformation = new SimpleJobIdentifier("bar"); - jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation); + JobInstance job = setUpFacadeForNormalStart(); + jobExecutorFacade.start(jobIdentifier); + assertEquals(job, jobExecution.getJob()); + assertEquals("bar", job.getName()); + jobRepositoryControl.verify(); + + } + + private JobInstance setUpFacadeForNormalStart() { + jobIdentifier = new SimpleJobIdentifier("bar"); + jobRepository.findOrCreateJob(jobConfiguration, jobIdentifier); jobExecutor = new JobExecutor() { public ExitStatus run(JobConfiguration configuration, JobExecution jobExecutionContext) throws BatchCriticalException { + jobExecution = jobExecutionContext; return ExitStatus.FINISHED; } }; - JobInstance job = new JobInstance(jobRuntimeInformation); - JobExecution jobExecutionContext = new JobExecution(job); + jobExecutorFacade.setJobExecutor(jobExecutor); + JobInstance job = new JobInstance(jobIdentifier); jobRepositoryControl.setReturnValue(job); - jobExecutor.run(jobConfiguration, jobExecutionContext); jobRepositoryControl.replay(); - simpleContainer.setJobConfigurationLocator(new JobConfigurationLocator() { + jobExecutorFacade.setJobConfigurationLocator(new JobConfigurationLocator() { public JobConfiguration getJobConfiguration(String name) throws NoSuchJobConfigurationException { return jobConfiguration; } }); - simpleContainer.start(jobRuntimeInformation); - assertEquals(job, jobExecutionContext.getJob()); - assertEquals("bar", job.getName()); - jobRepositoryControl.verify(); + return job; } - + private volatile boolean running = false; + + private JobExecution jobExecution; + + private SimpleJobIdentifier jobIdentifier; public void testIsRunning() throws Exception { - simpleContainer.setJobExecutor(new JobExecutor() { + jobExecutorFacade.setJobExecutor(new JobExecutor() { public ExitStatus run(JobConfiguration configuration, JobExecution jobExecutionContext) throws BatchCriticalException { while (running) { @@ -119,14 +128,14 @@ public class SimpleJobExecutorFacaderTests extends TestCase { return ExitStatus.FINISHED; } }); - simpleContainer.setJobConfigurationLocator(new JobConfigurationLocator() { + jobExecutorFacade.setJobConfigurationLocator(new JobConfigurationLocator() { public JobConfiguration getJobConfiguration(String name) throws NoSuchJobConfigurationException { return jobConfiguration; } }); - final SimpleJobIdentifier jobRuntimeInformation = new SimpleJobIdentifier("foo"); - jobRepository.findOrCreateJob(jobConfiguration, jobRuntimeInformation); - JobInstance job = new JobInstance(jobRuntimeInformation); + final SimpleJobIdentifier jobIdentifier = new SimpleJobIdentifier("foo"); + jobRepository.findOrCreateJob(jobConfiguration, jobIdentifier); + JobInstance job = new JobInstance(jobIdentifier); jobRepositoryControl.setReturnValue(job); jobRepositoryControl.replay(); @@ -134,7 +143,7 @@ public class SimpleJobExecutorFacaderTests extends TestCase { new Thread(new Runnable() { public void run() { try { - simpleContainer.start(jobRuntimeInformation); + jobExecutorFacade.start(jobIdentifier); } catch (NoSuchJobConfigurationException e) { System.err.println("Shouldn't happen"); @@ -143,22 +152,22 @@ public class SimpleJobExecutorFacaderTests extends TestCase { }).start(); // Give Thread time to start Thread.sleep(100L); - assertTrue(simpleContainer.isRunning()); + assertTrue(jobExecutorFacade.isRunning()); running = false; int count = 0; - while(simpleContainer.isRunning() && count ++<5) { + while(jobExecutorFacade.isRunning() && count ++<5) { Thread.sleep(100L); } - assertFalse(simpleContainer.isRunning()); + assertFalse(jobExecutorFacade.isRunning()); jobRepositoryControl.verify(); } public void testInvalidState() throws Exception { - simpleContainer.setJobExecutor(null); + jobExecutorFacade.setJobExecutor(null); try { - simpleContainer.start(new SimpleJobIdentifier("TestJob")); + jobExecutorFacade.start(new SimpleJobIdentifier("TestJob")); fail("Expected IllegalStateException"); } catch (IllegalStateException ex) { @@ -169,12 +178,12 @@ public class SimpleJobExecutorFacaderTests extends TestCase { public void testStopWithNoJob() throws Exception { MockControl control = MockControl.createControl(JobExecutionRegistry.class); JobExecutionRegistry jobExecutionRegistry = (JobExecutionRegistry) control.getMock(); - simpleContainer.setJobExecutionRegistry(jobExecutionRegistry); + jobExecutorFacade.setJobExecutionRegistry(jobExecutionRegistry); SimpleJobIdentifier runtimeInformation = new SimpleJobIdentifier("TestJob"); control.expectAndReturn(jobExecutionRegistry.get(runtimeInformation), null); control.replay(); try { - simpleContainer.stop(runtimeInformation); + jobExecutorFacade.stop(runtimeInformation); fail("Expected NoSuchJobExecutionException"); } catch (NoSuchJobExecutionException e) { // expected @@ -185,7 +194,7 @@ public class SimpleJobExecutorFacaderTests extends TestCase { public void testStop() throws Exception { JobExecutionRegistry jobExecutionRegistry = new VolatileJobExecutionRegistry(); - simpleContainer.setJobExecutionRegistry(jobExecutionRegistry); + jobExecutorFacade.setJobExecutionRegistry(jobExecutionRegistry); SimpleJobIdentifier runtimeInformation = new SimpleJobIdentifier("TestJob"); JobExecution context = jobExecutionRegistry.register(new JobInstance(runtimeInformation, new Long(0))); @@ -193,7 +202,7 @@ public class SimpleJobExecutorFacaderTests extends TestCase { RepeatContextSupport chunkContext = new RepeatContextSupport(stepContext); context.registerStepContext(stepContext); context.registerChunkContext(chunkContext); - simpleContainer.stop(runtimeInformation); + jobExecutorFacade.stop(runtimeInformation); // It is only unregistered when the start method finishes, and it hasn't // been called. @@ -204,20 +213,20 @@ public class SimpleJobExecutorFacaderTests extends TestCase { } public void testStatisticsWithNoContext() throws Exception { - assertNotNull(simpleContainer.getStatistics()); + assertNotNull(jobExecutorFacade.getStatistics()); } public void testStatisticsWithContext() throws Exception { MockControl control = MockControl.createControl(JobExecutionRegistry.class); JobExecutionRegistry jobExecutionRegistry = (JobExecutionRegistry) control.getMock(); - simpleContainer.setJobExecutionRegistry(jobExecutionRegistry); + jobExecutorFacade.setJobExecutionRegistry(jobExecutionRegistry); SimpleJobIdentifier runtimeInformation = new SimpleJobIdentifier("TestJob"); JobExecution jobExecutionContext = new JobExecution(new JobInstance(runtimeInformation, new Long(0))); jobExecutionContext.registerStepContext(new RepeatContextSupport(null)); jobExecutionContext.registerChunkContext(new RepeatContextSupport(null)); control.expectAndReturn(jobExecutionRegistry.findAll(), Collections.singleton(jobExecutionContext)); control.replay(); - Properties statistics = simpleContainer.getStatistics(); + Properties statistics = jobExecutorFacade.getStatistics(); assertNotNull(statistics); assertTrue(statistics.containsKey("job1.step1")); control.verify();