@FlywayDataSource does not work in an application that has multiple datasources

[ta7uw]

I upgraded spring-boot version from 2.1.2 to 2.2.2 in my project.
After upgrading, FlywayAutoConfiguration has been failed by NoUniqueBeanDefinitionException.

My application has multiple datasources and uses flyway whch uses the datasource is annotated with@FlywayDataSource.
They are defined such as the following configuration class.

@Configuration
public class DataSourceConfig {
    @Bean
    @ConfigurationProperties(prefix = "datasource.main")
    public DataSource mainDataSource() {
        return DataSourceBuilder.create().build();
    }

    @Bean
    @ConfigurationProperties(prefix = "datasource.secondary")
    public DataSource secondaryDataSource() {
        return DataSourceBuilder.create().build();
    }

    @Bean
    @FlywayDataSource
    public DataSource flywayDataSource(DataSource mainDataSource) {
        return mainDataSource;
    }
}

This problem may have been caused by the change of this commit (de0c065).

In version 2.1.2, getIfUnique() was called in FlywayAutoConfiguration.class to get a unique datasource.

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

Line 136 in 22e722d

this.dataSource = dataSource.getIfUnique();

But, in version 2.2.2 getIfAvailable() is called in FlywayAutoConfiguration.class to get a unique datasource.

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

Line 119 in de0c065

dataSource.getIfAvailable());

Is this change the migration mistake ?
as it is now, @FlywayDataSource does not work well for multiple datasources.

[wilkinsona]

I don't recall intentionally making the switch from getIfUnique() to getIfAvailable() and suspect is was accidental. Thanks for letting us know.

[snicoll]

Closing in favour of PR #20617