Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Configure FluentConfiguration to use ResourceLoader's ClassLoader"

Browse Source 
See gh-16947
This commit is contained in:
Andy Wilkinson
2019-05-29 10:07:26 +01:00
parent cc5bd51343
commit 69a298231c
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,8 @@ public class FlywayAutoConfiguration {
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());

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

@@ -36,7 +36,6 @@ import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
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.orm.jpa.vendor.HibernateJpaVendorAdapter;
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 class FlywayAutoConfigurationTests {
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 @@ public class FlywayAutoConfigurationTests {
@Bean
@Primary
public ResourceLoader customClassLoader() {
return new DefaultResourceLoader(mock(ClassLoader.class));
return new DefaultResourceLoader(
new CustomClassLoader(getClass().getClassLoader()));
}
}
@@ -629,4 +629,12 @@ public class FlywayAutoConfigurationTests {
}
private static final class CustomClassLoader extends ClassLoader {
private CustomClassLoader(ClassLoader parent) {
super(parent);
}
}
}