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

RESOLVED - BATCH-1248: Removed default from "merge" attribute in XSD

Browse Source
This commit is contained in:
dhgarrette
2009-05-22 01:13:10 +00:00
parent ded9ede29e
commit b7e6150453
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java
View File

@@ -207,7 +207,8 @@ public abstract class AbstractStepParser {
String[] exceptionArray = StringUtils.tokenizeToStringArray(exceptions, ",\n");
if (exceptionArray.length > 0) {
ManagedList managedList = new ManagedList();
managedList.setMergeEnabled(Boolean.valueOf(child.getAttribute(MERGE_ATTR)));
managedList.setMergeEnabled(child.hasAttribute(MERGE_ATTR)
&& Boolean.valueOf(child.getAttribute(MERGE_ATTR)));
managedList.addAll(Arrays.asList(exceptionArray));
propertyValues.addPropertyValue(propertyName, managedList);
}
@@ -242,7 +243,8 @@ public abstract class AbstractStepParser {
parserContext.extractSource(stepElement));
parserContext.pushContainingComponent(compositeDef);
ManagedList listenerBeans = new ManagedList();
listenerBeans.setMergeEnabled(Boolean.valueOf(listenersElement.getAttribute(MERGE_ATTR)));
listenerBeans.setMergeEnabled(listenersElement.hasAttribute(MERGE_ATTR)
&& Boolean.valueOf(listenersElement.getAttribute(MERGE_ATTR)));
List<Element> listenerElements = DomUtils.getChildElementsByTagName(listenersElement, "listener");
if (listenerElements != null) {
for (Element listenerElement : listenerElements) {

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

@@ -155,7 +155,8 @@ public class ChunkElementParser {
parserContext.extractSource(element));
parserContext.pushContainingComponent(compositeDef);
ManagedList retryListenerBeans = new ManagedList();
retryListenerBeans.setMergeEnabled(Boolean.valueOf(listenersElement.getAttribute(MERGE_ATTR)));
retryListenerBeans.setMergeEnabled(listenersElement.hasAttribute(MERGE_ATTR)
&& Boolean.valueOf(listenersElement.getAttribute(MERGE_ATTR)));
handleRetryListenerElements(parserContext, listenersElement, retryListenerBeans);
propertyValues.addPropertyValue("retryListeners", retryListenerBeans);
parserContext.popAndRegisterContainingComponent();
@@ -215,7 +216,8 @@ public class ChunkElementParser {
Element streamsElement = DomUtils.getChildElementByTagName(element, "streams");
if (streamsElement != null) {
ManagedList streamBeans = new ManagedList();
streamBeans.setMergeEnabled(Boolean.valueOf(streamsElement.getAttribute(MERGE_ATTR)));
streamBeans.setMergeEnabled(streamsElement.hasAttribute(MERGE_ATTR)
&& Boolean.valueOf(streamsElement.getAttribute(MERGE_ATTR)));
List<Element> streamElements = DomUtils.getChildElementsByTagName(streamsElement, "stream");
if (streamElements != null) {
for (Element streamElement : streamElements) {

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

@@ -36,6 +36,8 @@ import org.w3c.dom.Element;
*/
public class JobParser extends AbstractSingleBeanDefinitionParser {
private static final String MERGE_ATTR = "merge";
private static final JobExecutionListenerParser jobListenerParser = new JobExecutionListenerParser();
@Override
@@ -96,7 +98,8 @@ public class JobParser extends AbstractSingleBeanDefinitionParser {
parserContext.extractSource(element));
parserContext.pushContainingComponent(compositeDef);
ManagedList listeners = new ManagedList();
listeners.setMergeEnabled(Boolean.valueOf(listenersElement.getAttribute("merge")));
listeners.setMergeEnabled(listenersElement.hasAttribute(MERGE_ATTR)
&& Boolean.valueOf(listenersElement.getAttribute(MERGE_ATTR)));
List<Element> listenerElements = (List<Element>) DomUtils.getChildElementsByTagName(listenersElement,
"listener");
for (Element listenerElement : listenerElements) {

2
spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
View File

@@ -811,7 +811,7 @@
</xsd:attributeGroup>
<xsd:attributeGroup name="mergeAttribute">
<xsd:attribute name="merge" type="xsd:boolean" default="false" use="optional">
<xsd:attribute name="merge" type="xsd:boolean" use="optional">
<xsd:annotation>
<xsd:documentation>
Should this list be merged with the corresponding list provided