From bb39b96d5e46567755bab09fe49ce1a6fb27d34a Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Fri, 1 Nov 2024 19:59:57 +0530 Subject: [PATCH 1/7] feat : change reference from commons-dbcp to HikariDataSource --- .../MyAdditionalDataSourceConfiguration.java | 4 ++-- .../MyCompleteAdditionalDataSourceConfiguration.java | 4 ++-- .../boot/docs/howto/testing/slicetests/MyConfiguration.java | 4 ++-- .../howto/testing/slicetests/MyDatasourceConfiguration.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.java index 7780541c1746..c0ffffc91b81 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.java @@ -16,7 +16,7 @@ package org.springframework.boot.docs.howto.dataaccess.configuretwodatasources; -import org.apache.commons.dbcp2.BasicDataSource; +import com.zaxxer.hikari.HikariDataSource; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -31,7 +31,7 @@ public class MyAdditionalDataSourceConfiguration { @Bean(defaultCandidate = false) @ConfigurationProperties("app.datasource") public BasicDataSource secondDataSource() { - return DataSourceBuilder.create().type(BasicDataSource.class).build(); + return DataSourceBuilder.create().type(HikariDataSource.class).build(); } } 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 829a9c413dd1..8f5d20cb1bf5 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 @@ -16,7 +16,7 @@ package org.springframework.boot.docs.howto.dataaccess.configuretwodatasources; -import org.apache.commons.dbcp2.BasicDataSource; +import com.zaxxer.hikari.HikariDataSource; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; @@ -39,7 +39,7 @@ public DataSourceProperties secondDataSourceProperties() { @ConfigurationProperties("app.datasource.configuration") public BasicDataSource secondDataSource( @Qualifier("secondDataSourceProperties") DataSourceProperties secondDataSourceProperties) { - return secondDataSourceProperties.initializeDataSourceBuilder().type(BasicDataSource.class).build(); + return secondDataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build(); } } diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java index 8bb2f8590316..65f44cdd59f2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java @@ -16,7 +16,7 @@ package org.springframework.boot.docs.howto.testing.slicetests; -import org.apache.commons.dbcp2.BasicDataSource; +import com.zaxxer.hikari.HikariDataSource; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; @@ -37,7 +37,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti @Bean @ConfigurationProperties("app.datasource.second") public BasicDataSource secondDataSource() { - return DataSourceBuilder.create().type(BasicDataSource.class).build(); + return DataSourceBuilder.create().type(HikariDataSource.class).build(); } } diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyDatasourceConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyDatasourceConfiguration.java index 70506c4ee427..be3fec66f425 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyDatasourceConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyDatasourceConfiguration.java @@ -16,7 +16,7 @@ package org.springframework.boot.docs.howto.testing.slicetests; -import org.apache.commons.dbcp2.BasicDataSource; +import com.zaxxer.hikari.HikariDataSource; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; @@ -29,7 +29,7 @@ public class MyDatasourceConfiguration { @Bean @ConfigurationProperties("app.datasource.second") public BasicDataSource secondDataSource() { - return DataSourceBuilder.create().type(BasicDataSource.class).build(); + return DataSourceBuilder.create().type(HikariDataSource.class).build(); } } From fa25e5ee17c45b4c8fd9d27d1393a6fdc9dcdfa9 Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Wed, 6 Nov 2024 19:08:14 +0530 Subject: [PATCH 2/7] change return datasource to HikariDataSource --- .../MyAdditionalDataSourceConfiguration.java | 2 +- .../MyCompleteAdditionalDataSourceConfiguration.java | 2 +- .../boot/docs/howto/testing/slicetests/MyConfiguration.java | 2 +- .../howto/testing/slicetests/MyDatasourceConfiguration.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.java index c0ffffc91b81..4882b940c767 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.java @@ -30,7 +30,7 @@ public class MyAdditionalDataSourceConfiguration { @Qualifier("second") @Bean(defaultCandidate = false) @ConfigurationProperties("app.datasource") - public BasicDataSource secondDataSource() { + public HikariDataSource secondDataSource() { return DataSourceBuilder.create().type(HikariDataSource.class).build(); } 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 8f5d20cb1bf5..7e4058eed734 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 @@ -37,7 +37,7 @@ public DataSourceProperties secondDataSourceProperties() { @Qualifier("second") @Bean(defaultCandidate = false) @ConfigurationProperties("app.datasource.configuration") - public BasicDataSource secondDataSource( + public HikariDataSource secondDataSource( @Qualifier("secondDataSourceProperties") DataSourceProperties secondDataSourceProperties) { return secondDataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build(); } diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java index 65f44cdd59f2..406f1fc9417b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java @@ -36,7 +36,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti @Bean @ConfigurationProperties("app.datasource.second") - public BasicDataSource secondDataSource() { + public HikariDataSource secondDataSource() { return DataSourceBuilder.create().type(HikariDataSource.class).build(); } diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyDatasourceConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyDatasourceConfiguration.java index be3fec66f425..895356d4b5a9 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyDatasourceConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyDatasourceConfiguration.java @@ -28,7 +28,7 @@ public class MyDatasourceConfiguration { @Bean @ConfigurationProperties("app.datasource.second") - public BasicDataSource secondDataSource() { + public HikariDataSource secondDataSource() { return DataSourceBuilder.create().type(HikariDataSource.class).build(); } From cbfc7ba13518e9fd2f43769f7475f41d96b3d04a Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Wed, 6 Nov 2024 20:25:10 +0530 Subject: [PATCH 3/7] fix : build failure --- .../MyDataSourcesConfigurationTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java index dbee0f9c37a4..9ed7e1e4193b 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java @@ -20,7 +20,7 @@ import javax.sql.DataSource; -import org.apache.commons.dbcp2.BasicDataSource; +import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -56,9 +56,9 @@ void validateConfiguration() throws SQLException { assertThat(this.context.getBean("dataSource")).isSameAs(this.dataSource); assertThat(this.dataSource.getConnection().getMetaData().getURL()).startsWith("jdbc:h2:mem:"); assertThat(this.context.getBean("secondDataSource")).isSameAs(this.secondDataSource); - assertThat(this.secondDataSource).extracting((dataSource) -> ((BasicDataSource) dataSource).getUrl()) + assertThat(this.secondDataSource).extracting((dataSource) -> ((HikariDataSource) dataSource).getUrl()) .isEqualTo("jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1"); - assertThat(this.secondDataSource).extracting((dataSource) -> ((BasicDataSource) dataSource).getMaxTotal()) + assertThat(this.secondDataSource).extracting((dataSource) -> ((HikariDataSource) dataSource).getMaxTotal()) .isEqualTo(42); } From 8ff6831744505270b6babf0f7b1b032b72f0ba9f Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Wed, 6 Nov 2024 15:12:37 +0000 Subject: [PATCH 4/7] format and fix compilation issue --- .../MyDataSourcesConfigurationTests.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java index 9ed7e1e4193b..64481c1696b7 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java @@ -56,9 +56,10 @@ void validateConfiguration() throws SQLException { assertThat(this.context.getBean("dataSource")).isSameAs(this.dataSource); assertThat(this.dataSource.getConnection().getMetaData().getURL()).startsWith("jdbc:h2:mem:"); assertThat(this.context.getBean("secondDataSource")).isSameAs(this.secondDataSource); - assertThat(this.secondDataSource).extracting((dataSource) -> ((HikariDataSource) dataSource).getUrl()) + assertThat(this.secondDataSource).extracting((dataSource) -> ((HikariDataSource) dataSource).getJdbcUrl()) .isEqualTo("jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1"); - assertThat(this.secondDataSource).extracting((dataSource) -> ((HikariDataSource) dataSource).getMaxTotal()) + assertThat(this.secondDataSource) + .extracting((dataSource) -> ((HikariDataSource) dataSource).getMaximumPoolSize()) .isEqualTo(42); } From f6af322aae241615c8b461c7f21ee2afc3ae3610 Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Wed, 6 Nov 2024 15:54:59 +0000 Subject: [PATCH 5/7] fix test cases --- .../MyCompleteAdditionalDataSourceConfiguration.java | 2 +- .../MyDataSourcesConfigurationTests.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 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 7e4058eed734..6d8c7fb007f5 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 @@ -36,7 +36,7 @@ public DataSourceProperties secondDataSourceProperties() { @Qualifier("second") @Bean(defaultCandidate = false) - @ConfigurationProperties("app.datasource.configuration") + @ConfigurationProperties("app.datasource.hikari") public HikariDataSource secondDataSource( @Qualifier("secondDataSourceProperties") DataSourceProperties secondDataSourceProperties) { return secondDataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build(); diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java index 64481c1696b7..1c82ae1a5b4c 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java @@ -32,12 +32,13 @@ import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link MyAdditionalDataSourceConfiguration}. + * Tests for {@link MyCompleteAdditionalDataSourceConfiguration}. * * @author Stephane Nicoll */ -@SpringBootTest(properties = { "app.datasource.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1", "app.datasource.max-total=42" }) -@Import(MyAdditionalDataSourceConfiguration.class) +@SpringBootTest(properties = { "app.datasource.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1", + "app.datasource.hikari.maximum-pool-size=42" }) +@Import(MyCompleteAdditionalDataSourceConfiguration.class) class MyDataSourcesConfigurationTests { @Autowired From 3574873f783ed686c25aea02ede1992abd1a56ce Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Wed, 6 Nov 2024 17:08:03 +0000 Subject: [PATCH 6/7] change assertion to show that they are bind --- .../MyCompleteDataSourcesConfigurationTests.java | 10 ++++++++-- .../MyDataSourcesConfigurationTests.java | 13 ++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteDataSourcesConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteDataSourcesConfigurationTests.java index 143ab498551b..65dcc88fdeb5 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteDataSourcesConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteDataSourcesConfigurationTests.java @@ -34,8 +34,10 @@ * Tests for {@link MyCompleteAdditionalDataSourceConfiguration}. * * @author Stephane Nicoll + * @author Raja Kolli */ -@SpringBootTest +@SpringBootTest(properties = { "app.datasource.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1", + "app.datasource.hikari.maximum-pool-size=42" }) @Import(MyCompleteAdditionalDataSourceConfiguration.class) class MyCompleteDataSourcesConfigurationTests { @@ -55,7 +57,11 @@ void validateConfiguration() throws SQLException { assertThat(this.context.getBean("dataSource")).isSameAs(this.dataSource); assertThat(this.dataSource.getConnection().getMetaData().getURL()).startsWith("jdbc:h2:mem:"); assertThat(this.context.getBean("secondDataSource")).isSameAs(this.secondDataSource); - assertThat(this.secondDataSource.getConnection().getMetaData().getURL()).startsWith("jdbc:h2:mem:"); + assertThat(this.secondDataSource).extracting((dataSource) -> ((HikariDataSource) dataSource).getJdbcUrl()) + .isEqualTo("jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1"); + assertThat(this.secondDataSource) + .extracting((dataSource) -> ((HikariDataSource) dataSource).getMaximumPoolSize()) + .isEqualTo(42); } } diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java index 1c82ae1a5b4c..2bfde5d80932 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java @@ -32,13 +32,12 @@ import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link MyCompleteAdditionalDataSourceConfiguration}. + * Tests for {@link MyAdditionalDataSourceConfiguration}. * * @author Stephane Nicoll */ -@SpringBootTest(properties = { "app.datasource.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1", - "app.datasource.hikari.maximum-pool-size=42" }) -@Import(MyCompleteAdditionalDataSourceConfiguration.class) +@SpringBootTest(properties = { "app.datasource.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1" }) +@Import(MyAdditionalDataSourceConfiguration.class) class MyDataSourcesConfigurationTests { @Autowired @@ -57,11 +56,7 @@ void validateConfiguration() throws SQLException { assertThat(this.context.getBean("dataSource")).isSameAs(this.dataSource); assertThat(this.dataSource.getConnection().getMetaData().getURL()).startsWith("jdbc:h2:mem:"); assertThat(this.context.getBean("secondDataSource")).isSameAs(this.secondDataSource); - assertThat(this.secondDataSource).extracting((dataSource) -> ((HikariDataSource) dataSource).getJdbcUrl()) - .isEqualTo("jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1"); - assertThat(this.secondDataSource) - .extracting((dataSource) -> ((HikariDataSource) dataSource).getMaximumPoolSize()) - .isEqualTo(42); + assertThat(this.secondDataSource.getConnection().getMetaData().getURL()).startsWith("jdbc:h2:mem:"); } } From 5b5034dbeade79d7b25a9a7d22127576eb67fadc Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Wed, 6 Nov 2024 17:42:43 +0000 Subject: [PATCH 7/7] update in kotlin sample as well --- .../MyAdditionalDataSourceConfiguration.kt | 6 +++--- .../MyCompleteAdditionalDataSourceConfiguration.kt | 8 ++++---- .../MyCompleteDataSourcesConfigurationTests.java | 1 + .../MyDataSourcesConfigurationTests.java | 3 +-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.kt index 401f08d7f417..e4484556255a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyAdditionalDataSourceConfiguration.kt @@ -16,7 +16,7 @@ package org.springframework.boot.docs.howto.dataaccess.configuretwodatasources -import org.apache.commons.dbcp2.BasicDataSource +import com.zaxxer.hikari.HikariDataSource import org.springframework.beans.factory.annotation.Qualifier import org.springframework.boot.context.properties.ConfigurationProperties @@ -30,8 +30,8 @@ class MyAdditionalDataSourceConfiguration { @Qualifier("second") @Bean(defaultCandidate = false) @ConfigurationProperties("app.datasource") - fun secondDataSource(): BasicDataSource { - return DataSourceBuilder.create().type(BasicDataSource::class.java).build() + fun secondDataSource(): HikariDataSource? { + return DataSourceBuilder.create().type(HikariDataSource::class.java).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 cccbbff269d2..6861f138c8ad 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 @@ -16,7 +16,7 @@ package org.springframework.boot.docs.howto.dataaccess.configuretwodatasources -import org.apache.commons.dbcp2.BasicDataSource +import com.zaxxer.hikari.HikariDataSource import org.springframework.beans.factory.annotation.Qualifier import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties @@ -36,9 +36,9 @@ class MyCompleteAdditionalDataSourceConfiguration { @Qualifier("second") @Bean(defaultCandidate = false) - @ConfigurationProperties("app.datasource.configuration") - fun secondDataSource(secondDataSourceProperties: DataSourceProperties): BasicDataSource { - return secondDataSourceProperties.initializeDataSourceBuilder().type(BasicDataSource::class.java).build() + @ConfigurationProperties("app.datasource.hikari") + fun secondDataSource(secondDataSourceProperties: DataSourceProperties): HikariDataSource? { + return secondDataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource::class.java).build() } } diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteDataSourcesConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteDataSourcesConfigurationTests.java index 65dcc88fdeb5..5bb56139e09c 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteDataSourcesConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteDataSourcesConfigurationTests.java @@ -20,6 +20,7 @@ import javax.sql.DataSource; +import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java index 2bfde5d80932..b80d30326b55 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java @@ -20,7 +20,6 @@ import javax.sql.DataSource; -import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +35,7 @@ * * @author Stephane Nicoll */ -@SpringBootTest(properties = { "app.datasource.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1" }) +@SpringBootTest(properties = { "app.datasource.jdbcUrl=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1" }) @Import(MyAdditionalDataSourceConfiguration.class) class MyDataSourcesConfigurationTests {