From a8a6f27e83c50ea80e8937511286f91456cb3bbe Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Fri, 20 Mar 2009 15:01:11 +0000
Subject: [PATCH] BATCH-1129: move <no-rollback-*/> up to <step/> in schema.

---
 .../configuration/xml/AbstractStepParser.java | 21 +++++++++
 .../xml/TaskletElementParser.java             |  2 -
 .../configuration/xml/spring-batch-2.0.xsd    | 37 ++++++++-------
 ...tepParserBadRetryListenerTests-context.xml | 39 +++++++--------
 ...epParserTaskletAttributesTests-context.xml | 37 +++++++--------
 ...erantProcessTaskJobParserTests-context.xml | 47 +++++++++----------
 6 files changed, 97 insertions(+), 86 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java
index 37b0d3c31..38b075b9d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java
@@ -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;
@@ -148,6 +149,8 @@ public abstract class AbstractStepParser {
 		}
 
 		handleListenersElement(stepElement, bd, parserContext);
+		
+		handleExceptionElement(stepElement, parserContext, bd, "no-rollback-exception-classes", "noRollbackExceptionClasses");
 
 		bd.setRole(BeanDefinition.ROLE_SUPPORT);
 
@@ -155,6 +158,24 @@ public abstract class AbstractStepParser {
 
 	}
 
+	@SuppressWarnings("unchecked")
+	private void handleExceptionElement(Element element, ParserContext parserContext, BeanDefinition bd,
+			String subElementName, String propertyName) {
+		Element child = DomUtils.getChildElementByTagName(element, subElementName);
+		if (child != null) {
+			String exceptions = DomUtils.getTextValue(child);
+			if (StringUtils.hasLength(exceptions)) {
+				String[] exceptionArray = StringUtils.tokenizeToStringArray(exceptions, ",\n");
+				if (exceptionArray.length > 0) {
+					ManagedList managedList = new ManagedList();
+					managedList.setMergeEnabled(Boolean.valueOf(child.getAttribute("merge")));
+					managedList.addAll(Arrays.asList(exceptionArray));
+					bd.getPropertyValues().addPropertyValue(propertyName, managedList);
+				}
+			}
+		}
+	}
+
 	private void checkStepAttributes(Element stepElement, AbstractBeanDefinition bd) {
 		String startLimit = stepElement.getAttribute("start-limit");
 		if (StringUtils.hasText(startLimit)) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletElementParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletElementParser.java
index 92a728dc5..96ec46510 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletElementParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletElementParser.java
@@ -123,8 +123,6 @@ public class TaskletElementParser {
 
 		handleExceptionElement(element, parserContext, bd, "fatal-exception-classes", "fatalExceptionClasses");
 
-		handleExceptionElement(element, parserContext, bd, "no-rollback-exception-classes", "noRollbackExceptionClasses");
-
 		handleRetryListenersElement(element, bd, parserContext);
 
 		handleStreamsElement(element, bd, parserContext);
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
index f024c7619..f79f7ec78 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
@@ -289,6 +289,23 @@
 		<xsd:choice>
 			<xsd:element name="tasklet" type="taskletType" />
 			<xsd:element name="transaction-attributes" type="transaction-attributesType" />
+			<xsd:element name="no-rollback-exception-classes" minOccurs="0" maxOccurs="1">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+					List of exception classes that should not cause rollback if possible.  This list
+					is only a hint and has to be interpreted by the step to make sense in context.  
+					Separate each attribute with a comma or a newline.
+					]]>
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:simpleContent>
+						<xsd:extension base="xsd:string">
+							<xsd:attributeGroup ref="mergeAttribute" />
+						</xsd:extension>
+					</xsd:simpleContent>
+				</xsd:complexType>
+			</xsd:element>
 			<xsd:element name="listeners" type="stepListenersType" />
 		</xsd:choice>
 	</xsd:group>
@@ -386,24 +403,8 @@
 			<xsd:element name="skippable-exception-classes" minOccurs="0" maxOccurs="1">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-					List of exception classes that are skippable.  
-					Separate each attribute with a comma or a newline.
-					]]>
-					</xsd:documentation>
-				</xsd:annotation>
-				<xsd:complexType>
-					<xsd:simpleContent>
-						<xsd:extension base="xsd:string">
-							<xsd:attributeGroup ref="mergeAttribute" />
-						</xsd:extension>
-					</xsd:simpleContent>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="no-rollback-exception-classes" minOccurs="0" maxOccurs="1">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-					List of exception classes that should not cause rollback if possible.  This list
-					is only a hint and has to be interpreted by the step to make sense in context.  
+					List of exception classes that are skippable.  Exceptions that are already marked as no-rollback
+					are automatically skippable (but it doesn't hurt to add them again here).
 					Separate each attribute with a comma or a newline.
 					]]>
 					</xsd:documentation>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml
index e946d8aa4..b477a3d73 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml
@@ -5,44 +5,41 @@
 	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 id="step">
-			<tasklet 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">
+			<tasklet 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">
 				<retry-listeners>
-					<listener class="org.springframework.batch.core.configuration.xml.TestRetryListener" ref="retryListener"/>
+					<listener class="org.springframework.batch.core.configuration.xml.TestRetryListener" ref="retryListener" />
 				</retry-listeners>
 				<streams>
