Remove support of @Autowired for configuration properties bean

See gh-8762

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java

@@ -25,7 +25,6 @@
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -151,11 +150,6 @@ private BeanDefinition createBeanDefinition(
 
 		private boolean canBindAtCreationTime(Class<?> type) {
 			List<Constructor<?>> constructors = determineConstructors(type);
-			boolean autowiredPresent = constructors.stream().anyMatch(
-					(c) -> AnnotationUtils.findAnnotation(c, Autowired.class) != null);
-			if (autowiredPresent) {
-				return false;
-			}
 			return (constructors.size() == 1
 					&& constructors.get(0).getParameterCount() > 0);
 		}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java

@@ -808,7 +808,10 @@ public void loadWhenConfigurationPropertiesContainsMapWithPositiveAndNegativeInt
 
 	@Test
 	public void loadWhenConfigurationPropertiesInjectsAnotherBeanShouldNotFail() {
-		load(OtherInjectPropertiesConfiguration.class);
+		assertThatExceptionOfType(ConfigurationPropertiesBindException.class)
+				.isThrownBy(() -> load(OtherInjectPropertiesConfiguration.class))
+				.withMessageContaining(OtherInjectedProperties.class.getName())
+				.withMessageContaining("Failed to bind properties under 'test'");
 	}
 
 	@Test
@@ -1825,7 +1828,6 @@ static class OtherInjectedProperties {
 
 		final DataSizeProperties dataSizeProperties;
 
-		@Autowired
 		OtherInjectedProperties(ObjectProvider<DataSizeProperties> dataSizeProperties) {
 			this.dataSizeProperties = dataSizeProperties.getIfUnique();
 		}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelectorTests.java

@@ -19,7 +19,6 @@
 
 import org.junit.Test;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
@@ -70,23 +69,13 @@ public void typeWithDefaultConstructorShouldRegisterGenericBeanDefinition()
 		assertThat(beanDefinition).isExactlyInstanceOf(GenericBeanDefinition.class);
 	}
 
-	@Test
-	public void typeWithAutowiredOnConstructorShouldRegisterGenericBeanDefinition()
-			throws Exception {
-		this.registrar.registerBeanDefinitions(
-				getAnnotationMetadata(TestConfiguration.class), this.beanFactory);
-		BeanDefinition beanDefinition = this.beanFactory.getBeanDefinition(
-				"bar-org.springframework.boot.context.properties.EnableConfigurationPropertiesImportSelectorTests$BarProperties");
-		assertThat(beanDefinition).isExactlyInstanceOf(GenericBeanDefinition.class);
-	}
-
 	@Test
 	public void typeWithOneConstructorWithParametersShouldRegisterConfigurationPropertiesBeanDefinition()
 			throws Exception {
 		this.registrar.registerBeanDefinitions(
 				getAnnotationMetadata(TestConfiguration.class), this.beanFactory);
 		BeanDefinition beanDefinition = this.beanFactory.getBeanDefinition(
-				"baz-org.springframework.boot.context.properties.EnableConfigurationPropertiesImportSelectorTests$BazProperties");
+				"bar-org.springframework.boot.context.properties.EnableConfigurationPropertiesImportSelectorTests$BarProperties");
 		assertThat(beanDefinition)
 				.isExactlyInstanceOf(ConfigurationPropertiesBeanDefinition.class);
 	}
@@ -135,7 +124,7 @@ private AnnotationMetadata getAnnotationMetadata(Class<?> source) throws IOExcep
 	}
 
 	@EnableConfigurationProperties({ FooProperties.class, BarProperties.class,
-			BazProperties.class, BingProperties.class })
+			BingProperties.class })
 	static class TestConfiguration {
 
 	}
@@ -163,22 +152,12 @@ static class FooProperties {
 	@ConfigurationProperties(prefix = "bar")
 	public static class BarProperties {
 
-		@Autowired
 		public BarProperties(String foo) {
 
 		}
 
 	}
 
-	@ConfigurationProperties(prefix = "baz")
-	public static class BazProperties {
-
-		public BazProperties(String foo) {
-
-		}
-
-	}
-
 	@ConfigurationProperties(prefix = "bing")
 	public static class BingProperties {
 

spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/KotlinEnableConfigurationPropertiesImportSelectorTests.kt

@@ -2,7 +2,6 @@ package org.springframework.boot.context.properties
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.support.DefaultListableBeanFactory
 import org.springframework.beans.factory.support.GenericBeanDefinition
 import org.springframework.core.type.AnnotationMetadata
@@ -29,21 +28,12 @@ class KotlinEnableConfigurationPropertiesImportSelectorTests {
 		assertThat(beanDefinition).isExactlyInstanceOf(GenericBeanDefinition::class.java)
 	}
 
-	@Test
-	fun `type with autowired on constructor should register generic bean definition`() {
-		this.registrar.registerBeanDefinitions(
-				getAnnotationMetadata(TestConfiguration::class.java), this.beanFactory)
-		val beanDefinition = this.beanFactory.getBeanDefinition(
-				"bar-org.springframework.boot.context.properties.KotlinEnableConfigurationPropertiesImportSelectorTests\$BarProperties")
-		assertThat(beanDefinition).isExactlyInstanceOf(GenericBeanDefinition::class.java)
-	}
-
 	@Test
 	fun `type with primary constructor and no autowired should register configuration properties bean definition`() {
 		this.registrar.registerBeanDefinitions(
 				getAnnotationMetadata(TestConfiguration::class.java), this.beanFactory)
 		val beanDefinition = this.beanFactory.getBeanDefinition(
-				"baz-org.springframework.boot.context.properties.KotlinEnableConfigurationPropertiesImportSelectorTests\$BazProperties")
+				"bar-org.springframework.boot.context.properties.KotlinEnableConfigurationPropertiesImportSelectorTests\$BarProperties")
 		assertThat(beanDefinition).isExactlyInstanceOf(
 				ConfigurationPropertiesBeanDefinition::class.java)
 	}
@@ -64,17 +54,14 @@ class KotlinEnableConfigurationPropertiesImportSelectorTests {
 
 
 	@EnableConfigurationProperties(FooProperties::class, BarProperties::class,
-			BazProperties::class, BingProperties::class)
+			BingProperties::class)
 	class TestConfiguration
 
 	@ConfigurationProperties(prefix = "foo")
 	class FooProperties
 
 	@ConfigurationProperties(prefix = "bar")
-	class BarProperties @Autowired constructor(val foo: String)
-
-	@ConfigurationProperties(prefix = "baz")
-	class BazProperties(val name: String?, val counter: Int = 42)
+	class BarProperties(val name: String?, val counter: Int = 42)
 
 	@ConfigurationProperties(prefix = "bing")
 	class BingProperties {