RESOLVED - BATCH-864: rename SkipLimitStepFactoryBean

SkipLimit -> FaultTolerant

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java

@@ -44,7 +44,7 @@ import org.springframework.batch.support.Classifier;
  * @author Robert Kasanicky
  * 
  */
-public class SkipLimitStepFactoryBean<T, S> extends SimpleStepFactoryBean<T, S> {
+public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T, S> {
 
 	private int skipLimit = 0;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java

@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
  * This factory does not support configuration of fault-tolerant behavior, use
  * appropriate subclass of this factory bean to configure skip or retry.
  * 
- * @see SkipLimitStepFactoryBean
+ * @see FaultTolerantStepFactoryBean
  * 
  * @author Dave Syer
  * 

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

@@ -31,11 +31,11 @@ import org.springframework.batch.support.transaction.TransactionAwareProxyFactor
 import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
 import org.springframework.util.StringUtils;
 
-public class SkipLimitStepFactoryBeanNonBufferingTests {
+public class FaultTolerantStepFactoryBeanNonBufferingTests {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private SkipLimitStepFactoryBean<String, String> factory = new SkipLimitStepFactoryBean<String, String>();
+	private FaultTolerantStepFactoryBean<String, String> factory = new FaultTolerantStepFactoryBean<String, String>();
 
 	@SuppressWarnings("unchecked")
 	private Collection<Class<? extends Throwable>> skippableExceptions = new HashSet<Class<? extends Throwable>>(Arrays

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

@@ -57,11 +57,11 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * 
  */
-public class StatefulRetryStepFactoryBeanTests {
+public class FaultTolerantStepFactoryBeanRetryTests {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private SkipLimitStepFactoryBean<String, String> factory = new SkipLimitStepFactoryBean<String, String>();
+	private FaultTolerantStepFactoryBean<String, String> factory = new FaultTolerantStepFactoryBean<String, String>();
 
 	private List<Object> recovered = new ArrayList<Object>();
 

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

@@ -37,13 +37,13 @@ import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
 import org.springframework.util.StringUtils;
 
 /**
- * Tests for {@link SkipLimitStepFactoryBean}.
+ * Tests for {@link FaultTolerantStepFactoryBean}.
  */
-public class SkipLimitStepFactoryBeanTests {
+public class FaultTolerantStepFactoryBeanTests {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private SkipLimitStepFactoryBean<String, String> factory = new SkipLimitStepFactoryBean<String, String>();
+	private FaultTolerantStepFactoryBean<String, String> factory = new FaultTolerantStepFactoryBean<String, String>();
 
 	@SuppressWarnings("unchecked")
 	private Collection<Class<? extends Throwable>> skippableExceptions = new HashSet<Class<? extends Throwable>>(Arrays

spring-batch-samples/src/main/resources/jobs/retrySample.xml

@@ -10,7 +10,7 @@
 	<bean id="retrySample" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep"
-				class="org.springframework.batch.core.step.item.SkipLimitStepFactoryBean">
+				class="org.springframework.batch.core.step.item.FaultTolerantStepFactoryBean">
 				<property name="itemReader" ref="itemGenerator" />
 				<property name="itemWriter" ref="itemWriter" />
 				<property name="retryLimit" value="3" />

spring-batch-samples/src/main/resources/org/springframework/batch/sample/config/common-context.xml

@@ -26,7 +26,7 @@
 		<property name="commitInterval" value="1" />
 	</bean>
 	
-	<bean id="skipLimitStep" class="org.springframework.batch.core.step.item.SkipLimitStepFactoryBean"
+	<bean id="skipLimitStep" class="org.springframework.batch.core.step.item.FaultTolerantStepFactoryBean"
 		parent="simpleStep" abstract="true">
 		<property name="skipLimit" value="0" />
 	</bean>

spring-batch-samples/src/site/apt/index.apt

@@ -759,7 +759,7 @@ SELECT ID FROM BATCH_STAGING WHERE JOB_ID=? AND PROCESSED=? ORDER BY ID
 
 +---
 <bean id="step1" parent="simpleStep"
-    class="org.springframework.batch.core.step.item.SkipLimitStepFactoryBean">
+    class="org.springframework.batch.core.step.item.FaultTolerantStepFactoryBean">
     ...
     <property name="retryLimit" value="3" />
     <property name="retryableExceptionClasses" value="java.lang.Exception" />