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

RESOLVED - issue BATCH-398: That old stateful / stateless thing again....

Browse Source 
http://jira.springframework.org/browse/BATCH-398

Fix JMX demo using an application context per job execution.
This commit is contained in:
dsyer
2008-03-01 09:59:01 +00:00
parent f2129d4ea7
commit 0eb239c9cb
9 changed files with 263 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java
View File

@@ -45,7 +45,7 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, Initiali
// It doesn't make sense for this to have a default value...
private JobRegistry jobConfigurationRegistry = null;
private Collection jobConfigurations = new HashSet();
private Collection jobNames = new HashSet();
/**
* Injection setter for {@link JobRegistry}.
@@ -71,11 +71,11 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, Initiali
* @see org.springframework.beans.factory.DisposableBean#destroy()
*/
public void destroy() throws Exception {
for (Iterator iter = jobConfigurations.iterator(); iter.hasNext();) {
Job jobConfiguration = (Job) iter.next();
jobConfigurationRegistry.unregister(jobConfiguration);
for (Iterator iter = jobNames.iterator(); iter.hasNext();) {
String name = (String) iter.next();
jobConfigurationRegistry.unregister(name);
}
jobConfigurations.clear();
jobNames.clear();
}
/**
@@ -88,10 +88,10 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, Initiali
*/
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
if (bean instanceof Job) {
Job jobConfiguration = (Job) bean;
Job job = (Job) bean;
try {
jobConfigurationRegistry.register(jobConfiguration);
jobConfigurations.add(jobConfiguration);
jobConfigurationRegistry.register(new ReferenceJobFactory(job));
jobNames.add(job.getName());
}
catch (DuplicateJobException e) {
throw new FatalBeanException("Cannot register job configuration", e);

28
spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java
View File

@@ -23,14 +23,15 @@ import java.util.Map;
import org.springframework.batch.core.domain.Job;
import org.springframework.batch.core.repository.DuplicateJobException;
import org.springframework.batch.core.repository.JobFactory;
import org.springframework.batch.core.repository.JobRegistry;
import org.springframework.batch.core.repository.ListableJobRegistry;
import org.springframework.batch.core.repository.NoSuchJobException;
import org.springframework.util.Assert;
/**
* Simple map-based implementation of {@link JobRegistry}. Access
* to the map is synchronized, guarded by an internal lock.
* Simple map-based implementation of {@link JobRegistry}. Access to the map is
* synchronized, guarded by an internal lock.
*
* @author Dave Syer
*
@@ -43,17 +44,16 @@ public class MapJobRegistry implements ListableJobRegistry {
* (non-Javadoc)
* @see org.springframework.batch.container.common.configuration.JobConfigurationRegistry#registerJobConfiguration(org.springframework.batch.container.common.configuration.JobConfiguration)
*/
public void register(Job jobConfiguration) throws DuplicateJobException {
Assert.notNull(jobConfiguration);
String name = jobConfiguration.getName();
public void register(JobFactory jobFactory) throws DuplicateJobException {
Assert.notNull(jobFactory);
String name = jobFactory.getJobName();
Assert.notNull(name, "Job configuration must have a name.");
synchronized (map) {
if (map.containsKey(name) && jobConfiguration.equals(map.get(name))) {
if (map.containsKey(name)) {
throw new DuplicateJobException("A job configuration with this name [" + name
+ "] was already registered");
}
// allow replacing job configuration with new instance
map.put(name, jobConfiguration);
map.put(name, jobFactory);
}
}
@@ -61,8 +61,7 @@ public class MapJobRegistry implements ListableJobRegistry {
* (non-Javadoc)
* @see org.springframework.batch.container.common.configuration.JobConfigurationRegistry#unregister(org.springframework.batch.container.common.configuration.JobConfiguration)
*/
public void unregister(Job jobConfiguration) {
String name = jobConfiguration.getName();
public void unregister(String name) {
Assert.notNull(name, "Job configuration must have a name.");
synchronized (map) {
map.remove(name);
@@ -77,15 +76,14 @@ public class MapJobRegistry implements ListableJobRegistry {
public Job getJob(String name) throws NoSuchJobException {
synchronized (map) {
if (!map.containsKey(name)) {
throw new NoSuchJobException("No job configuration with the name [" + name
+ "] was registered");
throw new NoSuchJobException("No job configuration with the name [" + name + "] was registered");
}
return (Job) map.get(name);
return (Job) ((JobFactory) map.get(name)).createJob();
}
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.springframework.batch.container.common.configuration.ListableJobConfigurationRegistry#getJobConfigurations()
*/
public Collection getJobNames() {

61
spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java Normal file
View File

@@ -0,0 +1,61 @@
/*
* 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.configuration;
import org.springframework.batch.core.domain.Job;
import org.springframework.batch.core.repository.JobFactory;
/**
* A {@link JobFactory} that just keeps a reference to a {@link Job}. It never
* modifies its {@link Job}.
*
* @author Dave Syer
*
*/
public class ReferenceJobFactory implements JobFactory {
private Job job;
private String name;
/**
* @param job the {@link Job} to return from {@link #createJob()}.
*/
public ReferenceJobFactory(Job job) {
super();
this.job = job;
this.name = job.getName();
}
/**
* Just return the instance passed in on initialization.
*
* @see org.springframework.batch.core.repository.JobFactory#createJob()
*/
public Job createJob() {
return job;
}
/**
* Returns the job name as passed in on initialization.
*
* @see org.springframework.batch.core.repository.JobFactory#getJobName()
*/
public String getJobName() {
return name;
}
}

13
spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleExportedJobLauncherTests.java
View File

@@ -29,6 +29,7 @@ import org.springframework.batch.core.domain.StepExecution;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.runtime.JobParametersFactory;
import org.springframework.batch.execution.configuration.MapJobRegistry;
import org.springframework.batch.execution.configuration.ReferenceJobFactory;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.launch.JobLauncher;
import org.springframework.batch.execution.step.StepSupport;
@@ -117,7 +118,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
* @throws Exception
*/
public void testGetStatisticsWithContent() throws Exception {
jobLocator.register(new JobSupport("foo"));
jobLocator.register(new ReferenceJobFactory(new JobSupport("foo")));
launcher.run("foo");
Properties props = launcher.getStatistics();
assertNotNull(props);
@@ -130,7 +131,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
* @throws Exception
*/
public void testIsRunning() throws Exception {
jobLocator.register(new JobSupport("foo"));
jobLocator.register(new ReferenceJobFactory(new JobSupport("foo")));
launcher.run("foo");
assertTrue(launcher.isRunning());
}
@@ -141,7 +142,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
* @throws Exception
*/
public void testAlreadyRunning() throws Exception {
jobLocator.register(new JobSupport("foo"));
jobLocator.register(new ReferenceJobFactory(new JobSupport("foo")));
launcher.setLauncher(new JobLauncher() {
public JobExecution run(Job job, JobParameters jobParameters) throws JobExecutionAlreadyRunningException {
throw new JobExecutionAlreadyRunningException("Bad!");
@@ -166,7 +167,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
* @throws Exception
*/
public void testRunJobWithParameters() throws Exception {
jobLocator.register(new JobSupport("foo"));
jobLocator.register(new ReferenceJobFactory(new JobSupport("foo")));
String value = launcher.run("foo", "bar=spam,bucket=crap");
assertTrue(launcher.isRunning());
assertTrue("Return value was not a JobExecution: " + value, value.contains("JobExecution"));
@@ -178,7 +179,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
* @throws Exception
*/
public void testRunJobWithParametersAndFactory() throws Exception {
jobLocator.register(new JobSupport("foo"));
jobLocator.register(new ReferenceJobFactory(new JobSupport("foo")));
launcher.setJobParametersFactory(new JobParametersFactory() {
public JobParameters getJobParameters(Properties properties) {
return new JobParametersBuilder().addString("foo", "spam").toJobParameters();
@@ -198,7 +199,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
* @throws Exception
*/
public void testStop() throws Exception {
jobLocator.register(new JobSupport("foo"));
jobLocator.register(new ReferenceJobFactory(new JobSupport("foo")));
launcher.run("foo");
assertTrue(launcher.isRunning());
launcher.stop();

31
spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java
View File

@@ -19,10 +19,9 @@ import java.util.Collection;
import junit.framework.TestCase;
import org.springframework.batch.core.domain.Job;
import org.springframework.batch.core.repository.DuplicateJobException;
import org.springframework.batch.core.repository.JobFactory;
import org.springframework.batch.core.repository.NoSuchJobException;
import org.springframework.batch.execution.configuration.MapJobRegistry;
import org.springframework.batch.execution.job.JobSupport;
/**
@@ -34,13 +33,13 @@ public class MapJobRegistryTests extends TestCase {
private MapJobRegistry registry = new MapJobRegistry();
/**
* Test method for {@link org.springframework.batch.execution.configuration.MapJobRegistry#unregister(org.springframework.batch.execution.job.JobSupport)}.
* Test method for {@link org.springframework.batch.execution.configuration.MapJobRegistry#unregister(String)}.
* @throws Exception
*/
public void testUnregister() throws Exception {
registry.register(new JobSupport("foo"));
registry.register(new ReferenceJobFactory(new JobSupport("foo")));
assertNotNull(registry.getJob("foo"));
registry.unregister(new JobSupport("foo"));
registry.unregister("foo");
try {
assertNull(registry.getJob("foo"));
fail("Expected NoSuchJobConfigurationException");
@@ -55,12 +54,12 @@ public class MapJobRegistryTests extends TestCase {
* Test method for {@link org.springframework.batch.execution.configuration.MapJobRegistry#getJob(java.lang.String)}.
*/
public void testReplaceDuplicateConfiguration() throws Exception {
registry.register(new JobSupport("foo"));
registry.register(new ReferenceJobFactory(new JobSupport("foo")));
try {
registry.register(new JobSupport("foo"));
registry.register(new ReferenceJobFactory(new JobSupport("foo")));
fail("Expected DuplicateJobConfigurationException");
} catch (DuplicateJobException e) {
fail("Unexpected DuplicateJobConfigurationException");
// expected
// unexpected: even if the job is different we want a DuplicateJobException
assertTrue(e.getMessage().indexOf("foo")>=0);
}
}
@@ -69,10 +68,10 @@ public class MapJobRegistryTests extends TestCase {
* Test method for {@link org.springframework.batch.execution.configuration.MapJobRegistry#getJob(java.lang.String)}.
*/
public void testRealDuplicateConfiguration() throws Exception {
Job jobConfiguration = new JobSupport("foo");
registry.register(jobConfiguration);
JobFactory jobFactory = new ReferenceJobFactory(new JobSupport("foo"));
registry.register(jobFactory);
try {
registry.register(jobConfiguration);
registry.register(jobFactory);
fail("Unexpected DuplicateJobConfigurationException");
} catch (DuplicateJobException e) {
// expected
@@ -85,12 +84,12 @@ public class MapJobRegistryTests extends TestCase {
* @throws Exception
*/
public void testGetJobConfigurations() throws Exception {
Job configuration = new JobSupport("foo");
registry.register(configuration);
registry.register(new JobSupport("bar"));
JobFactory jobFactory = new ReferenceJobFactory(new JobSupport("foo"));
registry.register(jobFactory);
registry.register(new ReferenceJobFactory(new JobSupport("bar")));
Collection configurations = registry.getJobNames();
assertEquals(2, configurations.size());
assertTrue(configurations.contains(configuration.getName()));
assertTrue(configurations.contains(jobFactory.getJobName()));
}
}