Browse Source

Review code sample of "Configuring Two DataSources" section

See gh-48407

Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>
pull/48470/head
Hyunwoo Jung 3 months ago committed by Stéphane Nicoll
parent
commit
fd3bdf06c4
  1. 4
      spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.java
  2. 4
      spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.kt
  3. 2
      spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.kt
  4. 2
      spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/OrderConfiguration.kt

4
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) @Bean(defaultCandidate = false)
@ConfigurationProperties("app.datasource.configuration") @ConfigurationProperties("app.datasource.configuration")
public HikariDataSource secondDataSource( public HikariDataSource secondDataSource(
@Qualifier("secondDataSourceProperties") DataSourceProperties secondDataSourceProperties) { @Qualifier("second") DataSourceProperties dataSourceProperties) {
return secondDataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build(); return dataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build();
} }
} }

4
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") @Qualifier("second")
@Bean(defaultCandidate = false) @Bean(defaultCandidate = false)
@ConfigurationProperties("app.datasource.configuration") @ConfigurationProperties("app.datasource.configuration")
fun secondDataSource(secondDataSourceProperties: DataSourceProperties): HikariDataSource { fun secondDataSource(@Qualifier("second") dataSourceProperties: DataSourceProperties): HikariDataSource {
return secondDataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource::class.java).build() return dataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource::class.java).build()
} }
} }

2
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") @Qualifier("second")
@Bean(defaultCandidate = false) @Bean(defaultCandidate = false)
fun firstEntityManagerFactory( fun secondEntityManagerFactory(
@Qualifier("second") dataSource: DataSource, @Qualifier("second") dataSource: DataSource,
@Qualifier("second") jpaProperties: JpaProperties @Qualifier("second") jpaProperties: JpaProperties
): LocalContainerEntityManagerFactoryBean { ): LocalContainerEntityManagerFactoryBean {

2
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 import org.springframework.data.jpa.repository.config.EnableJpaRepositories
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@EnableJpaRepositories(basePackageClasses = [Order::class], entityManagerFactoryRef = "firstEntityManagerFactory") @EnableJpaRepositories(basePackageClasses = [Order::class], entityManagerFactoryRef = "entityManagerFactory")
class OrderConfiguration class OrderConfiguration

Loading…
Cancel
Save