From 8dfdb2452fffe7b2ba218494cb42b6dd9d9d6398 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Date: Wed, 13 May 2026 10:13:28 +0530 Subject: [PATCH] Polish code to use instanceof pattern matching in conditions See gh-50419 Signed-off-by: Vinod Kumar --- .../autoconfigure/condition/ConditionEvaluationReport.java | 4 ++-- .../boot/autoconfigure/condition/OnBeanCondition.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java index 8e019d0f88f..fce8546e5ec 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java @@ -165,8 +165,8 @@ public final class ConditionEvaluationReport { * @return the {@link ConditionEvaluationReport} or {@code null} */ public static ConditionEvaluationReport find(BeanFactory beanFactory) { - if (beanFactory instanceof ConfigurableListableBeanFactory) { - return ConditionEvaluationReport.get((ConfigurableListableBeanFactory) beanFactory); + if (beanFactory instanceof ConfigurableListableBeanFactory configurableListableBeanFactory) { + return ConditionEvaluationReport.get(configurableListableBeanFactory); } return null; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java index e6362b63e28..4e301235d93 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java @@ -659,8 +659,8 @@ class OnBeanCondition extends FilteringSpringBootCondition implements Configurat } private Set 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(); }