Merge branch '4.0.x'

Closes gh-50425

Author: philwebb

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java

@@ -167,8 +167,8 @@ public Set<String> getUnconditionalClasses() {
 	 * @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

@@ -672,8 +672,8 @@ protected final String getAnnotationName() {
 		}
 
 		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();
 		}