Skip to content

Commit bb39b96

Browse files
feat : change reference from commons-dbcp to HikariDataSource
1 parent 8f6aabc commit bb39b96

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.docs.howto.dataaccess.configuretwodatasources;
1818

19-
import org.apache.commons.dbcp2.BasicDataSource;
19+
import com.zaxxer.hikari.HikariDataSource;
2020

2121
import org.springframework.beans.factory.annotation.Qualifier;
2222
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -31,7 +31,7 @@ public class MyAdditionalDataSourceConfiguration {
3131
@Bean(defaultCandidate = false)
3232
@ConfigurationProperties("app.datasource")
3333
public BasicDataSource secondDataSource() {
34-
return DataSourceBuilder.create().type(BasicDataSource.class).build();
34+
return DataSourceBuilder.create().type(HikariDataSource.class).build();
3535
}
3636

3737
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.docs.howto.dataaccess.configuretwodatasources;
1818

19-
import org.apache.commons.dbcp2.BasicDataSource;
19+
import com.zaxxer.hikari.HikariDataSource;
2020

2121
import org.springframework.beans.factory.annotation.Qualifier;
2222
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
@@ -39,7 +39,7 @@ public DataSourceProperties secondDataSourceProperties() {
3939
@ConfigurationProperties("app.datasource.configuration")
4040
public BasicDataSource secondDataSource(
4141
@Qualifier("secondDataSourceProperties") DataSourceProperties secondDataSourceProperties) {
42-
return secondDataSourceProperties.initializeDataSourceBuilder().type(BasicDataSource.class).build();
42+
return secondDataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build();
4343
}
4444

4545
}

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.docs.howto.testing.slicetests;
1818

19-
import org.apache.commons.dbcp2.BasicDataSource;
19+
import com.zaxxer.hikari.HikariDataSource;
2020

2121
import org.springframework.boot.context.properties.ConfigurationProperties;
2222
import org.springframework.boot.jdbc.DataSourceBuilder;
@@ -37,7 +37,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
3737
@Bean
3838
@ConfigurationProperties("app.datasource.second")
3939
public BasicDataSource secondDataSource() {
40-
return DataSourceBuilder.create().type(BasicDataSource.class).build();
40+
return DataSourceBuilder.create().type(HikariDataSource.class).build();
4141
}
4242

4343
}

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/slicetests/MyDatasourceConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.docs.howto.testing.slicetests;
1818

19-
import org.apache.commons.dbcp2.BasicDataSource;
19+
import com.zaxxer.hikari.HikariDataSource;
2020

2121
import org.springframework.boot.context.properties.ConfigurationProperties;
2222
import org.springframework.boot.jdbc.DataSourceBuilder;
@@ -29,7 +29,7 @@ public class MyDatasourceConfiguration {
2929
@Bean
3030
@ConfigurationProperties("app.datasource.second")
3131
public BasicDataSource secondDataSource() {
32-
return DataSourceBuilder.create().type(BasicDataSource.class).build();
32+
return DataSourceBuilder.create().type(HikariDataSource.class).build();
3333
}
3434

3535
}

0 commit comments

Comments
 (0)