fix for Can't connect to a local h2 database created without username #23538

Author: somayaj

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

@@ -322,13 +322,12 @@ public void setUsername(String username) {
 	 * @since 1.4.0
 	 */
 	public String determineUsername() {
-		if (StringUtils.hasText(this.username)) {
-			return this.username;
-		}
-		if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName())) {
+		if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName()) && !StringUtils.hasText(determineUrl())) {
 			return "sa";
 		}
-		return null;
+		else {
+			return this.username;
+		}
 	}
 
 	/**
@@ -350,13 +349,12 @@ public void setPassword(String password) {
 	 * @since 1.4.0
 	 */
 	public String determinePassword() {
-		if (StringUtils.hasText(this.password)) {
-			return this.password;
-		}
-		if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName())) {
+		if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName()) && !StringUtils.hasText(determineUrl())) {
 			return "";
 		}
-		return null;
+		else {
+			return this.password;
+		}
 	}
 
 	public String getJndiName() {

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java

@@ -80,7 +80,6 @@ private static class EmbeddedDataSourceBeanFactoryPostProcessor implements BeanD
 		public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
 			Assert.isInstanceOf(ConfigurableListableBeanFactory.class, registry,
 					"Test Database Auto-configuration can only be used with a ConfigurableListableBeanFactory");
-			process(registry, (ConfigurableListableBeanFactory) registry);
 		}
 
 		@Override