Merge branch '3.3.x' into 3.4.x

Closes gh-45991

Author: snicoll

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

@@ -513,6 +513,9 @@ private V convertFromString(String value) {
 		}
 
 		private String convertToString(V value) {
+			if (value == null) {
+				return null;
+			}
 			if (String.class.equals(this.type)) {
 				return (String) value;
 			}
@@ -705,7 +708,8 @@ private static class SimpleDataSourceProperties extends MappedDataSourceProperti
 		@SuppressWarnings("unchecked")
 		SimpleDataSourceProperties() {
 			add(DataSourceProperty.URL, SimpleDriverDataSource::getUrl, SimpleDriverDataSource::setUrl);
-			add(DataSourceProperty.DRIVER_CLASS_NAME, Class.class, (dataSource) -> dataSource.getDriver().getClass(),
+			add(DataSourceProperty.DRIVER_CLASS_NAME, Class.class,
+					(dataSource) -> (dataSource.getDriver() != null) ? dataSource.getDriver().getClass() : null,
 					SimpleDriverDataSource::setDriverClass);
 			add(DataSourceProperty.USERNAME, SimpleDriverDataSource::getUsername, SimpleDriverDataSource::setUsername);
 			add(DataSourceProperty.PASSWORD, SimpleDriverDataSource::getPassword, SimpleDriverDataSource::setPassword);

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

@@ -357,6 +357,16 @@ void buildWhenDerivedFromOracleUcpWithPasswordNotSetThrowsException() throws Exc
 			.isThrownBy(() -> DataSourceBuilder.derivedFrom(dataSource).url("example.org").build());
 	}
 
+	@Test
+	void buildWhenDerivedFromSimpleDriverDataSourceAndDriverNotSetBuilds() {
+		SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
+		dataSource.setUsername("test");
+		dataSource.setPassword("secret");
+		dataSource.setUrl("jdbc:postgresql://localhost:5432/postgres");
+		assertThatNoException()
+			.isThrownBy(() -> DataSourceBuilder.derivedFrom(dataSource).type(SimpleDriverDataSource.class).build());
+	}
+
 	@Test
 	void buildWhenDerivedFromOracleDataSourceWithPasswordSetReturnsDataSource() throws Exception {
 		oracle.jdbc.datasource.impl.OracleDataSource dataSource = new oracle.jdbc.datasource.impl.OracleDataSource();