From 176cc20c3658f4e753cb57462686b1871c780959 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 28 Apr 2023 11:06:32 +0200 Subject: [PATCH] Polish FlywayConfiguration --- .../boot/autoconfigure/flyway/FlywayAutoConfiguration.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index 4d516b32ac..e3658af0af 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -123,8 +123,7 @@ public class FlywayAutoConfiguration { @Bean @ConditionalOnMissingBean(FlywayConnectionDetails.class) - PropertiesFlywayConnectionDetails flywayConnectionDetails(FlywayProperties properties, - ObjectProvider jdbcConnectionDetails) { + PropertiesFlywayConnectionDetails flywayConnectionDetails(FlywayProperties properties) { return new PropertiesFlywayConnectionDetails(properties); } @@ -134,14 +133,13 @@ public class FlywayAutoConfiguration { ObjectProvider fluentConfigurationCustomizers, ObjectProvider javaMigrations, ObjectProvider callbacks) { return flyway(properties, new PropertiesFlywayConnectionDetails(properties), resourceLoader, dataSource, - null, flywayDataSource, fluentConfigurationCustomizers, javaMigrations, callbacks, + flywayDataSource, fluentConfigurationCustomizers, javaMigrations, callbacks, new ResourceProviderCustomizer()); } @Bean Flyway flyway(FlywayProperties properties, FlywayConnectionDetails connectionDetails, ResourceLoader resourceLoader, ObjectProvider dataSource, - ObjectProvider jdbcConnectionDetails, @FlywayDataSource ObjectProvider flywayDataSource, ObjectProvider fluentConfigurationCustomizers, ObjectProvider javaMigrations, ObjectProvider callbacks,