Remove @ImmutableConfigurationProperties

Closes gh-18563

Author: wilkinsona

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -849,10 +849,12 @@ The example in the previous section can be rewritten in an immutable fashion as
 	import java.net.InetAddress;
 	import java.util.List;
 
-	import org.springframework.boot.context.properties.ImmutableConfigurationProperties;
+	import org.springframework.boot.context.properties.ConfigurationProperties;
+	import org.springframework.boot.context.properties.ConstructorBinding;
 	import org.springframework.boot.context.properties.DefaultValue;
 
-	@ImmutableConfigurationProperties("acme")
+	@ConstructorBinding
+	@ConfigurationProperties("acme")
 	public class AcmeProperties {
 
 		private final boolean enabled;
@@ -899,18 +901,17 @@ The example in the previous section can be rewritten in an immutable fashion as
 	}
 ----
 
-In this setup, the `@ImmutableConfigurationProperties` annotation is used to indicate that constructor binding should be used.
+In this setup, the `@ConstructorBinding` annotation is used to indicate that constructor binding should be used.
 This means that the binder will expect to find a constructor with the parameters that you wish to have bound.
 
-Nested members of a `@ImmutableConfigurationProperties` class (such as `Security` in the example above) will also be bound via their constructor.
+Nested members of a `@ConstructorBinding` class (such as `Security` in the example above) will also be bound via their constructor.
 
 Default values can be specified using `@DefaultValue` and the same conversion service will be applied to coerce the `String` value to the target type of a missing property.
 
 NOTE: To use constructor binding the class must be enabled using `@EnableConfigurationProperties` or configuration property scanning.
 You cannot use constructor binding with beans that are created by the regular Spring mechanisms (e.g. `@Component` beans, beans created via `@Bean` methods or beans loaded using `@Import`)
 
-TIP: `@ImmutableConfigurationProperties` is actually a meta-annotation composed of `@ConfigurationProperties` and `@ConstructorBinding`.
-If you  have more than one constructor for your class you can also use `@ConstructorBinding` directly on actual constructor that should be bound.
+TIP: If you have more than one constructor for your class you can also use `@ConstructorBinding` directly on the constructor that should be bound.
 
 
 

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/ExampleProperties.java

@@ -16,16 +16,19 @@
 
 package org.springframework.boot.test.autoconfigure.web.client;
 
-import org.springframework.boot.context.properties.ImmutableConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConstructorBinding;
 import org.springframework.boot.context.properties.bind.DefaultValue;
 
 /**
- * Example {@link ImmutableConfigurationProperties @ImmutableConfigurationProperties} used
- * to test the use of configuration properties scan with sliced test.
+ * Example {@link ConstructorBinding constructor-bound}
+ * {@link ConfigurationProperties @ConfigurationProperties} used to test the use of
+ * configuration properties scan with sliced test.
  *
  * @author Stephane Nicoll
  */
