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

Merge branch '3.3.x' 

Closes gh-42917
This commit is contained in:
Stéphane Nicoll 2024-10-29 13:39:31 +09:00
parent cc443366fa 5fcc585178
commit e5ec38074b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java
View File

@ -81,7 +81,7 @@ class QualifierDefinition {
}
static QualifierDefinition forElement(AnnotatedElement element) {
if (element != null && element instanceof Field field) {
if (element instanceof Field field) {
Set<Annotation> annotations = getQualifierAnnotations(field);
if (!annotations.isEmpty()) {
return new QualifierDefinition(field, annotations);

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

@ -150,7 +150,7 @@ abstract class PropertyDescriptor {
}
returnType = getTopLevelType(returnType);
Element candidate = element;
while (candidate != null && candidate instanceof TypeElement) {
while (candidate instanceof TypeElement) {
if (returnType.equals(getTopLevelType(candidate))) {
return true;
}