Merge branch '2.4.x' into 2.5.x

Closes gh-27062

Author: philwebb

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

@@ -54,14 +54,15 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
 	private ClassLoader classLoader;
 
 	/**
-	 * Name of the datasource. Default to "testdb" when using an embedded database.
+	 * Whether to generate a random datasource name.
 	 */
-	private String name;
+	private boolean generateUniqueName = true;
 
 	/**
-	 * Whether to generate a random datasource name.
+	 * Datasource name to use if "generate-unique-name" is false. Defaults to "testdb"
+	 * when using an embedded database, otherwise null.
 	 */
-	private boolean generateUniqueName = true;
+	private String name;
 
 	/**
 	 * Fully qualified name of the connection pool implementation to use. By default, it
@@ -194,14 +195,6 @@ public DataSourceBuilder<?> initializeDataSourceBuilder() {
 				.url(determineUrl()).username(determineUsername()).password(determinePassword());
 	}
 
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	public boolean isGenerateUniqueName() {
 		return this.generateUniqueName;
 	}
@@ -210,6 +203,14 @@ public void setGenerateUniqueName(boolean generateUniqueName) {
 		this.generateUniqueName = generateUniqueName;
 	}
 
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	public Class<? extends DataSource> getType() {
 		return this.type;
 	}