diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractFaultTolerantChunkOrientedTasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractFaultTolerantChunkOrientedTasklet.java index 814c931d7..4cf6c1883 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractFaultTolerantChunkOrientedTasklet.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractFaultTolerantChunkOrientedTasklet.java @@ -9,7 +9,7 @@ import java.util.Map.Entry; import org.springframework.batch.core.SkipListener; import org.springframework.batch.core.StepContribution; -import org.springframework.batch.core.step.skip.ItemSkipPolicy; +import org.springframework.batch.core.step.skip.SkipPolicy; import org.springframework.batch.core.step.skip.SkipListenerFailedException; import org.springframework.batch.item.ItemProcessor; import org.springframework.batch.item.ItemReader; @@ -48,18 +48,18 @@ public abstract class AbstractFaultTolerantChunkOrientedTasklet extends Ab final private RepeatOperations repeatOperations; - final private ItemSkipPolicy writeSkipPolicy; + final private SkipPolicy writeSkipPolicy; - final private ItemSkipPolicy processSkipPolicy; + final private SkipPolicy processSkipPolicy; - final private ItemSkipPolicy readSkipPolicy; + final private SkipPolicy readSkipPolicy; final private Classifier rollbackClassifier; public AbstractFaultTolerantChunkOrientedTasklet(ItemReader itemReader, ItemProcessor itemProcessor, ItemWriter itemWriter, - RetryOperations retryOperations, ItemSkipPolicy readSkipPolicy, ItemSkipPolicy processSkipPolicy, - ItemSkipPolicy writeSkipPolicy, Classifier rollbackClassifier, + RetryOperations retryOperations, SkipPolicy readSkipPolicy, SkipPolicy processSkipPolicy, + SkipPolicy writeSkipPolicy, Classifier rollbackClassifier, RepeatOperations repeatTemplate) { super(itemReader, itemProcessor, itemWriter); @@ -71,7 +71,7 @@ public abstract class AbstractFaultTolerantChunkOrientedTasklet extends Ab this.repeatOperations = repeatTemplate; } - protected ItemSkipPolicy getReadSkipPolicy() { + protected SkipPolicy getReadSkipPolicy() { return readSkipPolicy; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTasklet.java index de670a6b4..8e18bab10 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTasklet.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTasklet.java @@ -21,7 +21,7 @@ import java.util.Map; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.StepContribution; -import org.springframework.batch.core.step.skip.ItemSkipPolicy; +import org.springframework.batch.core.step.skip.SkipPolicy; import org.springframework.batch.core.step.skip.NonSkippableReadException; import org.springframework.batch.item.ItemProcessor; import org.springframework.batch.item.ItemReader; @@ -59,8 +59,8 @@ public class FaultTolerantChunkOrientedTasklet extends AbstractFaultTolera public FaultTolerantChunkOrientedTasklet(ItemReader itemReader, ItemProcessor itemProcessor, ItemWriter itemWriter, RepeatOperations chunkOperations, RetryOperations retryTemplate, - Classifier rollbackClassifier, ItemSkipPolicy readSkipPolicy, - ItemSkipPolicy writeSkipPolicy, ItemSkipPolicy processSkipPolicy) { + Classifier rollbackClassifier, SkipPolicy readSkipPolicy, + SkipPolicy writeSkipPolicy, SkipPolicy processSkipPolicy) { super(itemReader, itemProcessor, itemWriter, retryTemplate, readSkipPolicy, processSkipPolicy, writeSkipPolicy, rollbackClassifier, chunkOperations); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java index 3b005f1bf..7c3510b4b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import org.springframework.batch.core.step.skip.ItemSkipPolicy; +import org.springframework.batch.core.step.skip.SkipPolicy; import org.springframework.batch.core.step.skip.LimitCheckingItemSkipPolicy; import org.springframework.batch.core.step.skip.NonSkippableReadException; import org.springframework.batch.core.step.skip.SkipLimitExceededException; @@ -257,10 +257,10 @@ public class FaultTolerantStepFactoryBean extends SimpleStepFactoryBean> exceptions = new ArrayList>( skippableExceptionClasses); - ItemSkipPolicy readSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, skippableExceptionClasses, + SkipPolicy readSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, skippableExceptionClasses, new ArrayList>(fatalExceptionClasses)); exceptions.addAll(new ArrayList>(retryableExceptionClasses)); - ItemSkipPolicy writeSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, exceptions, + SkipPolicy writeSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, exceptions, new ArrayList>(fatalExceptionClasses)); if (isReaderTransactionalQueue) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/NonbufferingFaultTolerantChunkOrientedTasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/NonbufferingFaultTolerantChunkOrientedTasklet.java index b61143cbb..2b32a8b52 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/NonbufferingFaultTolerantChunkOrientedTasklet.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/NonbufferingFaultTolerantChunkOrientedTasklet.java @@ -8,7 +8,7 @@ import java.util.Set; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.StepContribution; -import org.springframework.batch.core.step.skip.ItemSkipPolicy; +import org.springframework.batch.core.step.skip.SkipPolicy; import org.springframework.batch.core.step.skip.SkipListenerFailedException; import org.springframework.batch.item.ItemProcessor; import org.springframework.batch.item.ItemReader; @@ -41,8 +41,8 @@ public class NonbufferingFaultTolerantChunkOrientedTasklet extends public NonbufferingFaultTolerantChunkOrientedTasklet(ItemReader itemReader, ItemProcessor itemProcessor, ItemWriter itemWriter, RepeatOperations chunkOperations, RetryOperations retryTemplate, - Classifier rollbackClassifier, ItemSkipPolicy readSkipPolicy, - ItemSkipPolicy writeSkipPolicy, ItemSkipPolicy processSkipPolicy) { + Classifier rollbackClassifier, SkipPolicy readSkipPolicy, + SkipPolicy writeSkipPolicy, SkipPolicy processSkipPolicy) { super(itemReader, itemProcessor, itemWriter, retryTemplate, readSkipPolicy, processSkipPolicy, writeSkipPolicy, rollbackClassifier, chunkOperations); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/AlwaysSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/AlwaysSkipItemSkipPolicy.java index 41035991a..f6883fd61 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/AlwaysSkipItemSkipPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/AlwaysSkipItemSkipPolicy.java @@ -17,13 +17,13 @@ package org.springframework.batch.core.step.skip; /** - * Implementation of the {@link ItemSkipPolicy} interface that + * Implementation of the {@link SkipPolicy} interface that * will always return that an item should be skipped. * * @author Ben Hale * @author Lucas Ward */ -public class AlwaysSkipItemSkipPolicy implements ItemSkipPolicy { +public class AlwaysSkipItemSkipPolicy implements SkipPolicy { public boolean shouldSkip(Throwable t, int skipCount) { return true; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java index fe6f22571..17acafb66 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java @@ -26,7 +26,7 @@ import org.springframework.batch.support.Classifier; /** *

- * {@link ItemSkipPolicy} that determines whether or not reading should continue + * {@link SkipPolicy} that determines whether or not reading should continue * based upon how many items have been skipped. This is extremely useful * behavior, as it allows you to skip records, but will throw a * {@link SkipLimitExceededException} if a set limit has been exceeded. For @@ -52,7 +52,7 @@ import org.springframework.batch.support.Classifier; * @author Lucas Ward * @author Robert Kasanicky */ -public class LimitCheckingItemSkipPolicy implements ItemSkipPolicy { +public class LimitCheckingItemSkipPolicy implements SkipPolicy { private final int skipLimit; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/NeverSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/NeverSkipItemSkipPolicy.java index 5f4591518..a10bf906c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/NeverSkipItemSkipPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/NeverSkipItemSkipPolicy.java @@ -17,12 +17,12 @@ package org.springframework.batch.core.step.skip; /** - * {@link ItemSkipPolicy} implementation that always returns false, + * {@link SkipPolicy} implementation that always returns false, * indicating that an item should not be skipped. * * @author Lucas Ward */ -public class NeverSkipItemSkipPolicy implements ItemSkipPolicy{ +public class NeverSkipItemSkipPolicy implements SkipPolicy{ public boolean shouldSkip(Throwable t, int skipCount) { return false; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/ItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicy.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/ItemSkipPolicy.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicy.java index 5975a84ef..67a03e6c8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/ItemSkipPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicy.java @@ -21,7 +21,7 @@ package org.springframework.batch.core.step.skip; * @author Lucas Ward * @author Dave Syer */ -public interface ItemSkipPolicy { +public interface SkipPolicy { /** * Returns true or false, indicating whether or not processing should diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTaskletTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTaskletTests.java index 55e0b6ec4..dc597dcb4 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTaskletTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTaskletTests.java @@ -33,7 +33,7 @@ import org.springframework.batch.core.SkipListener; import org.springframework.batch.core.StepContribution; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.scope.ChunkContext; -import org.springframework.batch.core.step.skip.ItemSkipPolicy; +import org.springframework.batch.core.step.skip.SkipPolicy; import org.springframework.batch.core.step.skip.SkipLimitExceededException; import org.springframework.batch.item.ItemProcessor; import org.springframework.batch.item.ItemReader; @@ -95,7 +95,7 @@ public class FaultTolerantChunkOrientedTaskletTests { } }; - private ItemSkipPolicy readSkipPolicy = new ItemSkipPolicy() { + private SkipPolicy readSkipPolicy = new SkipPolicy() { public boolean shouldSkip(Throwable t, int skipCount) throws SkipLimitExceededException { if (skipCount < skipLimit) { return true; @@ -104,7 +104,7 @@ public class FaultTolerantChunkOrientedTaskletTests { } }; - private ItemSkipPolicy writeSkipPolicy = readSkipPolicy; + private SkipPolicy writeSkipPolicy = readSkipPolicy; @Before public void setUp() {