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

BATCH-63: fixed the <streams> handling and added more tests and asserts

Browse Source
This commit is contained in:
trisberg
2008-11-12 19:39:17 +00:00
parent a134094f70
commit 0d4777e80d
6 changed files with 189 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java
View File

@@ -266,8 +266,13 @@ public class StepParser {
handleListenersElement(element, bd, parserContext);
handleStreamsElement(element, bd, parserContext);
bd.setRole(BeanDefinition.ROLE_SUPPORT);
String id = parserContext.getReaderContext().generateBeanName(bd);
parserContext.getRegistry().registerBeanDefinition(id, bd);
return bd;
}
@@ -343,15 +348,15 @@ public class StepParser {
Element streamsElement =
DomUtils.getChildElementByTagName(element, "streams");
if (streamsElement != null) {
List<BeanReference> listenerBeans = new ArrayList<BeanReference>();
List<Element> listenerElements =
DomUtils.getChildElementsByTagName(streamsElement, "listener");
if (listenerElements != null) {
for (Element listenerElement : listenerElements) {
List<BeanReference> streamBeans = new ArrayList<BeanReference>();
List<Element> streamElements =
DomUtils.getChildElementsByTagName(streamsElement, "stream");
if (streamElements != null) {
for (Element listenerElement : streamElements) {
String listenerRef = listenerElement.getAttribute("ref");
if (StringUtils.hasText(listenerRef)) {
BeanReference bean = new RuntimeBeanReference(listenerRef);
listenerBeans.add(bean);
streamBeans.add(bean);
}
else {
throw new BeanCreationException("ref not specified for <" + listenerElement.getTagName() + "> element");
@@ -359,7 +364,7 @@ public class StepParser {
}
}
ManagedList arguments = new ManagedList();
arguments.addAll(listenerBeans);
arguments.addAll(streamBeans);
bd.getPropertyValues().addPropertyValue("streams", arguments);
}
}

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

@@ -0,0 +1,101 @@
/*
* 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.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.StepExecutionListener;
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.item.FaultTolerantStepFactoryBean;
import org.springframework.batch.item.ItemStream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.util.ReflectionTestUtils;
/**
* @author Thomas Risberg
*
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class StepWithFaultTolerantChunkJobParserTests {
@Autowired
private Job job;
@Autowired
private JobRepository jobRepository;
@Autowired
private TestReader reader;
@Autowired
@Qualifier("listener")
private TestListener listener;
@Autowired
private TestProcessor processor;
@Autowired
private TestWriter writer;
@SuppressWarnings("unchecked")
@Autowired
private FaultTolerantStepFactoryBean factory;
@Before
public void setUp() {
MapJobRepositoryFactoryBean.clear();
}
@Test
public void testStepWithTask() throws Exception {
assertNotNull(job);
Object ci = ReflectionTestUtils.getField(factory, "commitInterval");
assertEquals("wrong chunk-size:", 10, ci);
Object sl = ReflectionTestUtils.getField(factory, "skipLimit");
assertEquals("wrong skip-limit:", 20, sl);
Object rl = ReflectionTestUtils.getField(factory, "retryLimit");
assertEquals("wrong retry-limit:", 3, rl);
Object listeners = ReflectionTestUtils.getField(factory, "listeners");
assertEquals("wrong number of listeners:", 2, ((StepListener[])listeners).length);
Object streams = ReflectionTestUtils.getField(factory, "streams");
assertEquals("wrong number of streams:", 1, ((ItemStream[])streams).length);
JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters());
job.execute(jobExecution);
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
assertEquals(1, jobExecution.getStepExecutions().size());
assertTrue(reader.isExecuted());
assertTrue(reader.isOpened());
assertTrue(processor.isExecuted());
assertTrue(writer.isExecuted());
assertTrue(listener.isExecuted());
}
}

17
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithChunkJobParserTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithSimpleChunkJobParserTests.java
View File

@@ -26,12 +26,16 @@ import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
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.item.SimpleStepFactoryBean;
import org.springframework.batch.item.ItemStream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.util.ReflectionTestUtils;
/**
@@ -40,7 +44,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class StepWithChunkJobParserTests {
public class StepWithSimpleChunkJobParserTests {
@Autowired
private Job job;
@@ -61,6 +65,10 @@ public class StepWithChunkJobParserTests {
@Autowired
private TestWriter writer;
@SuppressWarnings("unchecked")
@Autowired
private SimpleStepFactoryBean factory;
@Before
public void setUp() {
MapJobRepositoryFactoryBean.clear();
@@ -69,11 +77,18 @@ public class StepWithChunkJobParserTests {
@Test
public void testStepWithTask() throws Exception {
assertNotNull(job);
Object ci = ReflectionTestUtils.getField(factory, "commitInterval");
assertEquals("wrong chunk-size:", 10, ci);
Object listeners = ReflectionTestUtils.getField(factory, "listeners");
assertEquals("wrong number of listeners:", 2, ((StepListener[])listeners).length);
Object streams = ReflectionTestUtils.getField(factory, "streams");
assertEquals("wrong number of streams:", 1, ((ItemStream[])streams).length);
JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters());
job.execute(jobExecution);
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
assertEquals(1, jobExecution.getStepExecutions().size());
assertTrue(reader.isExecuted());
assertTrue(reader.isOpened());
assertTrue(processor.isExecuted());
assertTrue(writer.isExecuted());
assertTrue(listener.isExecuted());

28
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestReader.java
View File

@@ -4,11 +4,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemStream;
import org.springframework.batch.item.ItemStreamException;
import org.springframework.batch.item.ParseException;
import org.springframework.batch.item.UnexpectedInputException;
public class TestReader extends AbstractTestComponent implements ItemReader<String> {
public class TestReader extends AbstractTestComponent implements ItemReader<String>, ItemStream {
private boolean opened = false;
List<String> items = null;
@@ -19,6 +24,14 @@ public class TestReader extends AbstractTestComponent implements ItemReader<Stri
this.items = Collections.synchronizedList(l);
}
public boolean isOpened() {
return opened;
}
public void setOpened(boolean opened) {
this.opened = opened;
}
public String read() throws Exception, UnexpectedInputException,
ParseException {
executed = true;
@@ -29,4 +42,17 @@ public class TestReader extends AbstractTestComponent implements ItemReader<Stri
return null;
}
public void close(ExecutionContext executionContext)
throws ItemStreamException {
}
public void open(ExecutionContext executionContext)
throws ItemStreamException {
opened = true;
}
public void update(ExecutionContext executionContext)
throws ItemStreamException {
}
}

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithChunkJobParserTests-context.xml → spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantChunkJobParserTests-context.xml
View File

@@ -7,7 +7,7 @@
<beans:import resource="common-context.xml" />
<job id="job">
<step name="step1">
<step name="ft-step">
<chunk reader="reader" processor="processor" writer="writer"
fault-tolerant="true" chunk-size="10" skip-limit="20" retry-limit="3">
<listeners>

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

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns="http://www.springframework.org/schema/batch" xmlns:beans="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.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<beans:import resource="common-context.xml" />
<job id="job">
<step name="ft-step">
<chunk reader="reader" processor="processor" writer="writer"
fault-tolerant="false" chunk-size="10">
<listeners>
<listener class="org.springframework.batch.core.configuration.xml.TestListener"/>
<listener ref="listener"/>
</listeners>
<streams>
<stream ref="reader"/>
</streams>
</chunk>
</step>
</job>
<beans:bean id="reader" class="org.springframework.batch.core.configuration.xml.TestReader"/>
<beans:bean id="processor" class="org.springframework.batch.core.configuration.xml.TestProcessor"/>
<beans:bean id="writer" class="org.springframework.batch.core.configuration.xml.TestWriter"/>
<beans:bean id="listener" class="org.springframework.batch.core.configuration.xml.TestListener"/>
</beans:beans>