Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RESOLVED - BATCH-930: rename ItemSkipPolicy

Browse Source 
ItemSkipPolicy => SkipPolicy
This commit is contained in:
robokaso
2008-11-20 13:26:37 +00:00
parent 117becfe5a
commit 54258d6154
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractFaultTolerantChunkOrientedTasklet.java
View File

@@ -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<I, O> 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<Throwable, Boolean> rollbackClassifier;
public AbstractFaultTolerantChunkOrientedTasklet(ItemReader<? extends I> itemReader,
ItemProcessor<? super I, ? extends O> itemProcessor, ItemWriter<? super O> itemWriter,
RetryOperations retryOperations, ItemSkipPolicy readSkipPolicy, ItemSkipPolicy processSkipPolicy,
ItemSkipPolicy writeSkipPolicy, Classifier<Throwable, Boolean> rollbackClassifier,
RetryOperations retryOperations, SkipPolicy readSkipPolicy, SkipPolicy processSkipPolicy,
SkipPolicy writeSkipPolicy, Classifier<Throwable, Boolean> rollbackClassifier,
RepeatOperations repeatTemplate) {
super(itemReader, itemProcessor, itemWriter);
@@ -71,7 +71,7 @@ public abstract class AbstractFaultTolerantChunkOrientedTasklet<I, O> extends Ab
this.repeatOperations = repeatTemplate;
}
protected ItemSkipPolicy getReadSkipPolicy() {
protected SkipPolicy getReadSkipPolicy() {
return readSkipPolicy;
}

6
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTasklet.java
View File

@@ -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<I, O> extends AbstractFaultTolera
public FaultTolerantChunkOrientedTasklet(ItemReader<? extends I> itemReader,
ItemProcessor<? super I, ? extends O> itemProcessor, ItemWriter<? super O> itemWriter,
RepeatOperations chunkOperations, RetryOperations retryTemplate,
Classifier<Throwable, Boolean> rollbackClassifier, ItemSkipPolicy readSkipPolicy,
ItemSkipPolicy writeSkipPolicy, ItemSkipPolicy processSkipPolicy) {
Classifier<Throwable, Boolean> rollbackClassifier, SkipPolicy readSkipPolicy,
SkipPolicy writeSkipPolicy, SkipPolicy processSkipPolicy) {
super(itemReader, itemProcessor, itemWriter, retryTemplate, readSkipPolicy, processSkipPolicy, writeSkipPolicy,
rollbackClassifier, chunkOperations);

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

@@ -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<T, S> extends SimpleStepFactoryBean<T,
List<Class<? extends Throwable>> exceptions = new ArrayList<Class<? extends Throwable>>(
skippableExceptionClasses);
ItemSkipPolicy readSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, skippableExceptionClasses,
SkipPolicy readSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, skippableExceptionClasses,
new ArrayList<Class<? extends Throwable>>(fatalExceptionClasses));
exceptions.addAll(new ArrayList<Class<? extends Throwable>>(retryableExceptionClasses));
ItemSkipPolicy writeSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, exceptions,
SkipPolicy writeSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, exceptions,
new ArrayList<Class<? extends Throwable>>(fatalExceptionClasses));
if (isReaderTransactionalQueue) {

6
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/NonbufferingFaultTolerantChunkOrientedTasklet.java
View File

@@ -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<I, O> extends
public NonbufferingFaultTolerantChunkOrientedTasklet(ItemReader<? extends I> itemReader,
ItemProcessor<? super I, ? extends O> itemProcessor, ItemWriter<? super O> itemWriter,
RepeatOperations chunkOperations, RetryOperations retryTemplate,
Classifier<Throwable, Boolean> rollbackClassifier, ItemSkipPolicy readSkipPolicy,
ItemSkipPolicy writeSkipPolicy, ItemSkipPolicy processSkipPolicy) {
Classifier<Throwable, Boolean> rollbackClassifier, SkipPolicy readSkipPolicy,
SkipPolicy writeSkipPolicy, SkipPolicy processSkipPolicy) {
super(itemReader, itemProcessor, itemWriter, retryTemplate, readSkipPolicy, processSkipPolicy, writeSkipPolicy,
rollbackClassifier, chunkOperations);

4
spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/AlwaysSkipItemSkipPolicy.java
View File

@@ -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;

4
spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java
View File

@@ -26,7 +26,7 @@ import org.springframework.batch.support.Classifier;
/**
* <p>
* {@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;

4
spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/NeverSkipItemSkipPolicy.java
View File

@@ -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;

2
spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/ItemSkipPolicy.java → spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/SkipPolicy.java
View File

@@ -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

6
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTaskletTests.java
View File

@@ -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() {