Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-42916
This commit is contained in:
Stéphane Nicoll
2024-10-29 13:39:23 +09:00
parent 4401673d6d 0aff403234
commit 5fcc585178
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2022 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ class QualifierDefinition {
} }
static QualifierDefinition forElement(AnnotatedElement element) { static QualifierDefinition forElement(AnnotatedElement element) {
if (element != null && element instanceof Field field) { if (element instanceof Field field) {
Set<Annotation> annotations = getQualifierAnnotations(field); Set<Annotation> annotations = getQualifierAnnotations(field);
if (!annotations.isEmpty()) { if (!annotations.isEmpty()) {
return new QualifierDefinition(field, annotations); 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); returnType = getTopLevelType(returnType);
Element candidate = element; Element candidate = element;
while (candidate != null && candidate instanceof TypeElement) { while (candidate instanceof TypeElement) {
if (returnType.equals(getTopLevelType(candidate))) { if (returnType.equals(getTopLevelType(candidate))) {
return true; return true;
} }