From d44683180da31a231cd39638dcfb29d2d69635be Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 24 Mar 2026 18:05:02 -0700 Subject: [PATCH] Support constructor binding method-level `@NestedConfigurationProperty` Update `spring-boot-configuration-processor` to support method-level `@NestedConfigurationProperty` annotations when constructor binding is being used. Fixes gh-49734 --- ...onstructorParameterPropertyDescriptor.java | 3 +- ...ationMetadataAnnotationProcessorTests.java | 8 ++++ .../NestedPropertiesMethodImmutable.java | 37 +++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/NestedPropertiesMethodImmutable.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConstructorParameterPropertyDescriptor.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConstructorParameterPropertyDescriptor.java index c8b4e6b714c..5aa13fd77b5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConstructorParameterPropertyDescriptor.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConstructorParameterPropertyDescriptor.java @@ -51,7 +51,8 @@ class ConstructorParameterPropertyDescriptor extends ParameterPropertyDescriptor @Override protected boolean isMarkedAsNested(MetadataGenerationEnvironment environment) { - return environment.getNestedConfigurationPropertyAnnotation(this.field) != null; + return environment.getNestedConfigurationPropertyAnnotation(this.field) != null + || environment.getNestedConfigurationPropertyAnnotation(getGetter()) != null; } @Override diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index 9add8959618..2cb7cdad3a1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -27,6 +27,7 @@ import org.springframework.boot.configurationprocessor.metadata.ItemMetadata; import org.springframework.boot.configurationprocessor.metadata.Metadata; import org.springframework.boot.configurationsample.deprecation.Dbcp2Configuration; import org.springframework.boot.configurationsample.method.NestedPropertiesMethod; +import org.springframework.boot.configurationsample.method.NestedPropertiesMethodImmutable; import org.springframework.boot.configurationsample.record.ExampleRecord; import org.springframework.boot.configurationsample.record.NestedPropertiesRecord; import org.springframework.boot.configurationsample.record.RecordWithGetter; @@ -394,6 +395,13 @@ class ConfigurationMetadataAnnotationProcessorTests extends AbstractMetadataGene assertThat(metadata).has(Metadata.withProperty("method-nested.inner.nested.my-nested-property")); } + @Test + void nestedClassMethodImmutable() { + ConfigurationMetadata metadata = compile(NestedPropertiesMethodImmutable.class); + assertThat(metadata).has(Metadata.withGroup("immutable-nested.nested")); + assertThat(metadata).has(Metadata.withProperty("immutable-nested.nested.my-nested-property")); + } + @Test void nestedClassChildProperties() { ConfigurationMetadata metadata = compile(ClassWithNestedProperties.class); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/NestedPropertiesMethodImmutable.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/NestedPropertiesMethodImmutable.java new file mode 100644 index 00000000000..b0b0447658b --- /dev/null +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/NestedPropertiesMethodImmutable.java @@ -0,0 +1,37 @@ +/* + * Copyright 2012-present 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 + * + * https://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.boot.configurationsample.method; + +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestNestedConfigurationProperty; + +@TestConfigurationProperties("immutable-nested") +public class NestedPropertiesMethodImmutable { + + private final NestedProperty nested; + + NestedPropertiesMethodImmutable(NestedProperty nested) { + this.nested = nested; + + } + + @TestNestedConfigurationProperty + public NestedProperty getNested() { + return this.nested; + } + +}