-@ImmutableConfigurationProperties("example")
+@ConstructorBinding
+@ConfigurationProperties("example")
 public class ExampleProperties {
 
 	private final String name;

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

@@ -40,7 +40,6 @@
  * @since 1.0.0
  * @see ConfigurationPropertiesScan
  * @see ConstructorBinding
- * @see ImmutableConfigurationProperties
  * @see ConfigurationPropertiesBindingPostProcessor
  * @see EnableConfigurationProperties
  */

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

@@ -30,7 +30,6 @@
  * @author Phillip Webb
  * @since 2.2.0
  * @see ConfigurationProperties
- * @see ImmutableConfigurationProperties
  */
 @Target({ ElementType.TYPE, ElementType.CONSTRUCTOR })
 @Retention(RetentionPolicy.RUNTIME)

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

@@ -90,7 +90,8 @@ static class NoAnnotationConfigurationProperties {
 
 	}
 
-	@ImmutableConfigurationProperties("valuecp")
+	@ConstructorBinding
+	@ConfigurationProperties("valuecp")
 	static class ValueObjectConfigurationProperties {
 
 		ValueObjectConfigurationProperties(String name) {

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

@@ -202,12 +202,6 @@ void bindTypeForClassWhenNoConstructorBindingOnTypeReturnsValueObject() {
 		assertThat(bindType).isEqualTo(BindMethod.VALUE_OBJECT);
 	}
 
-	@Test
-	void bindTypeForClassWhenNoMetaConstructorBindingOnTypeReturnsValueObject() {
-		BindMethod bindType = BindMethod.forClass(MetaConstructorBindingOnType.class);
-		assertThat(bindType).isEqualTo(BindMethod.VALUE_OBJECT);
-	}
-
 	@Test
 	void bindTypeForClassWhenNoConstructorBindingOnConstructorReturnsValueObject() {
 		BindMethod bindType = BindMethod.forClass(ConstructorBindingOnConstructor.class);
@@ -383,14 +377,6 @@ static class ConstructorBindingOnType {
 
 	}
 
-	@ImmutableConfigurationProperties
-	static class MetaConstructorBindingOnType {
-
-		MetaConstructorBindingOnType(String name) {
-		}
-
-	}
-
 	@ConfigurationProperties
 	static class ConstructorBindingOnConstructor {
 

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

@@ -1806,7 +1806,8 @@ void setAnotherSize(DataSize anotherSize) {
 
 	}
 
-	@ImmutableConfigurationProperties(prefix = "test")
+	@ConstructorBinding
+	@ConfigurationProperties(prefix = "test")
 	static class OtherInjectedProperties {
 
 		final DataSizeProperties dataSizeProperties;
@@ -1823,7 +1824,8 @@ static class OtherInjectPropertiesConfiguration {
 
 	}
 
-	@ImmutableConfigurationProperties(prefix = "test")
+	@ConstructorBinding
+	@ConfigurationProperties(prefix = "test")
 	@Validated
 	static class ConstructorParameterProperties {
 
@@ -1854,7 +1856,8 @@ static class ImportConstructorParameterPropertiesConfiguration {
 
 	}
 
-	@ImmutableConfigurationProperties(prefix = "test")
+	@ConstructorBinding
+	@ConfigurationProperties(prefix = "test")
 	@Validated
 	static class ConstructorParameterValidatedProperties {
 
@@ -1973,7 +1976,8 @@ static class NestedConstructorPropertiesConfiguration {
 
 	}
 
-	@ImmutableConfigurationProperties("test")
+	@ConstructorBinding
+	@ConfigurationProperties("test")
 	static class NestedConstructorProperties {
 
 		private final String name;
@@ -2033,7 +2037,8 @@ static class DeducedNestedConstructorPropertiesConfiguration {
 
 	}
 
-	@ImmutableConfigurationProperties("test")
+	@ConstructorBinding
+	@ConfigurationProperties("test")
 	static class DeducedNestedConstructorProperties {
 
 		private final String name;

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

@@ -128,7 +128,8 @@ static class FooProperties {
 
 	}
 
-	@ImmutableConfigurationProperties(prefix = "bar")
+	@ConstructorBinding
+	@ConfigurationProperties(prefix = "bar")
 	static class BarProperties {
 
 		BarProperties(String foo) {

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

@@ -17,8 +17,8 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.boot.context.properties.ConstructorBinding;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.context.properties.ImmutableConfigurationProperties;
 import org.springframework.boot.context.properties.scan.valid.b.BScanConfiguration;
 
 /**
@@ -46,7 +46,8 @@ static class FooProperties {
 
 	}
 
-	@ImmutableConfigurationProperties(prefix = "bar")
+	@ConstructorBinding
+	@ConfigurationProperties(prefix = "bar")
 	static class BarProperties {
 
 		BarProperties(String foo) {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/ConfigurationPropertiesScanConfiguration.java

@@ -16,7 +16,7 @@
 package org.springframework.boot.context.properties.scan.valid.b;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ImmutableConfigurationProperties;
+import org.springframework.boot.context.properties.ConstructorBinding;
 
 /**
  * @author Madhura Bhave
@@ -28,7 +28,8 @@ public interface BProperties {
 
 	}
 
-	@ImmutableConfigurationProperties(prefix = "b.first")
+	@ConstructorBinding
+	@ConfigurationProperties(prefix = "b.first")
 	public static class BFirstProperties implements BProperties {
 
 		private final String name;

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/b/BScanConfiguration.java

@@ -47,7 +47,8 @@ class KotlinConfigurationPropertiesBeanRegistrarTests {
 	@ConfigurationProperties(prefix = "foo")
 	class FooProperties
 
-	@ImmutableConfigurationProperties(prefix = "bar")
+	@ConstructorBinding
+	@ConfigurationProperties(prefix = "bar")
 	class BarProperties(val name: String?, val counter: Int = 42)
 
 	@ConfigurationProperties(prefix = "bing")