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

BATCH-1783 Wrapping exceptions from chunklisteners in FatalStepExecutionException to force step termination

Browse Source
This commit is contained in:
Morten Andersen-Gott
2011-10-14 15:41:57 +02:00
parent 6832201363
commit af84be4f75
3 changed files with 151 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRollbackTests.java
View File

@@ -1,8 +1,11 @@
package org.springframework.batch.core.step.item;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.springframework.batch.core.BatchStatus.FAILED;
import java.util.ArrayList;
import java.util.Arrays;
@@ -17,12 +20,15 @@ import org.apache.commons.logging.LogFactory;
import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ChunkListener;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.StepListener;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
import org.springframework.batch.core.step.FatalStepExecutionException;
import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.transaction.interceptor.RollbackRuleAttribute;
@@ -90,6 +96,32 @@ public class FaultTolerantStepFactoryBeanRollbackTests {
stepExecution = jobExecution.createStepExecution(factory.getName());
repository.add(stepExecution);
}
@Test
public void testBeforeChunkListenerException() throws Exception{
factory.setListeners(new StepListener []{new ExceptionThrowingChunkListener(true)});
Step step = (Step) factory.getObject();
step.execute(stepExecution);
assertEquals(FAILED, stepExecution.getStatus());
assertEquals(FAILED.toString(), stepExecution.getExitStatus().getExitCode());
assertTrue(stepExecution.getCommitCount() == 0);//Make sure exception was thrown in after, not before
Throwable e = stepExecution.getFailureExceptions().get(0);
assertThat(e, instanceOf(FatalStepExecutionException.class));
assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));
}
@Test
public void testAfterChunkListenerException() throws Exception{
factory.setListeners(new StepListener []{new ExceptionThrowingChunkListener(false)});
Step step = (Step) factory.getObject();
step.execute(stepExecution);
assertEquals(FAILED, stepExecution.getStatus());
assertEquals(FAILED.toString(), stepExecution.getExitStatus().getExitCode());
assertTrue(stepExecution.getCommitCount() > 0);//Make sure exception was thrown in after, not before
Throwable e = stepExecution.getFailureExceptions().get(0);
assertThat(e, instanceOf(FatalStepExecutionException.class));
assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));
}
@Test
public void testOverrideWithoutChangingRollbackRules() throws Exception {
@@ -525,5 +557,25 @@ public class FaultTolerantStepFactoryBeanRollbackTests {
}
return map;
}
class ExceptionThrowingChunkListener implements ChunkListener{
private boolean throwBefore = true;
public ExceptionThrowingChunkListener(boolean throwBefore) {
this.throwBefore = throwBefore;
}
public void beforeChunk() {
if(throwBefore){
throw new IllegalArgumentException("Planned exception");
}
}
public void afterChunk() {
throw new IllegalArgumentException("Planned exception");
}
}
}