From fa4eef3c7cec6d6e888975370e0876e580e5b933 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 05:47:16 +0000 Subject: [PATCH 1/2] build(deps): bump spring-boot.version from 3.3.2 to 3.3.4 Bumps `spring-boot.version` from 3.3.2 to 3.3.4. Updates `org.springframework.boot:spring-boot-starter-webflux` from 3.3.2 to 3.3.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.2...v3.3.4) Updates `org.springframework.boot:spring-boot-dependencies` from 3.3.2 to 3.3.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.2...v3.3.4) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.3.2 to 3.3.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.2...v3.3.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-webflux dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71f2b03..1a1f955 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ${java.version} ${java.version} 5.11.2 - 3.3.2 + 3.3.4 7.20.1 1.5.1 2.3 From 5baccf1585f3a9d72949cd41405e0550624675e6 Mon Sep 17 00:00:00 2001 From: Paul Williams Date: Sun, 13 Oct 2024 11:44:15 +0530 Subject: [PATCH 2/2] fix: load r2dbc config and schema.sql first before liquibase remove username and password --- .../src/main/resources/application.yml | 2 -- .../src/test/resources/application-test.yml | 2 -- .../repository/config/R2dbcAdapterConfig.kt | 15 ++++++++++++++- .../src/test/resources/application-test.yml | 7 ------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/bootstrap-nonblocking/src/main/resources/application.yml b/bootstrap-nonblocking/src/main/resources/application.yml index 197657b..6acd286 100644 --- a/bootstrap-nonblocking/src/main/resources/application.yml +++ b/bootstrap-nonblocking/src/main/resources/application.yml @@ -4,8 +4,6 @@ spring: enabled: false r2dbc: url: 'r2dbc:h2:mem:///h2database' - username: 'h2user' - password: 'h2password' properties: Mode: PostgreSQL MULTI_THREADED: TRUE diff --git a/bootstrap-nonblocking/src/test/resources/application-test.yml b/bootstrap-nonblocking/src/test/resources/application-test.yml index 9cd0ec3..8ba4577 100644 --- a/bootstrap-nonblocking/src/test/resources/application-test.yml +++ b/bootstrap-nonblocking/src/test/resources/application-test.yml @@ -1,8 +1,6 @@ spring: r2dbc: url: 'r2dbc:h2:mem:///h2database' - username: 'h2user' - password: 'h2password' properties: Mode: PostgreSQL MULTI_THREADED: TRUE diff --git a/r2dbc-adapter/src/main/kotlin/packagename/repository/config/R2dbcAdapterConfig.kt b/r2dbc-adapter/src/main/kotlin/packagename/repository/config/R2dbcAdapterConfig.kt index 9c01fa1..0c0f8d1 100644 --- a/r2dbc-adapter/src/main/kotlin/packagename/repository/config/R2dbcAdapterConfig.kt +++ b/r2dbc-adapter/src/main/kotlin/packagename/repository/config/R2dbcAdapterConfig.kt @@ -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 @@ -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() diff --git a/r2dbc-adapter/src/test/resources/application-test.yml b/r2dbc-adapter/src/test/resources/application-test.yml index b5b7051..d353a5b 100644 --- a/r2dbc-adapter/src/test/resources/application-test.yml +++ b/r2dbc-adapter/src/test/resources/application-test.yml @@ -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