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 2016-06-10 11:46:26 -07:00
parent ec4c8bf50d
commit ed6f11d60d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
View File

@ -83,10 +83,8 @@ public class DataSourceBuilder {
private void bind(DataSource result) { private void bind(DataSource result) {
MutablePropertyValues properties = new MutablePropertyValues(this.properties); MutablePropertyValues properties = new MutablePropertyValues(this.properties);
new RelaxedDataBinder(result) new RelaxedDataBinder(result).withAlias("url", "jdbcUrl")
.withAlias("url", "jdbcUrl") .withAlias("username", "user").bind(properties);
.withAlias("username", "user")
.bind(properties);
} }
public DataSourceBuilder type(Class<? extends DataSource> type) { public DataSourceBuilder type(Class<? extends DataSource> type) {

1
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java
View File

@ -76,7 +76,6 @@ public class AbstractDevToolsDataSourceAutoConfigurationTests {
@Test @Test
public void emptyFactoryMethodMetadataIgnored() { public void emptyFactoryMethodMetadataIgnored() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
DataSource dataSource = mock(DataSource.class); DataSource dataSource = mock(DataSource.class);
AnnotatedGenericBeanDefinition beanDefinition = new AnnotatedGenericBeanDefinition( AnnotatedGenericBeanDefinition beanDefinition = new AnnotatedGenericBeanDefinition(
dataSource.getClass()); dataSource.getClass());