BATCH-2023: Change default @StepScope proxy mode to INTERFACES

Author: Dave Syer

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/StepScope.java

@@ -30,7 +30,7 @@
  * @Since 2.2
  *
  */
-@Scope(value = "step", proxyMode = ScopedProxyMode.INTERFACES)
+@Scope(value = "step", proxyMode = ScopedProxyMode.TARGET_CLASS)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface StepScope {

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

@@ -103,16 +103,26 @@ public void testIntentionallyBlowUpOnMissingContextWithProxyTargetClass() throws
 	}
 
 	@Test
-	public void testStepScopeWithInterface() throws Exception {
-		init(StepScopeConfigurationWithInterface.class);
+	public void testIntentionallyBlowupWithForcedInterface() throws Exception {
+		init(StepScopeConfigurationForcingInterfaceProxy.class);
+		StepSynchronizationManager.release();
+		expected.expect(BeanCreationException.class);
+		expected.expectMessage("step scope");
+		SimpleHolder value = context.getBean(SimpleHolder.class);
+		assertEquals("STEP", value.call());
+	}
+
+	@Test
+	public void testStepScopeWithDefaults() throws Exception {
+		init(StepScopeConfigurationWithDefaults.class);
 		@SuppressWarnings("unchecked")
 		Callable<String> value = context.getBean(Callable.class);
 		assertEquals("STEP", value.call());
 	}
 
 	@Test
 	public void testIntentionallyBlowUpOnMissingContextWithInterface() throws Exception {
-		init(StepScopeConfigurationWithInterface.class);
+		init(StepScopeConfigurationWithDefaults.class);
 		StepSynchronizationManager.release();
 		expected.expect(BeanCreationException.class);
 		expected.expectMessage("step scope");
@@ -222,7 +232,7 @@ protected SimpleHolder value(@Value("#{stepExecution.stepName}")
 
 	@Configuration
 	@EnableBatchProcessing
-	public static class StepScopeConfigurationWithInterface {
+	public static class StepScopeConfigurationWithDefaults {
 
 		@Bean
 		@StepScope
@@ -233,4 +243,17 @@ protected Callable<String> value(@Value("#{stepExecution.stepName}")
 
 	}
 
+	@Configuration
+	@EnableBatchProcessing
+	public static class StepScopeConfigurationForcingInterfaceProxy {
+
+		@Bean
+		@Scope(value="step", proxyMode = ScopedProxyMode.INTERFACES)
+		protected SimpleHolder value(@Value("#{stepExecution.stepName}")
+		final String value) {
+			return new SimpleHolder(value);
+		}
+
+	}
+
 }