Polish

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

@@ -83,10 +83,8 @@ public class DataSourceBuilder {
 
 	private void bind(DataSource result) {
 		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) {

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

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