Stop using custom name for elements resolution

Previously, when a property was customized with @name, getter, setter,
field, and record component were looked up using the custom name, rather
than the property name. This lead to missing information as the custom
name is not meant to match the field name, for instance.

This commit keeps the custom name, but uses the property name as for
other cases.

See gh-46599

Signed-off-by: Bohdan Pryshedko <[email protected]>

Author: prishedko

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptorResolver.java

@@ -86,11 +86,12 @@ private Stream<PropertyDescriptor> resolveConstructorBoundProperties(TypeElement
 	private PropertyDescriptor extracted(TypeElement declaringElement, TypeElementMembers members,
 			VariableElement parameter) {
 		String name = getPropertyName(parameter);
+		String parameterName = parameter.getSimpleName().toString();
 		TypeMirror type = parameter.asType();
-		ExecutableElement getter = members.getPublicGetter(name, type);
-		ExecutableElement setter = members.getPublicSetter(name, type);
-		VariableElement field = members.getFields().get(name);
-		RecordComponentElement recordComponent = members.getRecordComponents().get(name);
+		ExecutableElement getter = members.getPublicGetter(parameterName, type);
+		ExecutableElement setter = members.getPublicSetter(parameterName, type);
+		VariableElement field = members.getFields().get(parameterName);
+		RecordComponentElement recordComponent = members.getRecordComponents().get(parameterName);
 		return (recordComponent != null)
 				? new RecordParameterPropertyDescriptor(name, type, parameter, declaringElement, getter,
 						recordComponent)

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java

@@ -264,6 +264,9 @@ void deprecatedPropertyOnRecord() {
 			.fromSource(type)
 			.withDeprecation("some-reason", null, null));
 		assertThat(metadata).has(Metadata.withProperty("deprecated-record.bravo", String.class).fromSource(type));
+		assertThat(metadata).has(Metadata.withProperty("deprecated-record.named.charlie", String.class)
+			.fromSource(type)
+			.withDeprecation("another-reason", null, null));
 	}
 
 	@Test
@@ -568,6 +571,8 @@ void recordPropertiesWithDescriptions() {
 			.withDescription("description without space after asterisk"));
 		assertThat(metadata).has(Metadata.withProperty("record.descriptions.some-byte", Byte.class)
 			.withDescription("last description in Javadoc"));
+		assertThat(metadata).has(Metadata.withProperty("record.descriptions.named.record.component", String.class)
+			.withDescription("description of a named component"));
 	}
 
 }

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/ExampleRecord.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.configurationsample.record;
 
+import org.springframework.boot.configurationsample.Name;
+
 // @formatter:off
 
 /**
@@ -26,12 +28,21 @@
  * @param someInteger description with @param and @ pitfalls
  * @param someBoolean description with extra spaces
  * @param someLong description without space after asterisk
+ * @param namedComponent description of a named component
  * @param someByte last description in Javadoc
  * @since 1.0.0
  * @author Pavel Anisimov
  */
 @org.springframework.boot.configurationsample.ConfigurationProperties("record.descriptions")
-public record ExampleRecord(String someString, Integer someInteger, Boolean someBoolean, Long someLong, Byte someByte) {
+public record ExampleRecord(
+				String someString,
+				Integer someInteger,
+				Boolean someBoolean,
+				Long someLong,
+				@Name("named.record.component")
+				String namedComponent,
+				Byte someByte
+		) {
 }
 
 //@formatter:on

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedRecord.java

@@ -18,21 +18,28 @@
 
 import org.springframework.boot.configurationsample.ConfigurationProperties;
 import org.springframework.boot.configurationsample.DeprecatedConfigurationProperty;
+import org.springframework.boot.configurationsample.Name;
 
 /**
  * Configuration properties as record with deprecated property.
  *
  * @param alpha alpha property, deprecated
  * @param bravo bravo property
+ * @param charlie charlie property, named, deprecated
  * @author Moritz Halbritter
  */
 @ConfigurationProperties("deprecated-record")
-public record DeprecatedRecord(String alpha, String bravo) {
+public record DeprecatedRecord(String alpha, String bravo, @Name("named.charlie") String charlie) {
 
 	@Deprecated
 	@DeprecatedConfigurationProperty(reason = "some-reason")
 	public String alpha() {
 		return this.alpha;
 	}
 
+	@Deprecated
+	@DeprecatedConfigurationProperty(reason = "another-reason")
+	public String charlie() {
+		return this.charlie;
+	}
 }