-					<stream ref="reader"/>
+					<stream ref="reader" />
 				</streams>
 				<skippable-exception-classes>
 					org.springframework.dao.DataIntegrityViolationException,
 				</skippable-exception-classes>
-				<no-rollback-exception-classes>
+			</tasklet>
+			<transaction-attributes propagation="REQUIRED" isolation="DEFAULT" timeout="10" />
+			<no-rollback-exception-classes>
 					org.springframework.dao.DataIntegrityViolationException
 				</no-rollback-exception-classes>
-			</tasklet>
-			<transaction-attributes propagation="REQUIRED" isolation="DEFAULT" timeout="10"/>
 			<listeners>
-				<listener ref="listener"/>
+				<listener ref="listener" />
 			</listeners>
 		</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="reader" class="org.springframework.batch.core.configuration.xml.TestReader" />
 
-	<beans:bean id="listener" class="org.springframework.batch.core.configuration.xml.TestListener"/>
+	<beans:bean id="processor" class="org.springframework.batch.core.configuration.xml.TestProcessor" />
 
-	<beans:bean id="retryListener" class="org.springframework.batch.core.configuration.xml.TestRetryListener"/>
-	
-	<beans:bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ConcurrentTaskExecutor"/>
+	<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:bean id="retryListener" class="org.springframework.batch.core.configuration.xml.TestRetryListener" />
+
+	<beans:bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ConcurrentTaskExecutor" />
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml
index 11a08afa2..feb249ed1 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml
@@ -6,16 +6,13 @@
 
 	<job id="job">
 		<step id="step" start-limit="25" allow-start-if-complete="true">
-			<tasklet 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">
+			<tasklet 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">
 				<retry-listeners>
-					<listener class="org.springframework.batch.core.configuration.xml.TestRetryListener"/>
+					<listener class="org.springframework.batch.core.configuration.xml.TestRetryListener" />
 				</retry-listeners>
 				<streams>
-					<stream ref="reader"/>
+					<stream ref="reader" />
 				</streams>
 				<fatal-exception-classes>
 					org.springframework.jdbc.BadSqlGrammarException
@@ -23,26 +20,26 @@
 				<skippable-exception-classes>
 					org.springframework.dao.DataIntegrityViolationException
 				</skippable-exception-classes>
-				<no-rollback-exception-classes>
-					org.springframework.dao.DataIntegrityViolationException
-				</no-rollback-exception-classes>
 			</tasklet>
-			<transaction-attributes propagation="REQUIRED" isolation="DEFAULT" timeout="10"/>
+			<transaction-attributes propagation="REQUIRED" isolation="DEFAULT" timeout="10" />
+			<no-rollback-exception-classes>
+					org.springframework.dao.DataIntegrityViolationException
+			</no-rollback-exception-classes>
 			<listeners>
-				<listener ref="listener"/>
+				<listener ref="listener" />
 			</listeners>
 		</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="reader" class="org.springframework.batch.core.configuration.xml.TestReader" />
 
-	<beans:bean id="listener" class="org.springframework.batch.core.configuration.xml.TestListener"/>
-	
-	<beans:bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ConcurrentTaskExecutor"/>
+	<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:bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ConcurrentTaskExecutor" />
 
 	<beans:bean id="transactionManager" class="org.springframework.batch.support.transaction.ResourcelessTransactionManager" />
 
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml
index c9ae78b46..f96cce0a6 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml
@@ -5,46 +5,43 @@
 	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 id="step">
-			<tasklet 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">
+			<tasklet 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">
 				<retry-listeners>
-					<listener ref="retryListener"/>
-					<listener class="org.springframework.batch.core.configuration.xml.TestRetryListener"/>
+					<listener ref="retryListener" />
+					<listener class="org.springframework.batch.core.configuration.xml.TestRetryListener" />
 				</retry-listeners>
 				<streams>
-					<stream ref="reader"/>
+					<stream ref="reader" />
 				</streams>
 				<skippable-exception-classes>
 					org.springframework.dao.DataIntegrityViolationException
 				</skippable-exception-classes>
-				<no-rollback-exception-classes>
-					org.springframework.dao.DataIntegrityViolationException
-				</no-rollback-exception-classes>
 			</tasklet>
-			<transaction-attributes propagation="REQUIRED" isolation="DEFAULT" timeout="10"/>
+			<transaction-attributes propagation="REQUIRED" isolation="DEFAULT" timeout="10" />
+			<no-rollback-exception-classes>
+				org.springframework.dao.DataIntegrityViolationException
+			</no-rollback-exception-classes>
 			<listeners>
-				<listener class="org.springframework.batch.core.configuration.xml.TestListener"/>
-				<listener ref="listener"/>
+				<listener class="org.springframework.batch.core.configuration.xml.TestListener" />
+				<listener ref="listener" />
 			</listeners>
 		</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="reader" class="org.springframework.batch.core.configuration.xml.TestReader" />
 
-	<beans:bean id="listener" class="org.springframework.batch.core.configuration.xml.TestListener"/>
-	
-	<beans:bean id="retryListener" class="org.springframework.batch.core.configuration.xml.TestRetryListener"/>
-	
-	<beans:bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ConcurrentTaskExecutor"/>
+	<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:bean id="retryListener" class="org.springframework.batch.core.configuration.xml.TestRetryListener" />
+
+	<beans:bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ConcurrentTaskExecutor" />
 
 </beans:beans>
\ No newline at end of file