Implement Reactive (#47)

* implement spring boot 2.6 hibernate-reactive example
* Change unnecessarily type casting (apply Generic T Type)
* change EntityDsl type interface to class
* implement reactive-core module
* implement data-reactive-core module
* implement hibernate-reactive module
* implement test fixture integration-reactive module
* persistence.xml xsd file's version up(2.1 -> 2.2)
* implement order group equals (for equal comparison)
* implement data-hibernate-reactive module
* gradle version up 7.4.1
* add gradle build info & stacktrace option
* Add workflow to report test results in github actions
* github flow's jdk version jdk 8 to 11
* compile option for hibernate-reactive
* remove warning, below message
'compileJava' task (current target is 11) and 'compileKotlin' task (current target is 1.8) jvm target compatibility should be set to the same Java version.
* Change public members not used externally to private
* Change public members not used externally to private
* update document for reactive
* release version up

Author: Hyunsik Kang

.github/workflows/build.yaml

@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'adopt'
           cache: gradle
       - name: Validate Gradle wrapper
@@ -33,6 +33,11 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./build/reports/jacoco/codeCoverageReport/codeCoverageReport.xml
+      - name: Publish Unit Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v1
+        if: always()
+        with:
+          files: test-results/**/*.xml
       - name: Cleanup Gradle Cache
         # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
         # Restoring these files from a GitHub Actions cache might cause problems for future builds.

README.md

@@ -15,6 +15,9 @@ There are several libraries in the easy way to use JPA. However, those libraries
 
 ## Quick start
 
+### Reactive
+If you are interested in JPA Reactive See [more](./reactive-core/README.md)
+
 ### Hibernate
 
 Add Hibernate Kotlin JDSL and Hibernate to dependencies

build.gradle.kts

@@ -1,3 +1,5 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -11,7 +13,7 @@ plugins {
 
 allprojects {
     group = "com.linecorp.kotlin-jdsl"
-    version = "1.3.0.RELEASE"
+    version = "2.0.0.RELEASE"
 
     repositories {
         mavenCentral()
@@ -30,8 +32,10 @@ subprojects {
 
     apply<LocalPropertiesPlugin>()
 
-    java.sourceCompatibility = JavaVersion.VERSION_1_8
-    java.targetCompatibility = JavaVersion.VERSION_1_8
+    val jdk11Required = name.contains("hibernate-reactive")
+    val javaVersion = if (jdk11Required) JavaVersion.VERSION_11 else JavaVersion.VERSION_1_8
+    java.sourceCompatibility = javaVersion
+    java.targetCompatibility = javaVersion
 
     dependencies {
         implementation(Dependencies.koltin)
@@ -52,11 +56,18 @@ subprojects {
     tasks.withType<KotlinCompile> {
         kotlinOptions {
             freeCompilerArgs = listOf("-Xjsr305=strict", "-Xjvm-default=all")
-            jvmTarget = "1.8"
+            jvmTarget = if (jdk11Required) "11" else "1.8"
         }
     }
 
     tasks.withType<Test> {
         useJUnitPlatform()
+        testLogging {
+            showExceptions = true
+            exceptionFormat = FULL
+            showCauses = true
+            showStackTraces = true
+            events = setOf(FAILED)
+        }
     }
 }

buildSrc/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `kotlin-dsl`
     `java-gradle-plugin`
@@ -12,3 +14,10 @@ repositories {
 
 dependencies {
 }
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions {
+        freeCompilerArgs = listOf("-Xjsr305=strict", "-Xjvm-default=all")
+        jvmTarget = "11"
+    }
+}

buildSrc/src/main/kotlin/Dependencies.kt

@@ -4,21 +4,27 @@ import org.gradle.api.artifacts.dsl.DependencyHandler
 
 object Dependencies {
     const val kotlinVersion = "1.6.10"
-    const val springCoreVersion = "5.3.15"
-    const val springBootVersion = "2.6.3"
-    const val springDataJpa = "2.6.1"
+    const val springCoreVersion = "5.3.16"
+    const val springBootVersion = "2.6.4"
+    const val springDataJpaVersion = "2.6.2"
+    const val coroutineVersion = "1.6.0"
 
     // kotlin
     const val koltin = "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     const val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect"
 
     // Common
     const val javaPersistenceApi = "javax.persistence:javax.persistence-api:2.2"
-    const val slf4j = "org.slf4j:slf4j-api:1.7.33"
+    const val slf4j = "org.slf4j:slf4j-api:1.7.36"
     const val logback = "ch.qos.logback:logback-classic:1.2.10"
-    const val hibernate = "org.hibernate:hibernate-core:5.6.4.Final"
+    const val hibernate = "org.hibernate:hibernate-core:5.6.5.Final"
+    const val hibernateReactive = "org.hibernate.reactive:hibernate-reactive-core:1.1.3.Final"
     const val eclipselink = "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.10"
     const val jacksonKotlinModule = "com.fasterxml.jackson.module:jackson-module-kotlin"
+    const val agroalPool = "io.agroal:agroal-pool:1.14"
+    const val vertxJdbcClient = "io.vertx:vertx-jdbc-client:4.2.5"
+    const val coroutineJdk8 = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutineVersion"
+    const val coroutineReactor = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$coroutineVersion"
 
     // SpringBoot
     const val springBootStarter = "org.springframework.boot:spring-boot-starter:${springBootVersion}"
@@ -28,22 +34,27 @@ object Dependencies {
     const val springBootBom = "org.springframework.boot:spring-boot-dependencies:${springBootVersion}"
 
     const val springBootWeb = "org.springframework.boot:spring-boot-starter-web:${springBootVersion}"
+    const val springBootWebflux = "org.springframework.boot:spring-boot-starter-webflux:${springBootVersion}"
     const val springBootJpa = "org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}"
     const val springBootTest = "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
 
     // Spring
     const val springCore = "org.springframework:spring-core:${springCoreVersion}"
     const val springBeans = "org.springframework:spring-beans:${springCoreVersion}"
-    const val springJpa = "org.springframework.data:spring-data-jpa:${springDataJpa}"
-    const val springBatchInfrastructure = "org.springframework.batch:spring-batch-infrastructure:4.3.4"
+    const val springJpa = "org.springframework.data:spring-data-jpa:${springDataJpaVersion}"
+    const val springBatchInfrastructure = "org.springframework.batch:spring-batch-infrastructure:4.3.5"
 
     // Test
     const val junit = "org.junit.jupiter:junit-jupiter:5.8.2"
-    const val assertJ = "org.assertj:assertj-core:3.21.0"
+    const val assertJ = "org.assertj:assertj-core:3.22.0"
     const val mockk = "io.mockk:mockk:1.12.2"
-    const val springmockk = "com.ninja-squad:springmockk:3.1.0"
 
     const val h2 = "com.h2database:h2:1.4.200"
+
+    const val mutinyVersion = "1.4.0"
+    const val mutinyCore = "io.smallrye.reactive:mutiny:$mutinyVersion"
+    const val mutinyKotlin = "io.smallrye.reactive:mutiny-kotlin:$mutinyVersion"
+    val mutiny = listOf(mutinyCore, mutinyKotlin)
 }
 
 fun DependencyHandler.api(dependencies: List<Any>) {

buildSrc/src/main/kotlin/JacocoExtensionPlugin.kt

@@ -24,7 +24,7 @@ class JacocoExtensionPlugin : AbstractRootPlugin(apply {
 
         reports {
             xml.required.set(true)
-            html.required.set(false)
+            html.required.set(true)
             csv.required.set(false)
         }
     }

buildSrc/src/main/kotlin/Modules.kt

@@ -9,18 +9,24 @@ data class Module(
 @Suppress("unused")
 object Modules {
     val core = module(":kotlin-jdsl-core")
+    val reactiveCore = module(":kotlin-jdsl-reactive-core")
     val hibernate = module(":hibernate-kotlin-jdsl")
+    val hibernateReactive = module(":hibernate-reactive-kotlin-jdsl")
     val eclipselink = module(":eclipselink-kotlin-jdsl")
     val query = module(":kotlin-jdsl-query")
 
     val springDataCore = module(":spring-data-kotlin-jdsl-core")
+    val springDataReactiveCore = module(":spring-data-kotlin-jdsl-reactive-core")
+    val springDataHibernateReactive = module(":spring-data-kotlin-jdsl-hibernate-reactive")
     val springBatchInfrastructure = module(":spring-batch-kotlin-jdsl-infrastructure")
     val springDataAutoconfigure = module(":spring-data-kotlin-jdsl-autoconfigure")
     val springDataStarter = module(":spring-data-kotlin-jdsl-starter")
 
     val testFixtureCore = module(":test-fixture-core")
     val testFixtureEntity = module(":test-fixture-entity")
     val testFixtureIntegration = module(":test-fixture-integration")
+    val testFixtureIntegrationReactive = module(":test-fixture-integration-reactive")
+    val testFixtureHibernateReactive = module(":test-fixture-hibernate-reactive")
 
     private fun module(name: String): Module = Module(name)
 }

core/src/main/kotlin/com/linecorp/kotlinjdsl/QueryFactory.kt

@@ -3,17 +3,20 @@ package com.linecorp.kotlinjdsl
 import com.linecorp.kotlinjdsl.query.spec.expression.SubqueryExpressionSpec
 import com.linecorp.kotlinjdsl.querydsl.CriteriaDeleteQueryDsl
 import com.linecorp.kotlinjdsl.querydsl.CriteriaQueryDsl
-import com.linecorp.kotlinjdsl.querydsl.SubqueryDsl
 import com.linecorp.kotlinjdsl.querydsl.CriteriaUpdateQueryDsl
+import com.linecorp.kotlinjdsl.querydsl.SubqueryDsl
 import javax.persistence.Query
 import javax.persistence.TypedQuery
 import kotlin.reflect.KClass
 
 interface QueryFactory {
-    @Deprecated(replaceWith = ReplaceWith(expression = "selectQuery"), message = "This method has been replaced with selectQuery.")
+    @Deprecated(
+        replaceWith = ReplaceWith(expression = "selectQuery"),
+        message = "This method has been replaced with selectQuery."
+    )
     fun <T> typedQuery(returnType: Class<T>, dsl: CriteriaQueryDsl<T>.() -> Unit) = selectQuery(returnType, dsl)
     fun <T> selectQuery(returnType: Class<T>, dsl: CriteriaQueryDsl<T>.() -> Unit): TypedQuery<T>
-    fun <T: Any> updateQuery(target: KClass<T>, dsl: CriteriaUpdateQueryDsl.() -> Unit): Query
-    fun <T: Any> deleteQuery(target: KClass<T>, dsl: CriteriaDeleteQueryDsl.() -> Unit): Query
+    fun <T : Any> updateQuery(target: KClass<T>, dsl: CriteriaUpdateQueryDsl.() -> Unit): Query
+    fun <T : Any> deleteQuery(target: KClass<T>, dsl: CriteriaDeleteQueryDsl.() -> Unit): Query
     fun <T> subquery(returnType: Class<T>, dsl: SubqueryDsl<T>.() -> Unit): SubqueryExpressionSpec<T>
 }

core/src/main/kotlin/com/linecorp/kotlinjdsl/QueryFactoryExtensions.kt

@@ -19,16 +19,19 @@ inline fun <reified T> QueryFactory.streamQuery(
 ): Stream<T> = selectQuery(T::class.java, dsl).resultStream
 
 
-@Deprecated(replaceWith = ReplaceWith(expression = "selectQuery"), message = "This method has been replaced with selectQuery.")
+@Deprecated(
+    replaceWith = ReplaceWith(expression = "selectQuery"),
+    message = "This method has been replaced with selectQuery."
+)
 inline fun <reified T> QueryFactory.typedQuery(noinline dsl: CriteriaQueryDsl<T>.() -> Unit) = selectQuery(dsl)
 
 inline fun <reified T> QueryFactory.selectQuery(noinline dsl: CriteriaQueryDsl<T>.() -> Unit) =
     selectQuery(T::class.java, dsl)
 
-inline fun <reified T: Any> QueryFactory.updateQuery(noinline dsl: CriteriaUpdateQueryDsl.() -> Unit) =
+inline fun <reified T : Any> QueryFactory.updateQuery(noinline dsl: CriteriaUpdateQueryDsl.() -> Unit) =
     updateQuery(T::class, dsl)
 
-inline fun <reified T: Any> QueryFactory.deleteQuery(noinline dsl: CriteriaDeleteQueryDsl.() -> Unit) =
+inline fun <reified T : Any> QueryFactory.deleteQuery(noinline dsl: CriteriaDeleteQueryDsl.() -> Unit) =
     deleteQuery(T::class, dsl)
 
 inline fun <reified T> QueryFactory.subquery(noinline dsl: SubqueryDsl<T>.() -> Unit) =

core/src/main/kotlin/com/linecorp/kotlinjdsl/QueryFactoryImpl.kt

@@ -21,13 +21,13 @@ class QueryFactoryImpl(
         return criteriaQueryCreator.createQuery(criteriaQuerySpec)
     }
 
-    override fun <T: Any> updateQuery(target: KClass<T>, dsl: CriteriaUpdateQueryDsl.() -> Unit): Query {
+    override fun <T : Any> updateQuery(target: KClass<T>, dsl: CriteriaUpdateQueryDsl.() -> Unit): Query {
         return criteriaQueryCreator.createQuery(
             QueryDslImpl(target.java).apply(dsl).apply { from(target) }.createCriteriaUpdateQuerySpec()
         )
     }
 
-    override fun <T: Any> deleteQuery(target: KClass<T>, dsl: CriteriaDeleteQueryDsl.() -> Unit): Query {
+    override fun <T : Any> deleteQuery(target: KClass<T>, dsl: CriteriaDeleteQueryDsl.() -> Unit): Query {
         return criteriaQueryCreator.createQuery(
             QueryDslImpl(target.java).apply(dsl).apply { from(target) }.createCriteriaDeleteQuerySpec()
         )