From fd3bdf06c4c103f7f4fdca092016a774cfec4d45 Mon Sep 17 00:00:00 2001 From: Hyunwoo Jung Date: Sun, 7 Dec 2025 18:42:27 +0900 Subject: [PATCH] Review code sample of "Configuring Two DataSources" section See gh-48407 Signed-off-by: Hyunwoo Jung --- .../MyCompleteAdditionalDataSourceConfiguration.java | 4 ++-- .../MyCompleteAdditionalDataSourceConfiguration.kt | 4 ++-- .../MyAdditionalEntityManagerFactoryConfiguration.kt | 2 +- .../usemultipleentitymanagers/OrderConfiguration.kt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.java index 4153c61335b..8e9c464ffb0 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.java @@ -38,8 +38,8 @@ public class MyCompleteAdditionalDataSourceConfiguration { @Bean(defaultCandidate = false) @ConfigurationProperties("app.datasource.configuration") public HikariDataSource secondDataSource( - @Qualifier("secondDataSourceProperties") DataSourceProperties secondDataSourceProperties) { - return secondDataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build(); + @Qualifier("second") DataSourceProperties dataSourceProperties) { + return dataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build(); } } diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.kt index daf9dd9b95c..ee1cd500ff6 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.kt @@ -37,8 +37,8 @@ class MyCompleteAdditionalDataSourceConfiguration { @Qualifier("second") @Bean(defaultCandidate = false) @ConfigurationProperties("app.datasource.configuration") - fun secondDataSource(secondDataSourceProperties: DataSourceProperties): HikariDataSource { - return secondDataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource::class.java).build() + fun secondDataSource(@Qualifier("second") dataSourceProperties: DataSourceProperties): HikariDataSource { + return dataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource::class.java).build() } } diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.kt index 1bbda4121dd..e6ebead362a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.kt @@ -40,7 +40,7 @@ class MyAdditionalEntityManagerFactoryConfiguration { @Qualifier("second") @Bean(defaultCandidate = false) - fun firstEntityManagerFactory( + fun secondEntityManagerFactory( @Qualifier("second") dataSource: DataSource, @Qualifier("second") jpaProperties: JpaProperties ): LocalContainerEntityManagerFactoryBean { diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/OrderConfiguration.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/OrderConfiguration.kt index 74ed9d90e3c..b885cc69ac2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/OrderConfiguration.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/OrderConfiguration.kt @@ -20,6 +20,6 @@ import org.springframework.context.annotation.Configuration import org.springframework.data.jpa.repository.config.EnableJpaRepositories @Configuration(proxyBeanMethods = false) -@EnableJpaRepositories(basePackageClasses = [Order::class], entityManagerFactoryRef = "firstEntityManagerFactory") +@EnableJpaRepositories(basePackageClasses = [Order::class], entityManagerFactoryRef = "entityManagerFactory") class OrderConfiguration