Browse Source

Merge branch '3.4.x' into 3.5.x

pull/48965/head
Stéphane Nicoll 4 months ago
parent
commit
33ae2a1d67
  1. 3
      spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.java

3
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.java

@ -37,8 +37,7 @@ public class MyCompleteAdditionalDataSourceConfiguration { @@ -37,8 +37,7 @@ public class MyCompleteAdditionalDataSourceConfiguration {
@Qualifier("second")
@Bean(defaultCandidate = false)
@ConfigurationProperties("app.datasource.configuration")
public HikariDataSource secondDataSource(
@Qualifier("second") DataSourceProperties dataSourceProperties) {
public HikariDataSource secondDataSource(@Qualifier("second") DataSourceProperties dataSourceProperties) {
return dataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build();
}

Loading…
Cancel
Save