root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2014-08-21 22:03:19 -07:00
parent 77bf558307
commit e6c18a00a1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
View File

@ -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;
}
}
}

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
View File

@ -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