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

BATCH-1392: Fixed in 2.0.x as well

Browse Source
This commit is contained in:
dsyer
2009-09-04 13:05:15 +00:00
parent 24068ae7e2
commit 0b0729edcc
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java
View File

@@ -122,6 +122,11 @@ public class ChunkElementParser {
propertyValues.addPropertyValue("retryLimit", retryLimit);
}
String throttleLimit = element.getAttribute("throttle-limit");
if (StringUtils.hasText(throttleLimit)) {
propertyValues.addPropertyValue("throttleLimit", throttleLimit);
}
String cacheCapacity = element.getAttribute("cache-capacity");
if (StringUtils.hasText(cacheCapacity)) {
propertyValues.addPropertyValue("cacheCapacity", cacheCapacity);

7
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.batch.core.configuration.xml;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
@@ -172,6 +173,7 @@ public class StepParserStepFactoryBeanTests {
fb.setPropagation(Propagation.REQUIRED);
fb.setChunkCompletionPolicy(new DummyCompletionPolicy());
fb.setTaskExecutor(new SyncTaskExecutor());
fb.setThrottleLimit(10);
fb.setItemReader(new DummyItemReader());
fb.setItemProcessor(new PassThroughItemProcessor<Object>());
fb.setItemWriter(new DummyItemWriter());
@@ -181,6 +183,8 @@ public class StepParserStepFactoryBeanTests {
assertTrue(step instanceof TaskletStep);
Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
assertTrue(tasklet instanceof ChunkOrientedTasklet);
Object throttleLimit = ReflectionTestUtils.getField(ReflectionTestUtils.getField(step, "stepOperations"), "throttleLimit");
assertEquals(new Integer(10), throttleLimit);
}
@Test
@@ -195,6 +199,7 @@ public class StepParserStepFactoryBeanTests {
fb.setListeners(new StepListener[] { new StepExecutionListenerSupport() });
fb.setChunkCompletionPolicy(new DummyCompletionPolicy());
fb.setTaskExecutor(new SyncTaskExecutor());
fb.setThrottleLimit(10);
fb.setItemReader(new DummyItemReader());
fb.setItemProcessor(new PassThroughItemProcessor<Object>());
fb.setItemWriter(new DummyItemWriter());
@@ -212,5 +217,7 @@ public class StepParserStepFactoryBeanTests {
assertTrue(step instanceof TaskletStep);
Object tasklet = ReflectionTestUtils.getField(step, "tasklet");
assertTrue(tasklet instanceof ChunkOrientedTasklet);
Object throttleLimit = ReflectionTestUtils.getField(ReflectionTestUtils.getField(step, "stepOperations"), "throttleLimit");
assertEquals(new Integer(10), throttleLimit);
}
}

2
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
View File

@@ -87,6 +87,8 @@ public class StepParserTests {
.get(factoryName);
TaskletStep bean = (TaskletStep) factory.getObject();
assertEquals("wrong start-limit:", 25, bean.getStartLimit());
Object throttleLimit = ReflectionTestUtils.getField(factory, "throttleLimit");
assertEquals(new Integer(10), throttleLimit);
}
@Test

4
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml
View File

@@ -9,7 +9,7 @@
<tasklet start-limit="25" allow-start-if-complete="true">
<chunk reader="reader" processor="processor" writer="writer" commit-interval="10" skip-limit="20"
retry-limit="3" cache-capacity="100" is-reader-transactional-queue="true"
task-executor="taskExecutor">
task-executor="taskExecutor" throttle-limit="10">
<retry-listeners>
<listener class="org.springframework.batch.core.configuration.xml.TestRetryListener" />
</retry-listeners>
@@ -53,4 +53,4 @@
<beans:property name="transactionManager" ref="transactionManager" />
</beans:bean>
</beans:beans>
</beans:beans>