Polish "Derive driverClassName from URL when otherwise unknown"

See gh-39376

Author: wilkinsona

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -458,8 +458,8 @@ void buildWhenDerivedFromCustomTypeWithTypeChange() {
 	}
 
 	@Test
-	void buildWhenDerivedFromCustomTypeDeriveDriverClassNameFromDerivedUrl() {
-		UrlCapableLimitedCustomDataSource dataSource = new UrlCapableLimitedCustomDataSource();
+	void buildWhenDerivedFromCustomTypeDeriveDriverClassNameFromUrl() {
+		NoDriverClassNameDataSource dataSource = new NoDriverClassNameDataSource();
 		dataSource.setUsername("test");
 		dataSource.setPassword("secret");
 		dataSource.setUrl("jdbc:postgresql://localhost:5432/postgres");
@@ -471,6 +471,22 @@ void buildWhenDerivedFromCustomTypeDeriveDriverClassNameFromDerivedUrl() {
 		assertThat(testSource.getDriver()).isInstanceOf(org.postgresql.Driver.class);
 	}
 
+	@Test
+	void buildWhenDerivedFromCustomTypeDeriveDriverClassNameFromOverridenUrl() {
+		NoDriverClassNameDataSource dataSource = new NoDriverClassNameDataSource();
+		dataSource.setUsername("test");
+		dataSource.setPassword("secret");
+		dataSource.setUrl("jdbc:mysql://localhost:5432/mysql");
+		DataSourceBuilder<?> builder = DataSourceBuilder.derivedFrom(dataSource)
+			.type(SimpleDriverDataSource.class)
+			.url("jdbc:mariadb://localhost:5432/mariadb");
+		SimpleDriverDataSource testSource = (SimpleDriverDataSource) builder.build();
+		assertThat(testSource.getUsername()).isEqualTo("test");
+		assertThat(testSource.getUrl()).isEqualTo("jdbc:mariadb://localhost:5432/mariadb");
+		assertThat(testSource.getPassword()).isEqualTo("secret");
+		assertThat(testSource.getDriver()).isInstanceOf(org.mariadb.jdbc.Driver.class);
+	}
+
 	@Test // gh-31920
 	void buildWhenC3P0TypeSpecifiedReturnsExpectedDataSource() {
 		this.dataSource = DataSourceBuilder.create()
@@ -634,7 +650,7 @@ void setPassword(String password) {
 
 	}
 
-	static class UrlCapableLimitedCustomDataSource extends LimitedCustomDataSource {
+	static class NoDriverClassNameDataSource extends LimitedCustomDataSource {
 
 		private String url;
 
@@ -648,10 +664,11 @@ void setUrl(String url) {
 
 	}
 
-	static class CustomDataSource extends UrlCapableLimitedCustomDataSource {
+	static class CustomDataSource extends LimitedCustomDataSource {
 
 		private String driverClassName;
 
+		private String url;
 
 		String getDriverClassName() {
 			return this.driverClassName;
@@ -661,6 +678,14 @@ void setDriverClassName(String driverClassName) {
 			this.driverClassName = driverClassName;
 		}
 
+		String getUrl() {
+			return this.url;
+		}
+
+		void setUrl(String url) {
+			this.url = url;
+		}
+
 	}
 
 }