Polish "Configure FluentConfiguration to use ResourceLoader's ClassLoader"

See gh-16947

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java

@@ -113,7 +113,8 @@ public Flyway flyway(FlywayProperties properties,
 				ObjectProvider<FlywayConfigurationCustomizer> fluentConfigurationCustomizers,
 				ObjectProvider<Callback> callbacks,
 				ObjectProvider<FlywayCallback> flywayCallbacks) {
-			FluentConfiguration configuration = new FluentConfiguration(resourceLoader.getClassLoader());
+			FluentConfiguration configuration = new FluentConfiguration(
+					resourceLoader.getClassLoader());
 			DataSource dataSourceToMigrate = configureDataSource(configuration,
 					properties, dataSourceProperties, flywayDataSource.getIfAvailable(),
 					dataSource.getIfAvailable());

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java

@@ -36,7 +36,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
 
-import org.mockito.internal.util.MockUtil;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
@@ -56,7 +55,6 @@
 import org.springframework.stereotype.Component;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.inOrder;
@@ -478,10 +476,11 @@ public void undoSqlMigrationPrefix() {
 	public void customFlywayClassLoader() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class,
 				ResourceLoaderConfiguration.class).run((context) -> {
-			assertThat(context).hasSingleBean(Flyway.class);
-			Flyway flyway = context.getBean(Flyway.class);
-			assertTrue(MockUtil.isMock(flyway.getConfiguration().getClassLoader()));
-		});
+					assertThat(context).hasSingleBean(Flyway.class);
+					Flyway flyway = context.getBean(Flyway.class);
+					assertThat(flyway.getConfiguration().getClassLoader())
+							.isInstanceOf(CustomClassLoader.class);
+				});
 	}
 
 	@Configuration(proxyBeanMethods = false)
@@ -509,7 +508,8 @@ protected static class ResourceLoaderConfiguration {
 		@Bean
 		@Primary
 		public ResourceLoader customClassLoader() {
-			return new DefaultResourceLoader(mock(ClassLoader.class));
+			return new DefaultResourceLoader(
+					new CustomClassLoader(getClass().getClassLoader()));
 		}
 
 	}
@@ -629,4 +629,12 @@ public FlywayConfigurationCustomizer customizerTwo() {
 
 	}
 
+	private static final class CustomClassLoader extends ClassLoader {
+
+		private CustomClassLoader(ClassLoader parent) {
+			super(parent);
+		}
+
+	}
+
 }