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

BATCH-1250: <job/> should disallow <decision/>, <split/>, and <step/> if abstract="true"

Browse Source
This commit is contained in:
dhgarrette
2009-05-27 17:32:11 +00:00
parent 472ccb2580
commit 65ca7ea129
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespaceUtils.java
View File

@@ -146,7 +146,16 @@ public class CoreNamespaceUtils {
* @return TRUE if the element is abstract or has a parent
*/
public static boolean isUnderspecified(Element element) {
return Boolean.valueOf(element.getAttribute("abstract")) || StringUtils.hasText(element.getAttribute("parent"));
return isAbstract(element) || StringUtils.hasText(element.getAttribute("parent"));
}
/**
* @param element
* @return TRUE if the element is abstract
*/
public static boolean isAbstract(Element element) {
String abstractAttr = element.getAttribute("abstract");
return StringUtils.hasText(abstractAttr) && Boolean.valueOf(abstractAttr);
}
}

2
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java
View File

@@ -132,7 +132,7 @@ public class FlowParser extends AbstractSingleBeanDefinitionParser {
}
}
if (!stepExists && !CoreNamespaceUtils.isUnderspecified(element)) {
if (!stepExists && !StringUtils.hasText(element.getAttribute("parent"))) {
parserContext.getReaderContext().error("The flow [" + flowName + "] must contain at least one step",
element);
}

24
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParser.java
View File

@@ -15,6 +15,7 @@
*/
package org.springframework.batch.core.configuration.xml;
import java.util.Arrays;
import java.util.List;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -62,10 +63,8 @@ public class JobParser extends AbstractSingleBeanDefinitionParser {
String jobName = element.getAttribute("id");
builder.addConstructorArgValue(jobName);
String isAbstract = element.getAttribute("abstract");
if (StringUtils.hasText(isAbstract)) {
builder.setAbstract(Boolean.valueOf(isAbstract));
}
boolean isAbstract = CoreNamespaceUtils.isAbstract(element);
builder.setAbstract(isAbstract);
String parentRef = element.getAttribute("parent");
if (StringUtils.hasText(parentRef)) {
@@ -87,9 +86,20 @@ public class JobParser extends AbstractSingleBeanDefinitionParser {
builder.addPropertyReference("jobParametersIncrementer", incrementer);
}
FlowParser flowParser = new FlowParser(jobName, jobName);
BeanDefinition flowDef = flowParser.parse(element, parserContext);
builder.addPropertyValue("flow", flowDef);
if (isAbstract) {
for (String tagName : Arrays.asList("step", "decision", "split")) {
if (!DomUtils.getChildElementsByTagName(element, tagName).isEmpty()) {
parserContext.getReaderContext().error(
"The <" + tagName + "/> element may not appear on a <job/> with abstract=\"true\" ["
+ jobName + "]", element);
}
}
}
else {
FlowParser flowParser = new FlowParser(jobName, jobName);
BeanDefinition flowDef = flowParser.parse(element, parserContext);
builder.addPropertyValue("flow", flowDef);
}
List<Element> listenersElements = DomUtils.getChildElementsByTagName(element, "listeners");
if (listenersElements.size() == 1) {