Skip to content

Define the classloader for FluentConfiguration #16947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Define the classloader for FluentConfiguration #16947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0155c9b
Define the classloader for FluentConfiguration
Alan-Gomes May 22, 2019
31658ac
Write test to check if classloader is defined
Alan-Gomes May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public Flyway flyway(FlywayProperties properties,
ObjectProvider<FlywayConfigurationCustomizer> fluentConfigurationCustomizers,
ObjectProvider<Callback> callbacks,
ObjectProvider<FlywayCallback> flywayCallbacks) {
FluentConfiguration configuration = new FluentConfiguration();
FluentConfiguration configuration = new FluentConfiguration(resourceLoader.getClassLoader());
DataSource dataSourceToMigrate = configureDataSource(configuration,
properties, dataSourceProperties, flywayDataSource.getIfAvailable(),
dataSource.getIfAvailable());
Expand Down
25 changes: 25 additions & 0 deletions ...test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
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;
Expand All @@ -48,11 +49,14 @@
import org.springframework.context.annotation.Primary;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.ResourceLoader;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
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;
Expand Down Expand Up @@ -470,6 +474,16 @@ public void undoSqlMigrationPrefix() {
});
}

@Test
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()));
});
}

@Configuration(proxyBeanMethods = false)
protected static class FlywayDataSourceConfiguration {

Expand All @@ -489,6 +503,17 @@ public DataSource flywayDataSource() {

}

@Configuration(proxyBeanMethods = false)
protected static class ResourceLoaderConfiguration {

@Bean
@Primary
public ResourceLoader customClassLoader() {
return new DefaultResourceLoader(mock(ClassLoader.class));
}

}

@Configuration(proxyBeanMethods = false)
protected static class CustomFlywayMigrationInitializer {

Expand Down