Skip to content
This repository was archived by the owner on Aug 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions bootstrap-nonblocking/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ spring:
enabled: false
r2dbc:
url: 'r2dbc:h2:mem:///h2database'
username: 'h2user'
password: 'h2password'
properties:
Mode: PostgreSQL
MULTI_THREADED: TRUE
Expand Down
2 changes: 0 additions & 2 deletions bootstrap-nonblocking/src/test/resources/application-test.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
spring:
r2dbc:
url: 'r2dbc:h2:mem:///h2database'
username: 'h2user'
password: 'h2password'
properties:
Mode: PostgreSQL
MULTI_THREADED: TRUE
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<junit-jupiter.version>5.11.2</junit-jupiter.version>
<spring-boot.version>3.3.2</spring-boot.version>
<spring-boot.version>3.3.4</spring-boot.version>
<cucumber.version>7.20.1</cucumber.version>
<pre-liquibase.version>1.5.1</pre-liquibase.version>
<snakeyaml.version>2.3</snakeyaml.version>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
package packagename.repository.config

import io.r2dbc.spi.ConnectionFactory
import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.boot.autoconfigure.domain.EntityScan
import org.springframework.boot.autoconfigure.r2dbc.R2dbcProperties
import org.springframework.boot.r2dbc.ConnectionFactoryBuilder
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Primary
import org.springframework.core.annotation.Order
import org.springframework.core.io.ClassPathResource
import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories
import org.springframework.r2dbc.connection.init.CompositeDatabasePopulator
Expand All @@ -24,8 +29,16 @@ class R2dbcAdapterConfig {
return ExampleRepository(exampleDao)
}

@Bean("myConnectionFactory")
@Primary
fun connectionFactory(r2dbcProperties: R2dbcProperties): ConnectionFactory =
ConnectionFactoryBuilder
.withUrl("r2dbc:h2:mem:///h2database?options=DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE")
.build()

@Bean
fun initializer(connectionFactory: ConnectionFactory): ConnectionFactoryInitializer {
@Order(0) // to make sure this initializer runs first before liquibase
fun initializer(@Qualifier("myConnectionFactory") connectionFactory: ConnectionFactory): ConnectionFactoryInitializer {
val initializer = ConnectionFactoryInitializer()
initializer.setConnectionFactory(connectionFactory)
val populator = CompositeDatabasePopulator()
Expand Down
7 changes: 0 additions & 7 deletions r2dbc-adapter/src/test/resources/application-test.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
spring:
r2dbc:
url: 'r2dbc:h2:mem:///h2database'
username: 'h2user'
password: 'h2password'
initialization-mode: always
properties:
Mode: PostgreSQL
MULTI_THREADED: TRUE
DB_CLOSE_ON_EXIT: FALSE
liquibase:
change-log: classpath:/db/changelog/db.changelog-master.yaml
liquibase-schema: LIQUIBASE
Expand Down
Loading