Skip to content

Commit 6c44055

Browse files
committed
Polish PropertyDescriptorResolver
1 parent ac91cfd commit 6c44055

File tree

1 file changed

+8
-9
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor

1 file changed

+8
-9
lines changed

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,32 +58,31 @@ Stream<PropertyDescriptor<?>> resolve(TypeElement type, ExecutableElement factor
5858
if (factoryMethod != null) {
5959
return resolveJavaBeanProperties(type, factoryMethod, members);
6060
}
61-
return resolve(ConfigurationPropertiesTypeElement.of(type, this.environment), factoryMethod, members);
61+
return resolve(ConfigurationPropertiesTypeElement.of(type, this.environment), members);
6262
}
6363

64-
private Stream<PropertyDescriptor<?>> resolve(ConfigurationPropertiesTypeElement type,
65-
ExecutableElement factoryMethod, TypeElementMembers members) {
64+
private Stream<PropertyDescriptor<?>> resolve(ConfigurationPropertiesTypeElement type, TypeElementMembers members) {
6665
if (type.isConstructorBindingEnabled()) {
6766
ExecutableElement constructor = type.getBindConstructor();
6867
if (constructor != null) {
69-
return resolveConstructorProperties(type.getType(), factoryMethod, members, constructor);
68+
return resolveConstructorProperties(type.getType(), members, constructor);
7069
}
7170
return Stream.empty();
7271
}
73-
return resolveJavaBeanProperties(type.getType(), factoryMethod, members);
72+
return resolveJavaBeanProperties(type.getType(), null, members);
7473
}
7574

76-
Stream<PropertyDescriptor<?>> resolveConstructorProperties(TypeElement type, ExecutableElement factoryMethod,
77-
TypeElementMembers members, ExecutableElement constructor) {
75+
Stream<PropertyDescriptor<?>> resolveConstructorProperties(TypeElement type, TypeElementMembers members,
76+
ExecutableElement constructor) {
7877
Map<String, PropertyDescriptor<?>> candidates = new LinkedHashMap<>();
7978
constructor.getParameters().forEach((parameter) -> {
8079
String name = getParameterName(parameter);
8180
TypeMirror propertyType = parameter.asType();
8281
ExecutableElement getter = members.getPublicGetter(name, propertyType);
8382
ExecutableElement setter = members.getPublicSetter(name, propertyType);
8483
VariableElement field = members.getFields().get(name);
85-
register(candidates, new ConstructorParameterPropertyDescriptor(type, factoryMethod, parameter, name,
86-
propertyType, field, getter, setter));
84+
register(candidates, new ConstructorParameterPropertyDescriptor(type, null, parameter, name, propertyType,
85+
field, getter, setter));
8786
});
8887
return candidates.values().stream();
8988
}

0 commit comments

Comments
 (0)