spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-24 02:09:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source 
Closes gh-50425
This commit is contained in:
Phillip Webb
2026-05-13 07:47:34 -07:00
parent 458b8baccf 3213393bf9
commit 21a3eec136
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java
+2 -2
View File
@@ -167,8 +167,8 @@ public final class ConditionEvaluationReport {
* @return the {@link ConditionEvaluationReport} or {@code null}
*/
public static @Nullable ConditionEvaluationReport find(BeanFactory beanFactory) {
if (beanFactory instanceof ConfigurableListableBeanFactory) {
return ConditionEvaluationReport.get((ConfigurableListableBeanFactory) beanFactory);
if (beanFactory instanceof ConfigurableListableBeanFactory configurableListableBeanFactory) {
return ConditionEvaluationReport.get(configurableListableBeanFactory);
}
return null;
}
core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
+2 -2
View File
@@ -672,8 +672,8 @@ class OnBeanCondition extends FilteringSpringBootCondition implements Configurat
}
private Set<BeanType> deducedBeanType(ConditionContext context, AnnotatedTypeMetadata metadata) {
if (metadata instanceof MethodMetadata && metadata.isAnnotated(Bean.class.getName())) {
return deducedBeanTypeForBeanMethod(context, (MethodMetadata) metadata);
if (metadata instanceof MethodMetadata methodMetadata && metadata.isAnnotated(Bean.class.getName())) {
return deducedBeanTypeForBeanMethod(context, methodMetadata);
}
return Collections.emptySet();
}