Skip to content

Commit ce7e03a

Browse files
committed
Change default skip policy to NeverSkipItemSkipPolicy
Resolves #5077
1 parent 4c9fe94 commit ce7e03a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import org.springframework.batch.core.step.StepInterruptionPolicy;
4949
import org.springframework.batch.core.step.ThreadStepInterruptionPolicy;
5050
import org.springframework.batch.core.step.item.ChunkOrientedStep;
51-
import org.springframework.batch.core.step.skip.AlwaysSkipItemSkipPolicy;
51+
import org.springframework.batch.core.step.skip.NeverSkipItemSkipPolicy;
5252
import org.springframework.batch.core.step.skip.LimitCheckingExceptionHierarchySkipPolicy;
5353
import org.springframework.batch.core.step.skip.SkipLimitExceededException;
5454
import org.springframework.batch.core.step.skip.SkipPolicy;
@@ -320,7 +320,7 @@ public ChunkOrientedStepBuilder<I, O> retryLimit(long retryLimit) {
320320
* Set the skip policy for the step. This policy determines how the step handles
321321
* skipping items in case of failures. It can be used to define the conditions under
322322
* which items should be skipped and how many times an item can be skipped before the
323-
* step fails. Defaults to {@link AlwaysSkipItemSkipPolicy}.
323+
* step fails. Defaults to {@link NeverSkipItemSkipPolicy}.
324324
* @param skipPolicy the skip policy to use
325325
* @return this for fluent chaining
326326
*/
@@ -425,7 +425,7 @@ public ChunkOrientedStep<I, O> build() {
425425
this.skipLimit);
426426
}
427427
else {
428-
this.skipPolicy = new AlwaysSkipItemSkipPolicy();
428+
this.skipPolicy = new NeverSkipItemSkipPolicy();
429429
}
430430
}
431431
chunkOrientedStep.setSkipPolicy(this.skipPolicy);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.springframework.batch.core.step.FatalStepExecutionException;
5151
import org.springframework.batch.core.step.StepInterruptionPolicy;
5252
import org.springframework.batch.core.step.ThreadStepInterruptionPolicy;
53-
import org.springframework.batch.core.step.skip.AlwaysSkipItemSkipPolicy;
53+
import org.springframework.batch.core.step.skip.NeverSkipItemSkipPolicy;
5454
import org.springframework.batch.core.step.skip.SkipPolicy;
5555
import org.springframework.batch.infrastructure.item.Chunk;
5656
import org.springframework.batch.infrastructure.item.ExecutionContext;
@@ -143,7 +143,7 @@ public class ChunkOrientedStep<I, O> extends AbstractStep {
143143

144144
private final CompositeRetryListener compositeRetryListener = new CompositeRetryListener();
145145

146-
private SkipPolicy skipPolicy = new AlwaysSkipItemSkipPolicy();
146+
private SkipPolicy skipPolicy = new NeverSkipItemSkipPolicy();
147147

148148
private final CompositeSkipListener<I, O> compositeSkipListener = new CompositeSkipListener<>();
149149

@@ -297,7 +297,7 @@ public void registerRetryListener(RetryListener retryListener) {
297297
* whether an item should be skipped or not when an exception occurs during item
298298
* processing.
299299
* @param skipPolicy the skip policy to set. Defaults to
300-
* {@link AlwaysSkipItemSkipPolicy}.
300+
* {@link NeverSkipItemSkipPolicy}.
301301
*/
302302
public void setSkipPolicy(SkipPolicy skipPolicy) {
303303
Assert.notNull(skipPolicy, "Skip policy must not be null");

0 commit comments

Comments
 (0)