BATCH-1863: The batch namespace can not be used with allowBeanDefinitionOverriding=false

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/InlineFlowParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2013 the original author or authors.
+ * Copyright 2006-2014 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.
@@ -28,7 +28,6 @@ import org.w3c.dom.Element;
  *
  */
 public class InlineFlowParser extends AbstractFlowParser {
-
 	private final String flowName;
 
 	/**
@@ -45,13 +44,17 @@ public class InlineFlowParser extends AbstractFlowParser {
 
 	}
 
+	@Override
+	protected boolean shouldGenerateId() {
+		return true;
+	}
+
 	/**
 	 * @param element the top level element containing a flow definition
 	 * @param parserContext the {@link ParserContext}
 	 */
 	@Override
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-
 		builder.getRawBeanDefinition().setAttribute("flowName", flowName);
 		builder.addPropertyValue("name", flowName);
 		builder.addPropertyValue("stateTransitionComparator", new RuntimeBeanReference(DefaultStateTransitionComparator.STATE_TRANSITION_COMPARATOR));
@@ -60,5 +63,4 @@ public class InlineFlowParser extends AbstractFlowParser {
 		parserContext.popAndRegisterContainingComponent();
 
 	}
-
 }

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BeanDefinitionOverrideTests.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 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 org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * <p>
+ * Test cases for BATCH-1863.
+ * </p>
+ */
+public class BeanDefinitionOverrideTests {
+	@Test
+	public void testAllowBeanOverride() {
+		ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext();
+		applicationContext.setConfigLocation("org/springframework/batch/core/configuration/xml/BeanDefinitionOverrideTests-context.xml");
+		applicationContext.refresh();
+	}
+
+	@Test
+	public void testAllowBeanOverrideFalse() {
+		ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext();
+		applicationContext.setAllowBeanDefinitionOverriding(false);
+		applicationContext.setConfigLocation("org/springframework/batch/core/configuration/xml/BeanDefinitionOverrideTests-context.xml");
+		applicationContext.refresh();
+	}
+}

spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/BeanDefinitionOverrideTests-context.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:batch="http://www.springframework.org/schema/batch"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+	   http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/batch
+		http://www.springframework.org/schema/batch/spring-batch.xsd">
+
+	<batch:job id="testJob">
+		<batch:step id="step1">
+			<batch:tasklet>
+				<batch:chunk reader="reader" writer="writer" commit-interval="1"/>
+			</batch:tasklet>
+		</batch:step>
+	</batch:job>
+
+	<bean id="jobRepository" class="org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean"/>
+	<bean id="transactionManager" class="org.springframework.batch.support.transaction.ResourcelessTransactionManager"/>
+
+	<bean id="reader" class="org.springframework.batch.core.configuration.xml.DummyItemReader"/>
+	<bean id="writer" class="org.springframework.batch.core.configuration.xml.DummyItemWriter"/>
+</beans>