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

RESOLVED - issue BATCH-485: SkippableExceptionClasses should be inverted

Browse Source 
http://jira.springframework.org/browse/BATCH-485

SkipLimitStepFactoryBean now declares setter for fatal exceptions that are never skipped and immediately rethrown by exception handlerRESOLVED - issue BATCH-485: SkippableExceptionClasses should be inverted 
http://jira.springframework.org/browse/BATCH-485

SkipLimitStepFactoryBean now declares setter for fatal exceptions that are never skipped and immediately rethrown by exception handler.
LimitCheckingItemSkipPolicy and SimpleLimitExceptionHandler were modified to recognize fatal exceptions.
This commit is contained in:
robokaso
2008-03-20 10:04:27 +00:00
parent 79967e173c
commit 4cc2e03fbd
5 changed files with 152 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitReadFailurePolicyTests.java
View File

@@ -17,6 +17,7 @@ package org.springframework.batch.core.step.item;
import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import junit.framework.TestCase;
@@ -38,8 +39,9 @@ public class SkipLimitReadFailurePolicyTests extends TestCase {
List skippableExceptions = new ArrayList();
skippableExceptions.add(FlatFileParseException.class);
List fatalExceptions = Collections.EMPTY_LIST;
failurePolicy = new LimitCheckingItemSkipPolicy(1, skippableExceptions);
failurePolicy = new LimitCheckingItemSkipPolicy(1, skippableExceptions, fatalExceptions);
}
public void testLimitExceed(){

43
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java
View File

@@ -34,8 +34,10 @@ public class SkipLimitStepFactoryBeanTests extends TestCase {
SkipLimitStepFactoryBean tested = new SkipLimitStepFactoryBean();
// TODO checked exceptions are wrapped as RepeatExceptions by the chunkOperations#exceptionHandler
Class[] skippableExceptions = new Class[] { RepeatException.class, SkippableException.class, SkippableRuntimeException.class };
// TODO checked exceptions are wrapped as RepeatExceptions by the
// chunkOperations#exceptionHandler
Class[] skippableExceptions = new Class[] { RepeatException.class, SkippableException.class,
SkippableRuntimeException.class };
final int SKIP_LIMIT = 2;
@@ -61,8 +63,7 @@ public class SkipLimitStepFactoryBeanTests extends TestCase {
}
/**
*
* @throws Exception
* Check items causing errors are skipped as expected.
*/
public void testSkip() throws Exception {
ItemOrientedStep step = (ItemOrientedStep) tested.getObject();
@@ -71,7 +72,7 @@ public class SkipLimitStepFactoryBeanTests extends TestCase {
step.execute(stepExecution);
assertEquals(2, stepExecution.getSkipCount());
assertTrue(reader.skipped.contains("2"));
assertTrue(reader.skipped.contains("4"));
// writer did not skip "2" as it never made it to writer, only "4" did
@@ -84,7 +85,31 @@ public class SkipLimitStepFactoryBeanTests extends TestCase {
.contains(expectedOutput[i]));
}
assertTrue(writer.written.size() == expectedOutput.length);
}
/**
* Fatal exception should cause immediate termination regardless of other
* skip settings (note the fatal exception is also classified as skippable).
*/
public void testFatalException() throws Exception {
tested.setFatalExceptionClasses(new Class[] { FatalRuntimeException.class });
tested.setItemWriter(new SkipWriterStub() {
public void write(Object item) {
throw new FatalRuntimeException("Ouch!");
}
});
ItemOrientedStep step = (ItemOrientedStep) tested.getObject();
StepExecution stepExecution = new StepExecution(step, jobExecution);
try {
step.execute(stepExecution);
fail();
}
catch (FatalRuntimeException expected) {
assertTrue(expected.getMessage().equals("Ouch!"));
}
}
/**
@@ -175,4 +200,10 @@ public class SkipLimitStepFactoryBeanTests extends TestCase {
}
}
private static class FatalRuntimeException extends SkippableRuntimeException {
public FatalRuntimeException(String message) {
super(message);
}
}
}