root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2022-10-17 23:38:39 -07:00
parent e3df6c5b6f
commit 754f39e6ef
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ import java.util.stream.Stream;
import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.NestingKind;
import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement; import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeMirror;
@ -143,16 +142,13 @@ class PropertyDescriptorResolver {
private final TypeElement type; private final TypeElement type;
private final boolean constructorBoundType;
private final List<ExecutableElement> constructors; private final List<ExecutableElement> constructors;
private final List<ExecutableElement> boundConstructors; private final List<ExecutableElement> boundConstructors;
ConfigurationPropertiesTypeElement(TypeElement type, boolean constructorBoundType, ConfigurationPropertiesTypeElement(TypeElement type, List<ExecutableElement> constructors,
List<ExecutableElement> constructors, List<ExecutableElement> boundConstructors) { List<ExecutableElement> boundConstructors) {
this.type = type; this.type = type;
this.constructorBoundType = constructorBoundType;
this.constructors = constructors; this.constructors = constructors;
this.boundConstructors = boundConstructors; this.boundConstructors = boundConstructors;
} }
@ -162,11 +158,11 @@ class PropertyDescriptorResolver {
} }
boolean isConstructorBindingEnabled() { boolean isConstructorBindingEnabled() {
return this.constructorBoundType || !this.boundConstructors.isEmpty(); return !this.boundConstructors.isEmpty();
} }
ExecutableElement getBindConstructor() { ExecutableElement getBindConstructor() {
if (this.constructorBoundType && this.boundConstructors.isEmpty()) { if (this.boundConstructors.isEmpty()) {
return findBoundConstructor(); return findBoundConstructor();
} }
if (this.boundConstructors.size() == 1) { if (this.boundConstructors.size() == 1) {
@ -189,10 +185,9 @@ class PropertyDescriptorResolver {
} }
static ConfigurationPropertiesTypeElement of(TypeElement type, MetadataGenerationEnvironment env) { static ConfigurationPropertiesTypeElement of(TypeElement type, MetadataGenerationEnvironment env) {
boolean constructorBoundType = isConstructorBoundType(type, env);
List<ExecutableElement> constructors = ElementFilter.constructorsIn(type.getEnclosedElements()); List<ExecutableElement> constructors = ElementFilter.constructorsIn(type.getEnclosedElements());
List<ExecutableElement> boundConstructors = getBoundConstructors(env, constructors); List<ExecutableElement> boundConstructors = getBoundConstructors(env, constructors);
return new ConfigurationPropertiesTypeElement(type, constructorBoundType, constructors, boundConstructors); return new ConfigurationPropertiesTypeElement(type, constructors, boundConstructors);
} }
private static List<ExecutableElement> getBoundConstructors(MetadataGenerationEnvironment env, private static List<ExecutableElement> getBoundConstructors(MetadataGenerationEnvironment env,
@ -213,13 +208,6 @@ class PropertyDescriptorResolver {
return null; return null;
} }
private static boolean isConstructorBoundType(TypeElement type, MetadataGenerationEnvironment env) {
if (type.getNestingKind() == NestingKind.MEMBER) {
return isConstructorBoundType((TypeElement) type.getEnclosingElement(), env);
}
return false;
}
} }
} }