root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Allow flyway loggers to be configured and provide SLF4J default 

Add `spring.flyway.loggers` property which can be used to configure
Flyway loggers and has a default value of "slf4j".

Closes gh-35158
This commit is contained in:
Phillip Webb 2023-05-17 17:24:29 -07:00
parent 022004d780
commit cf95ae92ea
3 changed files with 30 additions and 1 deletions
Show Stats 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

@ -245,6 +245,8 @@ public class FlywayAutoConfiguration {
.to((prefix) -> configuration.scriptPlaceholderPrefix(prefix));
map.from(properties.getScriptPlaceholderSuffix())
.to((suffix) -> configuration.scriptPlaceholderSuffix(suffix));
map.from(properties.isExecuteInTransaction()).to(configuration::executeInTransaction);
map.from(properties::getLoggers).to(configuration::loggers);
// Flyway Teams properties
map.from(properties.getBatch()).to(configuration::batch);
map.from(properties.getDryRunOutput()).to(configuration::dryRunOutput);
@ -269,7 +271,6 @@ public class FlywayAutoConfiguration {
.as((patterns) -> patterns.toArray(new String[0]))
.to(configuration::ignoreMigrationPatterns);
map.from(properties.getDetectEncoding()).to(configuration::detectEncoding);
map.from(properties.isExecuteInTransaction()).to(configuration::executeInTransaction);
}
private void configureSqlServerKerberosLoginFile(FluentConfiguration configuration,

13
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
View File

@ -367,6 +367,11 @@ public class FlywayProperties {
*/
private boolean executeInTransaction = true;
/**
* Loggers Flyway should use.
*/
private String[] loggers = { "slf4j" };
public boolean isEnabled() {
return this.enabled;
}
@ -855,4 +860,12 @@ public class FlywayProperties {
this.executeInTransaction = executeInTransaction;
}
public String[] getLoggers() {
return this.loggers;
}
public void setLoggers(String[] loggers) {
this.loggers = loggers;
}
}

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

@ -763,6 +763,21 @@ class FlywayAutoConfigurationTests {
.run((context) -> assertThat(context).hasSingleBean(ResourceProviderCustomizer.class));
}
@Test
void loggers() {
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
.run((context) -> assertThat(context.getBean(Flyway.class).getConfiguration().getLoggers())
.containsExactly("slf4j"));
}
@Test
void overrideLoggers() {
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
.withPropertyValues("spring.flyway.loggers=log4j2")
.run((context) -> assertThat(context.getBean(Flyway.class).getConfiguration().getLoggers())
.containsExactly("log4j2"));
}
@Test
void shouldRegisterResourceHints() {
RuntimeHints runtimeHints = new RuntimeHints();