Fix default skip limit when configuring fault tolerant steps

Resolves #5069

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/ChunkOrientedStepBuilder.java

@@ -50,6 +50,7 @@
 import org.springframework.batch.core.step.item.ChunkOrientedStep;
 import org.springframework.batch.core.step.skip.AlwaysSkipItemSkipPolicy;
 import org.springframework.batch.core.step.skip.LimitCheckingExceptionHierarchySkipPolicy;
+import org.springframework.batch.core.step.skip.SkipLimitExceededException;
 import org.springframework.batch.core.step.skip.SkipPolicy;
 import org.springframework.batch.infrastructure.item.ItemProcessor;
 import org.springframework.batch.infrastructure.item.ItemReader;
@@ -108,7 +109,7 @@ public class ChunkOrientedStepBuilder<I, O> extends StepBuilderHelper<ChunkOrien
 
 	private final Set<Class<? extends Throwable>> skippableExceptions = new HashSet<>();
 
-	private long skipLimit = -1;
+	private long skipLimit = 10;
 
 	private @Nullable AsyncTaskExecutor asyncTaskExecutor;
 
@@ -347,6 +348,14 @@ public final ChunkOrientedStepBuilder<I, O> skip(Class<? extends Throwable>... s
 		return self();
 	}
 
+	/**
+	 * Set the skip limit for the step. This limit determines the maximum number of items
+	 * that can be skipped before the step fails. If the number of skipped items exceeds
+	 * this limit, the step will throw a {@link SkipLimitExceededException} and fail.
+	 * Defaults to 10.
+	 * @param skipLimit the skip limit to set
+	 * @return this for fluent chaining
+	 */
 	public ChunkOrientedStepBuilder<I, O> skipLimit(long skipLimit) {
 		Assert.isTrue(skipLimit > 0, "skipLimit must be positive");
 		this.skipLimit = skipLimit;

spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingExceptionHierarchySkipPolicy.java

@@ -32,7 +32,7 @@ public class LimitCheckingExceptionHierarchySkipPolicy implements SkipPolicy {
 
 	private Set<Class<? extends Throwable>> skippableExceptions = new HashSet<>();
 
-	private long skipLimit = -1;
+	private final long skipLimit;
 
 	/**
 	 * Create a new {@link LimitCheckingExceptionHierarchySkipPolicy} instance.
@@ -41,7 +41,7 @@ public class LimitCheckingExceptionHierarchySkipPolicy implements SkipPolicy {
 	 */
 	public LimitCheckingExceptionHierarchySkipPolicy(Set<Class<? extends Throwable>> skippableExceptions,
 			long skipLimit) {
-		Assert.notEmpty(skippableExceptions, "The skippableExceptions must not be empty");
+		Assert.notNull(skippableExceptions, "The skippableExceptions must not be null");
 		Assert.isTrue(skipLimit > 0, "The skipLimit must be greater than zero");
 		this.skippableExceptions = skippableExceptions;
 		this.skipLimit = skipLimit;

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.step.item;
 
-import java.util.Map;
+import java.util.List;
 import java.util.Set;
 
 import javax.sql.DataSource;
@@ -38,6 +38,7 @@
 import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.builder.ChunkOrientedStepBuilder;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.core.step.skip.LimitCheckingExceptionHierarchySkipPolicy;
 import org.springframework.batch.core.step.skip.SkipLimitExceededException;
 import org.springframework.batch.infrastructure.item.ItemProcessor;
@@ -48,6 +49,7 @@
 import org.springframework.batch.infrastructure.item.file.FlatFileItemReader;
 import org.springframework.batch.infrastructure.item.file.FlatFileParseException;
 import org.springframework.batch.infrastructure.item.file.builder.FlatFileItemReaderBuilder;
+import org.springframework.batch.infrastructure.item.support.ListItemReader;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -63,6 +65,8 @@
 import org.springframework.jdbc.support.JdbcTransactionManager;
 import org.springframework.test.jdbc.JdbcTestUtils;
 
+import static org.mockito.Mockito.mock;
+
 /**
  * Integration tests for {@link ChunkOrientedStep}.
  *
@@ -73,6 +77,17 @@ public class ChunkOrientedStepIntegrationTests {
 	// TODO use parameterized tests for serial and concurrent steps
 	// The outcome should be the same for both
 
+	@Test
+	void testFaultTolerantChunkOrientedStepSetupWithDefaultSkipLimit() {
+		Assertions.assertDoesNotThrow(() -> new StepBuilder(mock()).chunk(5)
+			.reader(new ListItemReader<>(List.of("item1", "item2")))
+			.writer(items -> {
+			})
+			.faultTolerant()
+			.skip(Exception.class)
+			.build());
+	}
+
 	@Test
 	void testChunkOrientedStep() throws Exception {
 		// given