BATCH-2552 BeanDefinitionStoreException with StepScope

Fixes BATCH-2552
Fixes spring-projects#1050

Author: mederel

spring-batch-core/src/main/java/org/springframework/batch/core/scope/BatchScopeSupport.java

@@ -26,6 +26,7 @@
 import org.springframework.beans.factory.config.Scope;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.Ordered;
 import org.springframework.util.Assert;
 import org.springframework.util.StringValueResolver;
@@ -127,6 +128,9 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 				scopifier.visitBeanDefinition(definition);
 
 				if (scoped && !definition.isAbstract()) {
+					if (beanFactory instanceof DefaultListableBeanFactory) {
+						((DefaultListableBeanFactory)beanFactory).removeBeanDefinition(beanName);
+					}
 					createScopedProxy(beanName, definition, registry, proxyTargetClass);
 				}
 			}
@@ -139,7 +143,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 	 * after the {@link StepContext} is available. Amounts to adding
 	 * <aop-auto-proxy/> to a step scoped bean.
 	 *
-	 * @param beanName the bean name to replace
+	 * @param targetProxyBeanName the bean name to replace
 	 * @param definition the bean definition to replace
 	 * @param registry the enclosing {@link BeanDefinitionRegistry}
 	 * @param proxyTargetClass true if we need to force use of dynamic
@@ -148,15 +152,14 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 	 * target. Caller should register it if needed to be visible at top level in
 	 * bean factory.
 	 */
-	protected static BeanDefinitionHolder createScopedProxy(String beanName, BeanDefinition definition,
+	protected static BeanDefinitionHolder createScopedProxy(String targetProxyBeanName, BeanDefinition definition,
 			BeanDefinitionRegistry registry, boolean proxyTargetClass) {
-
 		BeanDefinitionHolder proxyHolder;
 
-		proxyHolder = ScopedProxyUtils.createScopedProxy(new BeanDefinitionHolder(definition, beanName), registry,
+		proxyHolder = ScopedProxyUtils.createScopedProxy(new BeanDefinitionHolder(definition, targetProxyBeanName), registry,
 				proxyTargetClass);
 
-		registry.registerBeanDefinition(beanName, proxyHolder.getBeanDefinition());
+		registry.registerBeanDefinition(targetProxyBeanName, proxyHolder.getBeanDefinition());
 
 		return proxyHolder;
 

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java

@@ -148,6 +148,13 @@ public void testIntentionallyBlowUpOnMissingContextWithInterface() throws Except
 		Callable<String> value = context.getBean(Callable.class);
 		assertEquals("STEP", value.call());
 	}
+	
+	@Test
+	public void testStepScopeAnnotationWithoutEnableBatchProcessing() throws Exception {
+		init(StepScopeConfigurationWithoutEnableBatchProcessing.class);
+		Callable value = context.getBean(Callable.class);
+		assertEquals("STEP", value.call());
+	}
 
 	public void init(Class<?>... config) throws Exception {
 		Class<?>[] configs = new Class<?>[config.length + 1];
@@ -296,4 +303,19 @@ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkCon
 			return RepeatStatus.FINISHED;
 		}
 	}
+	
+	@Configuration
+	public static class StepScopeConfigurationWithoutEnableBatchProcessing {
+		@Bean
+		public static org.springframework.batch.core.scope.StepScope stepScope() {
+			return new org.springframework.batch.core.scope.StepScope();
+		}
+		
+		@Bean
+		@StepScope
+		protected Callable<String> value(@Value("#{stepExecution.stepName}")
+		final String value) {
+			return new SimpleCallable(value);
+		}
+	}
 }