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

RESOLVED BATCH-1441: Added remaining preoperties from FaultTolerant- to StepParserStepFactoryBean

Browse Source
This commit is contained in:
dsyer
2009-12-31 12:46:15 +00:00
parent aa60db1993
commit be87103d94
3 changed files with 147 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java
View File

@@ -37,6 +37,7 @@ import org.springframework.batch.core.partition.support.TaskExecutorPartitionHan
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.AbstractStep;
import org.springframework.batch.core.step.item.FaultTolerantStepFactoryBean;
import org.springframework.batch.core.step.item.KeyGenerator;
import org.springframework.batch.core.step.item.SimpleStepFactoryBean;
import org.springframework.batch.core.step.job.JobParametersExtractor;
import org.springframework.batch.core.step.job.JobStep;
@@ -51,7 +52,10 @@ import org.springframework.batch.repeat.CompletionPolicy;
import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
import org.springframework.batch.repeat.support.TaskExecutorRepeatTemplate;
import org.springframework.batch.retry.RetryListener;
import org.springframework.batch.retry.RetryPolicy;
import org.springframework.batch.retry.backoff.BackOffPolicy;
import org.springframework.batch.retry.policy.MapRetryContextCache;
import org.springframework.batch.retry.policy.RetryContextCache;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.core.task.SyncTaskExecutor;
@@ -150,6 +154,14 @@ class StepParserStepFactoryBean<I, O> implements FactoryBean, BeanNameAware {
private Integer retryLimit;
private BackOffPolicy backOffPolicy;
private RetryPolicy retryPolicy;
private RetryContextCache retryContextCache;
private KeyGenerator keyGenerator;
private Integer skipLimit;
private SkipPolicy skipPolicy;
@@ -348,6 +360,18 @@ class StepParserStepFactoryBean<I, O> implements FactoryBean, BeanNameAware {
if (skipPolicy != null) {
fb.setSkipPolicy(skipPolicy);
}
if (backOffPolicy != null) {
fb.setBackOffPolicy(backOffPolicy);
}
if (retryPolicy != null) {
fb.setRetryPolicy(retryPolicy);
}
if (retryContextCache != null) {
fb.setRetryContextCache(retryContextCache);
}
if (keyGenerator != null) {
fb.setKeyGenerator(keyGenerator);
}
if (retryListeners != null) {
fb.setRetryListeners(retryListeners);
@@ -441,7 +465,8 @@ class StepParserStepFactoryBean<I, O> implements FactoryBean, BeanNameAware {
*
* @param dependantName the name of the first field
* @param dependantValue the value of the first field
* @param names the names of the other fields (used to construct an exception message)
* @param names the names of the other fields (used to construct an
* exception message)
* @param values the other field values (one of which must be set if the
* first field is)
*/
@@ -500,8 +525,8 @@ class StepParserStepFactoryBean<I, O> implements FactoryBean, BeanNameAware {
}
private boolean isFaultTolerant() {
return skipPolicy != null || isPositive(skipLimit) || isPositive(retryLimit) || isPositive(cacheCapacity)
|| isTrue(readerTransactionalQueue);
return backOffPolicy != null || skipPolicy != null || isPositive(skipLimit) || isPositive(retryLimit)
|| isPositive(cacheCapacity) || isTrue(readerTransactionalQueue);
}
private boolean isTrue(Boolean b) {
@@ -707,6 +732,47 @@ class StepParserStepFactoryBean<I, O> implements FactoryBean, BeanNameAware {
this.propagation = propagation;
}
// =========================================================
// Parent Attributes - can be provided in parent bean but not namespace
// =========================================================
/**
* A backoff policy to be applied to retry process.
*
* @param backOffPolicy the {@link BackOffPolicy} to set
*/
public void setBackOffPolicy(BackOffPolicy backOffPolicy) {
this.backOffPolicy = backOffPolicy;
}
/**
* A retry policy to apply when exceptions occur. If this is specified then
* the retry limit and retryable exceptions will be ignored.
*
* @param retryPolicy the {@link RetryPolicy} to set
*/
public void setRetryPolicy(RetryPolicy retryPolicy) {
this.retryPolicy = retryPolicy;
}
/**
* @param retryContextCache the {@link RetryContextCache} to set
*/
public void setRetryContextCache(RetryContextCache retryContextCache) {
this.retryContextCache = retryContextCache;
}
/**
* A key generator that can be used to compare items with previously
* recorded items in a retry. Only used if the reader is a transactional
* queue.
*
* @param keyGenerator the {@link KeyGenerator} to set
*/
public void setKeyGenerator(KeyGenerator keyGenerator) {
this.keyGenerator = keyGenerator;
}
// =========================================================
// Chunk Attributes
// =========================================================

45
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ParentStepFactoryBeanParserTests.java Normal file
View File

@@ -0,0 +1,45 @@
/*
* Copyright 2006-2007 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.core.configuration.xml;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.step.item.FaultTolerantChunkProcessor;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.util.ReflectionTestUtils;
/**
* @author Dave Syer
*
*/
public class ParentStepFactoryBeanParserTests {
@Test
public void testSimpleAttributes() throws Exception {
ConfigurableApplicationContext context = new ClassPathXmlApplicationContext(
"org/springframework/batch/core/configuration/xml/ParentStepFactoryBeanParserTests-context.xml");
Object step = context.getBean("s1", Step.class);
assertNotNull("Step not parsed", step);
Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
Object chunkProcessor = ReflectionTestUtils.getField(tasklet, "chunkProcessor");
assertTrue("Wrong processor type", chunkProcessor instanceof FaultTolerantChunkProcessor<?,?>);
}
}

33
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/ParentStepFactoryBeanParserTests-context.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<import resource="common-context.xml" />
<bean id="stepParent" class="org.springframework.batch.core.step.item.FaultTolerantStepFactoryBean" abstract="true">
<property name="backOffPolicy">
<bean class="org.springframework.batch.retry.backoff.FixedBackOffPolicy" />
</property>
<property name="retryPolicy">
<bean class="org.springframework.batch.retry.policy.AlwaysRetryPolicy" />
</property>
<property name="keyGenerator">
<null/>
</property>
<property name="retryContextCache">
<bean class="org.springframework.batch.retry.policy.MapRetryContextCache">
<property name="capacity" value="128"/>
</bean>
</property>
</bean>
<job id="job" xmlns="http://www.springframework.org/schema/batch">
<step id="s1" parent="stepParent">
<tasklet>
<chunk reader="reader" writer="writer" processor="processor" commit-interval="5" />
</tasklet>
</step>
</job>
</beans>