init commit with r2dbc service template

Author: xcodeassociated

.github/workflows/build-and-upload.yml

@@ -79,7 +79,7 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64, linux/arm64
-          tags: xcodeassociated/spring-mvc-jpa-template:latest
+          tags: xcodeassociated/spring-reactive-r2dbc-template:latest
 
   dependency-submission:
     runs-on: ubuntu-latest

build.gradle

@@ -5,8 +5,6 @@ plugins {
 	id 'io.spring.dependency-management' version '1.1.6'
 	id 'org.jetbrains.kotlin.jvm' version '2.0.20'
 	id 'org.jetbrains.kotlin.plugin.spring' version '2.0.20'
-	id 'org.jetbrains.kotlin.plugin.jpa' version '2.0.20'
-	id "org.jetbrains.kotlin.kapt" version "2.0.20"
 	id "org.liquibase.gradle" version "2.2.1"
 	id "com.google.osdetector" version "1.7.3"
 	id 'groovy'
@@ -27,23 +25,30 @@ repositories {
 }
 
 ext {
+	set('springCloudVersion', '2023.0.3')
 	set('testcontainersVersion', '1.20.1')
 }
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+	implementation 'org.springframework:spring-jdbc'
+	runtimeOnly 'org.postgresql:r2dbc-postgresql'
+	runtimeOnly 'org.postgresql:postgresql'
+	implementation 'io.projectreactor.kotlin:reactor-kotlin-extensions'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-reactor'
 	implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
 	implementation 'org.jetbrains.kotlin:kotlin-reflect'
 	implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
-	runtimeOnly 'org.postgresql:postgresql'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-slf4j'
 	annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
 	// test utils
 	testImplementation 'io.projectreactor:reactor-test'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test'
 	testImplementation 'io.mockk:mockk:1.13.12'
 	testImplementation 'com.ninja-squad:springmockk:4.0.2'
 
@@ -60,10 +65,7 @@ dependencies {
 	// testcontainers
 	testImplementation 'org.testcontainers:junit-jupiter'
 	testImplementation 'org.testcontainers:postgresql'
-
-	// guerydsl
-	implementation 'com.querydsl:querydsl-jpa:5.1.0'
-	kapt group: 'com.querydsl', name: 'querydsl-apt', version: '5.1.0', classifier: 'jakarta'
+	testImplementation 'org.testcontainers:r2dbc'
 
 	// liquibase
 	implementation ('org.liquibase:liquibase-core:4.29.2') {
@@ -72,27 +74,27 @@ dependencies {
 	}
 	liquibaseRuntime 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 	liquibaseRuntime 'org.jetbrains.kotlin:kotlin-reflect'
-	liquibaseRuntime 'org.liquibase.ext:liquibase-hibernate6:4.29.2'
+	liquibaseRuntime 'org.liquibase.ext:liquibase-postgresql:4.29.2'
 	liquibaseRuntime 'org.postgresql:postgresql:42.7.4'
 	liquibaseRuntime 'ch.qos.logback:logback-core:1.5.8'
 	liquibaseRuntime 'ch.qos.logback:logback-classic:1.5.8'
 	liquibaseRuntime 'info.picocli:picocli:4.7.6'
-	liquibaseRuntime "org.springframework.boot:spring-boot-starter-data-jpa:3.3.1"
+	liquibaseRuntime "org.springframework.boot:spring-boot-starter-data-r2dbc:3.3.3"
 	liquibaseRuntime sourceSets.main.output
 
 	// spring security
-	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	testImplementation 'org.springframework.security:spring-security-test'
 
 	// kafka
 	implementation 'org.springframework.kafka:spring-kafka'
+	implementation 'io.projectreactor.kafka:reactor-kafka'
 	testImplementation 'org.springframework.kafka:spring-kafka-test'
 
 	// circuit breaker
-	implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j:3.1.2'
+	implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j'
 
 	// macOs ARM only
 	if (osdetector.classifier == "osx-aarch_64") {
@@ -109,22 +111,22 @@ dependencies {
 	implementation 'io.zipkin.reporter2:zipkin-sender-urlconnection'
 
 }
+
 liquibase {
 	activities {
 		main {
-			changeLogFile "$projectDir/src/main/resources/db/changesets/changelog.yml"
+			changeLogFile "src/main/resources/db/db.changelog.yml"
 			url "jdbc:postgresql://localhost:5432/application"
 			username "admin"
 			password "admin"
 			driver 'org.postgresql.Driver'
-			referenceUrl 'hibernate:spring:com.softeno.template?dialect=org.hibernate.dialect.PostgreSQL95Dialect&hibernate.use_jdbc_metadata_defaults=true&hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy'
-			referenceDriver 'liquibase.ext.hibernate.database.connection.HibernateDriver'
 		}
 	}
 }
 
 dependencyManagement {
 	imports {
+		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
 		mavenBom "org.testcontainers:testcontainers-bom:${testcontainersVersion}"
 	}
 }

docker/postgres/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   postgres:
-    image: postgres:15.2-alpine
+    image: postgres:16-alpine
     volumes:
       - postgres-data:/var/lib/postgresql/data
     environment:

http/user-app.http

@@ -1,7 +1,7 @@
 ### Permissions
 
 ###
-GET {{host}}/permissions?page=0&size=10&sort=id&direction=DESC
+GET {{host}}/permissions?page=0&size=10&sort=id&direction=ASC
 Authorization: Bearer {{oauthToken}}
 
 ###
@@ -20,7 +20,7 @@ GET {{host}}/permissions/{{permissionId}}
 Authorization: Bearer {{oauthToken}}
 
 ###
-PUT {{host}}/permissions/{{permissionId}}
+PUT {{host}}/permissions/5
 Content-Type: application/json
 Authorization: Bearer {{oauthToken}}
 

src/main/kotlin/com/softeno/template/SoftenoMvcJpaApp.kt

@@ -4,17 +4,19 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.runApplication
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories
+import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories
 import org.springframework.transaction.annotation.EnableTransactionManagement
+import reactor.core.publisher.Hooks
 
 @SpringBootApplication
-@EnableJpaRepositories
 @EnableTransactionManagement
 @EnableConfigurationProperties
+@EnableR2dbcRepositories
 @ConfigurationPropertiesScan("com.softeno")
 class SoftenoMvcJpaApp
 
 fun main(args: Array<String>) {
+	Hooks.enableAutomaticContextPropagation()
 	runApplication<SoftenoMvcJpaApp>(*args)
 }
 

src/main/kotlin/com/softeno/template/app/common/PrincipalHandler.kt

@@ -0,0 +1,27 @@
+package com.softeno.template.app.common
+
+//import io.micrometer.tracing.Tracer
+import kotlinx.coroutines.reactor.awaitSingleOrNull
+import org.apache.commons.logging.Log
+import org.springframework.security.core.context.ReactiveSecurityContextHolder
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken
+import reactor.core.publisher.Mono
+import java.security.Principal
+
+interface PrincipalHandler {
+    suspend fun showPrincipal(log: Log, monoPrincipal: Mono<Principal>){
+        val principal = monoPrincipal.awaitSingleOrNull()
+        log.info("principal: $principal, name: ${principal?.name}")
+        val authentication = ReactiveSecurityContextHolder.getContext().map { it.authentication }.awaitSingleOrNull()
+        if (authentication != null) {
+            val token = (authentication as JwtAuthenticationToken).token
+            val userId = token.claims["sub"]
+            val authorities = authentication.authorities
+            log.debug("authentication: $authentication")
+            log.debug("authorities: $authorities")
+            log.debug("token: $token")
+            log.debug("token claims: ${token.claims}")
+            log.info("keycloak userId: $userId")
+        }
+    }
+}