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

RESOLVED - BATCH-1066: StepParser updated to throw error if 'next' attribute and transition elements are both found.

Browse Source
This commit is contained in:
dhgarrette
2009-02-07 00:05:43 +00:00
parent dfb78ff0ca
commit eb4991efe7
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@ public class StepParser {
List<Element> transitionElements = (List<Element>) DomUtils.getChildElementsByTagName(element,
transitionName);
for (Element transitionElement : transitionElements) {
verifyUniquePattern(element, parserContext, hasNextAttribute, transitionElement, patterns);
verifyUniquePattern(transitionElement, patterns, element, parserContext);
list.addAll(parseTransitionElement(transitionElement, stateDef, parserContext));
transitionElementExists = true;
}
@@ -138,25 +138,23 @@ public class StepParser {
list.addAll(createTransition(BatchStatus.COMPLETED, null, null, null, stateDef, parserContext));
}
}
else if (hasNextAttribute) {
parserContext.getReaderContext().error("Step may not contain a 'next' attribute and a transition element",
element);
}
return list;
}
/**
* @param element
* @param parserContext the parser context for the bean factory
* @param hasNextAttribute
* @param transitionElement The element to parse
* @param patterns a list of patterns on state transitions for this element
* @param element
* @param parserContext the parser context for the bean factory
*/
private static void verifyUniquePattern(Element element, ParserContext parserContext, boolean hasNextAttribute,
Element transitionElement, List<String> patterns) {
private static void verifyUniquePattern(Element transitionElement, List<String> patterns, Element element,
ParserContext parserContext) {
String onAttribute = transitionElement.getAttribute("on");
if (hasNextAttribute && onAttribute.equals("*")) {
parserContext.getReaderContext().error(
"Duplicate transition pattern found. "
+ "Specify one of next= attribute at step level and next element with on='*'", element);
}
if (patterns.contains(onAttribute)) {
parserContext.getReaderContext().error("Duplicate transition pattern found for '" + onAttribute + "'",
element);

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

@@ -8,7 +8,7 @@
<job id="job">
<step name="step1" next="step3">
<next on="*" to="step2" />
<next on="COMPLETED WITH SKIPS" to="step2" />
</step>
<step name="step2" />
<step name="step3" />