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

Incomplete - task 84: Fix samples

Browse Source 
Fix rollback tests as well - exception handler too complicated
This commit is contained in:
dsyer
2008-02-26 15:16:02 +00:00
parent ee2c20f568
commit 55e35eac1c
7 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java
View File

@@ -195,8 +195,8 @@ public class ItemOrientedStep extends AbstractStep implements InitializingBean {
((RepeatTemplate) chunkOperations).setCompletionPolicy(new SimpleCompletionPolicy(commitInterval));
}
if (this.chunkOperations instanceof RepeatTemplate && exceptionHandler != null) {
((RepeatTemplate) chunkOperations).setExceptionHandler(exceptionHandler);
if (this.stepOperations instanceof RepeatTemplate && exceptionHandler != null) {
((RepeatTemplate) stepOperations).setExceptionHandler(exceptionHandler);
}
}

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
View File

@@ -355,7 +355,7 @@ public class ItemOrientedStepTests extends TestCase {
public void testApplyConfigurationWithExceptionHandler() throws Exception {
final List list = new ArrayList();
itemOrientedStep.setChunkOperations(new RepeatTemplate() {
itemOrientedStep.setStepOperations(new RepeatTemplate() {
public void setExceptionHandler(ExceptionHandler exceptionHandler) {
list.add(exceptionHandler);
}

8
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandler.java
View File

@@ -19,7 +19,6 @@ package org.springframework.batch.repeat.exception.handler;
import java.util.HashMap;
import org.springframework.batch.common.ExceptionClassifierSupport;
import org.springframework.batch.io.exception.WriteFailureException;
import org.springframework.batch.repeat.RepeatContext;
/**
@@ -32,14 +31,13 @@ import org.springframework.batch.repeat.RepeatContext;
public class SimpleLimitExceptionHandler implements ExceptionHandler {
/**
* Name of exception classifier key for the
* {@link WriteFailureException}.
* Name of exception classifier key for the nominated exception type.
*/
private static final String TX_INVALID = "TX_INVALID";
private RethrowOnThresholdExceptionHandler delegate = new RethrowOnThresholdExceptionHandler();
private Class type = WriteFailureException.class;
private Class type = Exception.class;
/**
* Flag to indicate the the exception counters should be shared between
@@ -102,7 +100,7 @@ public class SimpleLimitExceptionHandler implements ExceptionHandler {
/**
* Setter for the Throwable type that this handler counts. Defaults to
* {@link WriteFailureException}.
* {@link Exception}.
*
* @param type
*/

3
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandlerTests.java
View File

@@ -55,7 +55,7 @@ public class SimpleLimitExceptionHandlerTests extends TestCase {
}
/**
* Other than TransactionInvalidException should be rethrown, ignoring the
* Other than nominated exception type should be rethrown, ignoring the
* exception limit.
*
* @throws Exception
@@ -65,6 +65,7 @@ public class SimpleLimitExceptionHandlerTests extends TestCase {
final int MORE_THAN_ZERO = 1;
handler.setLimit(MORE_THAN_ZERO);
handler.setType(IllegalArgumentException.class);
try {
handler.handleException(new RepeatContextSupport(null), throwable);

10
spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
View File

@@ -34,16 +34,6 @@
ref="hibernateOutputSource" />
</bean>
</property>
<property name="stepOperations">
<bean
class="org.springframework.batch.repeat.support.RepeatTemplate">
<property name="exceptionHandler">
<bean
class="org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler"
p:limit="2" p:useParent="true" p:type="java.lang.Exception" />
</property>
</bean>
</property>
</bean>
</property>
</bean>

5
spring-batch-samples/src/main/resources/jobs/restartSample.xml
View File

@@ -31,6 +31,11 @@
</bean>
</property>
<property name="commitInterval" value="2" />
<property name="exceptionHandler">
<bean class="org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler">
<property name="limit" value="0"/>
</bean>
</property>
</bean>
</property>
</bean>

6
spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
View File

@@ -35,12 +35,6 @@
ref="tradeValidator" />
</bean>
</property>
<property name="itemSkipPolicy">
<bean
class="org.springframework.batch.execution.step.support.LimitCheckingItemSkipPolicy">
<constructor-arg value="5"/>
</bean>
</property>
<property name="itemWriter">
<bean
class="org.springframework.batch.sample.item.writer.TradeWriter"