From c70cc55db8fe82857389d700420ffca2a47dc818 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 21 Jul 2017 15:35:57 +0100 Subject: [PATCH] Polishing See gh-9827 --- .../boot/autoconfigure/condition/ConditionalOnBean.java | 2 +- .../autoconfigure/condition/ConditionalOnMissingBean.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java index d3a2aa54e5..b519cc6447 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Conditional; /** * {@link Conditional} that only matches when the specified bean classes and/or names are * already contained in the {@link BeanFactory}. When placed on a {@code @Bean} method, - * the bean class default to the return type of the factory method: + * the bean class defaults to the return type of the factory method: * *
  * @Configuration
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
index 83b2a06bb5..a9dc35f4dc 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
@@ -31,8 +31,8 @@ import org.springframework.context.annotation.Conditional;
  * {@link Conditional} that only matches when the specified bean classes and/or names are
  * not already contained in the {@link BeanFactory}.
  * 

- * When placed on a {@code @Bean} method, the bean class default to the return type of the - * factory method: + * When placed on a {@code @Bean} method, the bean class defaults to the return type of + * the factory method: * *

  * @Configuration