Skip to content

Commit 27d7c59

Browse files
committed
Polish "Stop using custom name for elements resolution"
See gh-46599
1 parent 1014fc2 commit 27d7c59

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ private Stream<PropertyDescriptor> resolveConstructorBoundProperties(TypeElement
8585

8686
private PropertyDescriptor extracted(TypeElement declaringElement, TypeElementMembers members,
8787
VariableElement parameter) {
88-
String name = getPropertyName(parameter);
8988
String parameterName = parameter.getSimpleName().toString();
89+
String name = getPropertyName(parameter, parameterName);
9090
TypeMirror type = parameter.asType();
9191
ExecutableElement getter = members.getPublicGetter(parameterName, type);
9292
ExecutableElement setter = members.getPublicSetter(parameterName, type);
@@ -99,10 +99,6 @@ private PropertyDescriptor extracted(TypeElement declaringElement, TypeElementMe
9999
field);
100100
}
101101

102-
private String getPropertyName(VariableElement parameter) {
103-
return getPropertyName(parameter, parameter.getSimpleName().toString());
104-
}
105-
106102
private String getPropertyName(VariableElement parameter, String fallback) {
107103
AnnotationMirror nameAnnotation = this.environment.getNameAnnotation(parameter);
108104
if (nameAnnotation != null) {

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@
1818

1919
import org.springframework.boot.configurationsample.Name;
2020

21-
// @formatter:off
22-
2321
/**
2422
* Example Record Javadoc sample
2523
*
26-
* @param someString very long description that
27-
* doesn't fit single line and is indented
24+
* @param someString very long description that doesn't fit single line and is indented
2825
* @param someInteger description with @param and @ pitfalls
2926
* @param someBoolean description with extra spaces
3027
* @param someLong description without space after asterisk
@@ -34,15 +31,6 @@
3431
* @author Pavel Anisimov
3532
*/
3633
@org.springframework.boot.configurationsample.ConfigurationProperties("record.descriptions")
37-
public record ExampleRecord(
38-
String someString,
39-
Integer someInteger,
40-
Boolean someBoolean,
41-
Long someLong,
42-
@Name("named.record.component")
43-
String namedComponent,
44-
Byte someByte
45-
) {
34+
public record ExampleRecord(String someString, Integer someInteger, Boolean someBoolean, Long someLong,
35+
@Name("named.record.component") String namedComponent, Byte someByte) {
4636
}
47-
48-
//@formatter:on

0 commit comments

Comments
 (0)