BATCH-1154:

- Created StepFactoryBean, as a "master" factory that holds all the properties 
configurable on a step and decides which type of step to create.
 - the StepFactoryBean is used to generate a tasklet step as well as chunk-oriented step because if the 'tasklet=' attribute is specified on at one level and the <tasklet/> element is specified at another, the factory bean will be able to throw a useful error, whereas the parser would not know.
 - removed hacks from TaskletStep and SimpleStepFactoryBean

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java

@@ -27,7 +27,7 @@ import org.springframework.aop.framework.Advised;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecutionListener;
 import org.springframework.batch.core.listener.StepExecutionListenerSupport;
-import org.springframework.batch.core.step.item.FaultTolerantStepFactoryBean;
+import org.springframework.batch.core.step.item.StepFactoryBean;
 import org.springframework.batch.core.step.tasklet.TaskletStep;
 import org.springframework.batch.repeat.CompletionPolicy;
 import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
@@ -50,10 +50,9 @@ public class StepParserTests {
 	public void testTaskletStepAttributes() throws Exception {
 		ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext(
 				"org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml");
-		Map<String, Object> beans = ctx.getBeansOfType(FaultTolerantStepFactoryBean.class);
+		Map<String, Object> beans = ctx.getBeansOfType(StepFactoryBean.class);
 		String factoryName = (String) beans.keySet().toArray()[0];
-		FaultTolerantStepFactoryBean<Object, Object> factory = (FaultTolerantStepFactoryBean<Object, Object>) beans
-				.get(factoryName);
+		StepFactoryBean<Object, Object> factory = (StepFactoryBean<Object, Object>) beans.get(factoryName);
 		TaskletStep bean = (TaskletStep) factory.getObject();
 		assertEquals("wrong start-limit:", 25, bean.getStartLimit());
 	}

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests.java

@@ -29,7 +29,7 @@ import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
-import org.springframework.batch.core.step.item.SimpleStepFactoryBean;
+import org.springframework.batch.core.step.item.StepFactoryBean;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -67,7 +67,7 @@ public class StepWithBasicProcessTaskJobParserTests {
 	
 	@SuppressWarnings("unchecked")
 	@Autowired
-	private SimpleStepFactoryBean factory;
+	private StepFactoryBean factory;
 	
 	@Before
 	public void setUp() {

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests.java

@@ -29,7 +29,7 @@ import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
-import org.springframework.batch.core.step.item.FaultTolerantStepFactoryBean;
+import org.springframework.batch.core.step.item.StepFactoryBean;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.retry.RetryListener;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,7 +75,7 @@ public class StepWithFaultTolerantProcessTaskJobParserTests {
 	
 	@SuppressWarnings("unchecked")
 	@Autowired
-	private FaultTolerantStepFactoryBean factory;
+	private StepFactoryBean factory;
 	
 	@Before
 	public void setUp() {

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletElementParserTests.java

@@ -43,7 +43,7 @@ import org.springframework.test.util.ReflectionTestUtils;
  */
 public class TaskletElementParserTests {
 
-	ConfigurableApplicationContext taskletElementParentAttributeParserTestsContext = new ClassPathXmlApplicationContext(
+	private ConfigurableApplicationContext taskletElementParentAttributeParserTestsContext = new ClassPathXmlApplicationContext(
 			"org/springframework/batch/core/configuration/xml/TaskletElementParentAttributeParserTests-context.xml");
 
 	@Test

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepFactoryBeanTests.java

@@ -0,0 +1,195 @@
+/*
+ * 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.step.item;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.configuration.xml.DummyCompletionPolicy;
+import org.springframework.batch.core.configuration.xml.DummyItemReader;
+import org.springframework.batch.core.configuration.xml.DummyItemWriter;
+import org.springframework.batch.core.configuration.xml.DummyTasklet;
+import org.springframework.batch.core.listener.StepExecutionListenerSupport;
+import org.springframework.batch.core.step.JobRepositorySupport;
+import org.springframework.batch.core.step.tasklet.TaskletStep;
+import org.springframework.batch.item.ItemStream;
+import org.springframework.batch.item.file.FlatFileItemReader;
+import org.springframework.batch.item.support.PassThroughItemProcessor;
+import org.springframework.batch.retry.listener.RetryListenerSupport;
+import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
+import org.springframework.core.task.SyncTaskExecutor;
+import org.springframework.test.util.ReflectionTestUtils;
+
+/**
+ * @author Dan Garrette
+ * @since 2.0
+ */
+public class StepFactoryBeanTests {
+
+	@Test(expected = IllegalStateException.class)
+	public void testNothingSet() throws Exception {
+		StepFactoryBean<Object, Object> fb = new StepFactoryBean<Object, Object>();
+		fb.getObject();
+	}
+
+	@Test
+	public void testOnlyTaskletSet() throws Exception {
+		StepFactoryBean<Object, Object> fb = new StepFactoryBean<Object, Object>();
+		fb.setTasklet(new DummyTasklet());
+		Object step = fb.getObject();
+		assertTrue(step instanceof TaskletStep);
+		Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
+		assertTrue(tasklet instanceof DummyTasklet);
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void testSkipLimitSet() throws Exception {
+		StepFactoryBean<Object, Object> fb = new StepFactoryBean<Object, Object>();
+		fb.setSkipLimit(5);
+		fb.getObject();
+	}
+
+	@Test
+	public void testTaskletStep_All() throws Exception {
+		StepFactoryBean<Object, Object> fb = new StepFactoryBean<Object, Object>();
+		fb.setBeanName("step1");
+		fb.setAllowStartIfComplete(true);
+		fb.setJobRepository(new JobRepositorySupport());
+		fb.setStartLimit(5);
+		fb.setTasklet(new DummyTasklet());
+		fb.setTransactionManager(new ResourcelessTransactionManager());
+		fb.setListeners(new StepExecutionListenerSupport[] { new StepExecutionListenerSupport() });
+		fb.setTransactionAttributeList(new ArrayList<String>());
+		Object step = fb.getObject();
+		assertTrue(step instanceof TaskletStep);
+		Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
+		assertTrue(tasklet instanceof DummyTasklet);
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void testSimpleStep_All() throws Exception {
+		StepFactoryBean<Object, Object> fb = new StepFactoryBean<Object, Object>();
+		fb.setBeanName("step1");
+		fb.setAllowStartIfComplete(true);
+		fb.setJobRepository(new JobRepositorySupport());
+		fb.setStartLimit(5);
+		fb.setTransactionManager(new ResourcelessTransactionManager());
+		fb.setListeners(new StepListener[] { new StepExecutionListenerSupport() });
+		fb.setTransactionAttributeList(new ArrayList<String>());
+		fb.setChunkCompletionPolicy(new DummyCompletionPolicy());
+		fb.setCommitInterval(5);
+		fb.setTaskExecutor(new SyncTaskExecutor());
+		fb.setItemReader(new DummyItemReader());
+		fb.setItemWriter(new DummyItemWriter());
+		fb.setStreams(new ItemStream[] { new FlatFileItemReader<Object>() });
+
+		Object step = fb.getObject();
+		assertTrue(step instanceof TaskletStep);
+		Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
+		assertTrue(tasklet instanceof ChunkOrientedTasklet);
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void testFaultTolerantStep_All() throws Exception {
+		StepFactoryBean<Object, Object> fb = new StepFactoryBean<Object, Object>();
+		fb.setBeanName("step1");
+		fb.setAllowStartIfComplete(true);
+		fb.setJobRepository(new JobRepositorySupport());
+		fb.setStartLimit(5);
+		fb.setTransactionManager(new ResourcelessTransactionManager());
+		fb.setListeners(new StepListener[] { new StepExecutionListenerSupport() });
+		fb.setTransactionAttributeList(new ArrayList<String>());
+		fb.setChunkCompletionPolicy(new DummyCompletionPolicy());
+		fb.setCommitInterval(5);
+		fb.setTaskExecutor(new SyncTaskExecutor());
+		fb.setItemReader(new DummyItemReader());
+		fb.setItemWriter(new DummyItemWriter());
+		fb.setStreams(new ItemStream[] { new FlatFileItemReader<Object>() });
+		fb.setCacheCapacity(5);
+		fb.setIsReaderTransactionalQueue(true);
+		fb.setRetryLimit(5);
+		fb.setSkipLimit(100);
+		fb.setRetryListeners(new RetryListenerSupport());
+		fb.setSkippableExceptionClasses(new ArrayList<Class<? extends Throwable>>());
+		fb.setRetryableExceptionClasses(new ArrayList<Class<? extends Throwable>>());
+		fb.setFatalExceptionClasses(new ArrayList<Class<? extends Throwable>>());
+
+		Object step = fb.getObject();
+		assertTrue(step instanceof TaskletStep);
+		Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
+		assertTrue(tasklet instanceof ChunkOrientedTasklet);
+	}
+
+	@Test
+	public void testSimpleStep() throws Exception {
+		StepFactoryBean<Object, Object> fb = new StepFactoryBean<Object, Object>();
+		fb.setHasTaskletElement(true);
+		fb.setBeanName("step1");
+		fb.setAllowStartIfComplete(true);
+		fb.setJobRepository(new JobRepositorySupport());
+		fb.setStartLimit(5);
+		fb.setTransactionManager(new ResourcelessTransactionManager());
+		fb.setListeners(new StepListener[] { new StepExecutionListenerSupport() });
+		fb.setTransactionAttributeList(new ArrayList<String>());
+		fb.setChunkCompletionPolicy(new DummyCompletionPolicy());
+		fb.setTaskExecutor(new SyncTaskExecutor());
+		fb.setItemReader(new DummyItemReader());
+		fb.setItemProcessor(new PassThroughItemProcessor<Object>());
+		fb.setItemWriter(new DummyItemWriter());
+		fb.setStreams(new ItemStream[] { new FlatFileItemReader<Object>() });
+		
+		Object step = fb.getObject();
+		assertTrue(step instanceof TaskletStep);
+		Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
+		assertTrue(tasklet instanceof ChunkOrientedTasklet);
+	}
+
+	@Test
+	public void testFaultTolerantStep() throws Exception {
+		StepFactoryBean<Object, Object> fb = new StepFactoryBean<Object, Object>();
+		fb.setHasTaskletElement(true);
+		fb.setBeanName("step1");
+		fb.setAllowStartIfComplete(true);
+		fb.setJobRepository(new JobRepositorySupport());
+		fb.setStartLimit(5);
+		fb.setTransactionManager(new ResourcelessTransactionManager());
+		fb.setListeners(new StepListener[] { new StepExecutionListenerSupport() });
+		fb.setTransactionAttributeList(new ArrayList<String>());
+		fb.setChunkCompletionPolicy(new DummyCompletionPolicy());
+		fb.setTaskExecutor(new SyncTaskExecutor());
+		fb.setItemReader(new DummyItemReader());
+		fb.setItemProcessor(new PassThroughItemProcessor<Object>());
+		fb.setItemWriter(new DummyItemWriter());
+		fb.setStreams(new ItemStream[] { new FlatFileItemReader<Object>() });
+		fb.setCacheCapacity(5);
+		fb.setIsReaderTransactionalQueue(true);
+		fb.setRetryLimit(5);
+		fb.setSkipLimit(100);
+		fb.setRetryListeners(new RetryListenerSupport());
+		fb.setSkippableExceptionClasses(new ArrayList<Class<? extends Throwable>>());
+		fb.setRetryableExceptionClasses(new ArrayList<Class<? extends Throwable>>());
+		fb.setFatalExceptionClasses(new ArrayList<Class<? extends Throwable>>());
+
+		Object step = fb.getObject();
+		assertTrue(step instanceof TaskletStep);
+		Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
+		assertTrue(tasklet instanceof ChunkOrientedTasklet);
+	}
+}