@@ -58,32 +58,31 @@ Stream<PropertyDescriptor<?>> resolve(TypeElement type, ExecutableElement factor
58
58
if (factoryMethod != null ) {
59
59
return resolveJavaBeanProperties (type , factoryMethod , members );
60
60
}
61
- return resolve (ConfigurationPropertiesTypeElement .of (type , this .environment ), factoryMethod , members );
61
+ return resolve (ConfigurationPropertiesTypeElement .of (type , this .environment ), members );
62
62
}
63
63
64
- private Stream <PropertyDescriptor <?>> resolve (ConfigurationPropertiesTypeElement type ,
65
- ExecutableElement factoryMethod , TypeElementMembers members ) {
64
+ private Stream <PropertyDescriptor <?>> resolve (ConfigurationPropertiesTypeElement type , TypeElementMembers members ) {
66
65
if (type .isConstructorBindingEnabled ()) {
67
66
ExecutableElement constructor = type .getBindConstructor ();
68
67
if (constructor != null ) {
69
- return resolveConstructorProperties (type .getType (), factoryMethod , members , constructor );
68
+ return resolveConstructorProperties (type .getType (), members , constructor );
70
69
}
71
70
return Stream .empty ();
72
71
}
73
- return resolveJavaBeanProperties (type .getType (), factoryMethod , members );
72
+ return resolveJavaBeanProperties (type .getType (), null , members );
74
73
}
75
74
76
- Stream <PropertyDescriptor <?>> resolveConstructorProperties (TypeElement type , ExecutableElement factoryMethod ,
77
- TypeElementMembers members , ExecutableElement constructor ) {
75
+ Stream <PropertyDescriptor <?>> resolveConstructorProperties (TypeElement type , TypeElementMembers members ,
76
+ ExecutableElement constructor ) {
78
77
Map <String , PropertyDescriptor <?>> candidates = new LinkedHashMap <>();
79
78
constructor .getParameters ().forEach ((parameter ) -> {
80
79
String name = getParameterName (parameter );
81
80
TypeMirror propertyType = parameter .asType ();
82
81
ExecutableElement getter = members .getPublicGetter (name , propertyType );
83
82
ExecutableElement setter = members .getPublicSetter (name , propertyType );
84
83
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 ));
87
86
});
88
87
return candidates .values ().stream ();
89
88
}
0 commit comments