Merge branch '3.3.x'

Closes gh-42506

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java

@@ -35,8 +35,9 @@
  * must be met for the condition to match, but they do not have to be met by the same
  * bean.
  * <p>
- * When placed on a {@code @Bean} method, the bean class defaults to the return type of
- * the factory method:
+ * When placed on a {@link Bean @Bean} method and none of {@link #value}, {@link #type},
+ * {@link #name}, or {@link #annotation} has been specified, the bean type to match
+ * defaults to the return type of the {@code @Bean} method:
  *
  * <pre class="code">
  * &#064;Configuration

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java

@@ -35,8 +35,9 @@
  * must be met for the condition to match and the requirements do not have to be met by
  * the same bean.
  * <p>
- * When placed on a {@code @Bean} method, the bean class defaults to the return type of
- * the factory method:
+ * When placed on a {@link Bean @Bean} method and none of {@link #value}, {@link #type},
+ * {@link #name}, or {@link #annotation} has been specified, the bean type to match
+ * defaults to the return type of the {@code @Bean} method:
  *
  * <pre class="code">
  * &#064;Configuration