diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
index e1d89f0a196..422b54f8c69 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
@@ -97,8 +97,8 @@ public class DataSourceAutoConfiguration {
 		@Autowired
 		private DataSourceProperties properties;
 
-		@ConfigurationProperties(prefix = DataSourceProperties.PREFIX)
 		@Bean
+		@ConfigurationProperties(prefix = DataSourceProperties.PREFIX)
 		public DataSource dataSource() {
 			DataSourceBuilder factory = DataSourceBuilder
 					.create(this.properties.getClassLoader())
@@ -205,8 +205,7 @@ public class DataSourceAutoConfiguration {
 				return ConditionOutcome.match("existing auto database detected");
 			}
 
-			if (BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
-					context.getBeanFactory(), DataSource.class, true, false).length > 0) {
+			if (hasBean(context, DataSource.class)) {
 				return ConditionOutcome
 						.match("Existing bean configured database detected");
 			}
@@ -214,6 +213,10 @@ public class DataSourceAutoConfiguration {
 			return ConditionOutcome.noMatch("no existing bean configured database");
 		}
 
+		private boolean hasBean(ConditionContext context, Class<?> type) {
+			return BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
+					context.getBeanFactory(), type, true, false).length > 0;
+		}
 	}
 
 }
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
index 67f648b54a9..93cb2404d85 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
@@ -25,7 +25,7 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * Base class for configuration of a database pool.
+ * Base class for configuration of a data source.
  *
  * @author Dave Syer
  * @author Maciej Walkowiak