Refactored structure and more Kotlin examples (#42)

* Cleanup CI

* Directory refactoring

* Refactored GraalVM examples
Updated and fixed parallel build due to GraalVM plugin issue in build.gradle
Improved and reinforced grouping.gradle and settings.gradle
Updated CI

* Cleanup

* Improved README.md

* Added more Kotlin examples

* Cleanup

* Added README.md

* Downgrade JDK to 21

* Downgrade JDK to 21

* Reinforce CI

* Changed Cassandra test extension for Scylla for better performance
Updated testcontainers-extensions version
Minor fixes

* Try downgrade GraalVM plugin

* Cleanup

* Limit workers for CI

* Disable parallel for Github cause it always fail there

* Disable parallel for Github cause it always fail there

* Minor cleanup

* Minor cleanup

* Fixed native configs

* Added full Kotlin tests
Updated test dependencies
Code style

* Fixed dep for zeebe

* Fixed root containers

* Cleanup

* Fixes

* Fixes

* Separated

* Minor cleanup

* Minor cleanup and dep fix

* Added test driver

* Reinforced and improved and fixed and cleanup

* Kafka as separate

* Cleanup

Author: GoodforGod

.github/workflows/test-master.yml

@@ -6,18 +6,23 @@ on:
       - "master"
 
 jobs:
-  test:
+  build-tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        task: [ "database", "client", "server", "graalvm", "kotlin", "other" ]
-    name: Running tests for ${{ matrix.task }}
+        java: [ "21" ]
+        type: [ "Examples" ]
+        lang: [ "Java", "Kotlin" ]
+        feature: [ "Database", "Client", "Server", "Graalvm", "Kafka", "Other" ]
+    name: Pull Request Java ${{ matrix.java }} for ${{ matrix.type }}-${{ matrix.lang }}-${{ matrix.feature }}
+    env:
+      GRADLE_TASK_SUFFIX: ${{ matrix.type }}${{ matrix.lang }}${{ matrix.feature }}
     steps:
       - uses: actions/checkout@v4
       - name: JDK setup
         uses: actions/setup-java@v4
         with:
-          java-version: "17"
+          java-version: ${{ matrix.java }}
           distribution: "adopt"
 
       - name: Gradle setup
@@ -26,11 +31,11 @@ jobs:
           cache-read-only: ${{ github.ref != 'refs/heads/master' }}
           gradle-home-cache-cleanup: ${{ github.ref == 'refs/heads/master' }}
 
-      - name: Gradle classes
-        run: "./gradlew classes-${{ matrix.task }} --scan"
+      - name: Gradle build classes
+        run: "./gradlew classes${{ env.GRADLE_TASK_SUFFIX }} --no-daemon --no-parallel --scan --stacktrace"
 
-      - name: Gradle tests classes
-        run: "./gradlew testClasses-${{ matrix.task }} --scan"
+      - name: Gradle build test classes
+        run: "./gradlew testClasses${{ env.GRADLE_TASK_SUFFIX }} --no-daemon --no-parallel --scan --stacktrace"
 
-      - name: Gradle tests
-        run: "./gradlew test-${{ matrix.task }} jacocoTestReport --no-parallel --scan"
+      - name: Gradle run tests
+        run: "./gradlew test${{ env.GRADLE_TASK_SUFFIX }} --no-daemon --no-parallel --scan --stacktrace"

.github/workflows/test-pr.yml

@@ -17,9 +17,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ "17" ]
-        task: [ "database", "client", "server", "graalvm", "kotlin", "other" ]
-    name: Pull Request Java ${{ matrix.java }} for ${{ matrix.task }}
+        java: [ "21" ]
+        type: [ "Examples" ]
+        lang: [ "Java", "Kotlin" ]
+        feature: [ "Database", "Client", "Server", "Graalvm", "Kafka", "Other" ]
+    name: Pull Request Java ${{ matrix.java }} for ${{ matrix.type }}-${{ matrix.lang }}-${{ matrix.feature }}
+    env:
+      GRADLE_TASK_SUFFIX: ${{ matrix.type }}${{ matrix.lang }}${{ matrix.feature }}
     steps:
       - uses: actions/checkout@v4
       - name: JDK setup
@@ -34,18 +38,11 @@ jobs:
           cache-read-only: ${{ github.ref != 'refs/heads/master' }}
           gradle-home-cache-cleanup: ${{ github.ref == 'refs/heads/master' }}
 
-      - name: Gradle classes
-        run: "./gradlew classes-${{ matrix.task }} --scan"
+      - name: Gradle build classes
+        run: "./gradlew classes${{ env.GRADLE_TASK_SUFFIX }} --no-daemon --no-parallel --scan --stacktrace"
 
-      - name: Gradle tests classes
-        run: "./gradlew testClasses-${{ matrix.task }} --scan"
+      - name: Gradle build test classes
+        run: "./gradlew testClasses${{ env.GRADLE_TASK_SUFFIX }} --no-daemon --no-parallel --scan --stacktrace"
 
-      - name: Gradle tests
-        run: "./gradlew test-${{ matrix.task }} jacocoTestReport --no-parallel --scan"
-
-      - name: Report tests
-        if: ${{ matrix.java }} == "17"
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          files: |
-            **/test-results/**/*.xml
+      - name: Gradle run tests
+        run: "./gradlew test${{ env.GRADLE_TASK_SUFFIX }} --no-daemon --no-parallel --scan --stacktrace"

README.md

@@ -1,15 +1,21 @@
 [![Maven Central](https://img.shields.io/maven-central/v/ru.tinkoff.kora/common.svg)](https://central.sonatype.com/artifact/ru.tinkoff.kora/common)
 [![GitHub Action](https://github.com/kora-projects/kora-examples/workflows/Build%20Master/badge.svg)](https://github.com/kora-projects/kora-examples/actions?query=workflow%3A%22Build%20Master%22++)
 
-# Kora examples
+# Kora Examples
 
-В данном репозитории собраны примеры сервисов использующих различные модули [фреймворка Kora](https://kora-projects.github.io/kora-docs/ru/).
+В данном репозитории собраны примеры сервисов, использующих различные модули [фреймворка Kora](https://kora-projects.github.io/kora-docs/ru/).
 Каждый Gradle модуль является независимым сервисом. 
 
 Здесь можно посмотреть на реализации модулей фреймворка Kora на Java и Kotlin языках, протестировать их функционал, 
 использовать примеры как пособие по начальному погружению в Kora.
 [Хотите знать больше?](https://kora-projects.github.io/kora-docs/ru/)
 
+## Где находятся примеры
+
+- Java: [`examples/java`](examples/java)
+- Kotlin: [`examples/kotlin`](examples/kotlin)
+- GraalVM: [`examples/graalvm`](examples/graalvm)
+
 [Описание](https://kora-projects.github.io/kora-docs/ru/) | [Документация](https://kora-projects.github.io/kora-docs/ru/documentation/general/) | [Ознакомление](https://kora-projects.github.io/kora-docs/ru/examples/hello-world/) 
 
 ---
@@ -21,4 +27,10 @@ Here you can look at implementations of Kora framework modules in Java and Kotli
 use the examples as a guide for initial immersion in Kora.
 [Would you like to know more?](https://kora-projects.github.io/kora-docs/en/)
 
+## Where examples are located
+
+- Java: [`examples/java`](examples/java)
+- Kotlin: [`examples/kotlin`](examples/kotlin)
+- GraalVM: [`examples/graalvm`](examples/graalvm)
+
 [Home](https://kora-projects.github.io/kora-docs/en/) | [Documentation](https://kora-projects.github.io/kora-docs/en/documentation/general/) | [Hello World](https://kora-projects.github.io/kora-docs/en/examples/hello-world/)

build.gradle

@@ -1,7 +1,10 @@
+import org.gradle.api.services.BuildService
+import org.gradle.api.services.BuildServiceParameters
+
 plugins {
     id "com.diffplug.spotless" version "6.19.0"
     id "com.asarkar.gradle.build-time-tracker" version "4.3.0"
-    id "org.graalvm.buildtools.native" version "0.11.1" apply false // or dependsOn fails in graalvm examples
+    id "org.graalvm.buildtools.native" version "0.11.5" apply false // or dependsOn fails in graalvm examples
     id "org.jetbrains.kotlin.jvm" version "1.9.25" apply false
     id "org.jetbrains.kotlin.kapt" version "1.9.25" apply false
 }
@@ -12,14 +15,42 @@ version = koraVersion
 repositories {
     mavenLocal()
     mavenCentral()
-    maven { url "https://central.sonatype.com/repository/maven-snapshots" }
+    maven { url = "https://central.sonatype.com/repository/maven-snapshots" }
+}
+
+def maxParallelWorkers = providers.environmentVariable("MAX_PARALLEL_WORKERS")
+if (maxParallelWorkers.isPresent()) {
+    def maxParallelWorkersValue = maxParallelWorkers.get().trim()
+    if (!maxParallelWorkersValue.isInteger()) {
+        throw new GradleException("MAX_PARALLEL_WORKERS must be a positive integer, but was '${maxParallelWorkers.get()}'")
+    }
+
+    def maxParallelWorkersCount = maxParallelWorkersValue.toInteger()
+    if (maxParallelWorkersCount < 1) {
+        throw new GradleException("MAX_PARALLEL_WORKERS must be a positive integer, but was '${maxParallelWorkers.get()}'")
+    }
+
+    gradle.startParameter.maxWorkerCount = maxParallelWorkersCount
+}
+
+// plugin was attempted without an exclusive lock - https://github.com/graalvm/native-build-tools/issues/760
+abstract class GraalVmBuildLock implements BuildService<BuildServiceParameters.None> {}
+
+def graalVmBuildLock = gradle.sharedServices.registerIfAbsent("graalVmBuildLock", GraalVmBuildLock) {
+    maxParallelUsages = 1
 }
 
 subprojects {
     if (!project.childProjects.isEmpty()) {
         return
     }
 
+    if (project.path.startsWith(":examples:graalvm:")) {
+        tasks.configureEach {
+            usesService(graalVmBuildLock)
+        }
+    }
+
     apply plugin: "java"
     apply plugin: "com.asarkar.gradle.build-time-tracker"
 
@@ -43,7 +74,7 @@ subprojects {
     repositories {
         mavenLocal()
         mavenCentral()
-        maven { url "https://central.sonatype.com/repository/maven-snapshots" }
+        maven { url = "https://central.sonatype.com/repository/maven-snapshots" }
     }
 
     configurations {
@@ -54,7 +85,11 @@ subprojects {
         }
     }
 
-    task allDeps(type: DependencyReportTask) {}
+    tasks.withType(JavaCompile).configureEach {
+        options.compilerArgs.add("-Xlint:-processing")
+    }
+
+    tasks.register("allDeps", DependencyReportTask)
 }
 
 apply from: "${project.rootDir}/grouping.gradle"

examples/graalvm/README.md

@@ -0,0 +1,11 @@
+# Kora GraalVM examples
+
+Kora GraalVM examples show Java services configured for native image builds with Kora.
+
+| Example | Description | Kora modules |
+| --- | --- | --- |
+| [`kora-java-graalvm-crud-cassandra`](kora-java-graalvm-crud-cassandra) | Native CRUD HTTP service backed by Cassandra and Redis cache. | [CassandraDatabaseModule](https://kora-projects.github.io/kora-docs/ru/documentation/database-cassandra/), [RedisCacheModule](https://kora-projects.github.io/kora-docs/ru/documentation/cache/), [UndertowHttpServerModule](https://kora-projects.github.io/kora-docs/ru/documentation/http-server/), [ResilientModule](https://kora-projects.github.io/kora-docs/ru/documentation/resilient/), [ValidationModule](https://kora-projects.github.io/kora-docs/ru/documentation/validation/), [JsonModule](https://kora-projects.github.io/kora-docs/ru/documentation/json/), [MetricsModule](https://kora-projects.github.io/kora-docs/ru/documentation/metrics/), [OpenApiManagementModule](https://kora-projects.github.io/kora-docs/ru/documentation/openapi-management/) |
+| [`kora-java-graalvm-crud-jdbc`](kora-java-graalvm-crud-jdbc) | Native CRUD HTTP service backed by JDBC and Caffeine cache. | [JdbcDatabaseModule](https://kora-projects.github.io/kora-docs/ru/documentation/database-jdbc/), [CaffeineCacheModule](https://kora-projects.github.io/kora-docs/ru/documentation/cache/), [UndertowHttpServerModule](https://kora-projects.github.io/kora-docs/ru/documentation/http-server/), [ResilientModule](https://kora-projects.github.io/kora-docs/ru/documentation/resilient/), [ValidationModule](https://kora-projects.github.io/kora-docs/ru/documentation/validation/), [JsonModule](https://kora-projects.github.io/kora-docs/ru/documentation/json/), [MetricsModule](https://kora-projects.github.io/kora-docs/ru/documentation/metrics/), [OpenApiManagementModule](https://kora-projects.github.io/kora-docs/ru/documentation/openapi-management/) |
+| [`kora-java-graalvm-crud-r2dbc`](kora-java-graalvm-crud-r2dbc) | Native CRUD HTTP service backed by R2DBC and Caffeine cache. | [R2dbcDatabaseModule](https://kora-projects.github.io/kora-docs/ru/documentation/database-r2dbc/), [CaffeineCacheModule](https://kora-projects.github.io/kora-docs/ru/documentation/cache/), [UndertowHttpServerModule](https://kora-projects.github.io/kora-docs/ru/documentation/http-server/), [ResilientModule](https://kora-projects.github.io/kora-docs/ru/documentation/resilient/), [ValidationModule](https://kora-projects.github.io/kora-docs/ru/documentation/validation/), [JsonModule](https://kora-projects.github.io/kora-docs/ru/documentation/json/), [MetricsModule](https://kora-projects.github.io/kora-docs/ru/documentation/metrics/), [OpenApiManagementModule](https://kora-projects.github.io/kora-docs/ru/documentation/openapi-management/) |
+| [`kora-java-graalvm-crud-vertx`](kora-java-graalvm-crud-vertx) | Native CRUD HTTP service backed by Vert.x SQL client and Caffeine cache. | [VertxDatabaseModule](https://kora-projects.github.io/kora-docs/ru/documentation/database-vertx/), [CaffeineCacheModule](https://kora-projects.github.io/kora-docs/ru/documentation/cache/), [UndertowHttpServerModule](https://kora-projects.github.io/kora-docs/ru/documentation/http-server/), [ResilientModule](https://kora-projects.github.io/kora-docs/ru/documentation/resilient/), [ValidationModule](https://kora-projects.github.io/kora-docs/ru/documentation/validation/), [JsonModule](https://kora-projects.github.io/kora-docs/ru/documentation/json/), [MetricsModule](https://kora-projects.github.io/kora-docs/ru/documentation/metrics/), [OpenApiManagementModule](https://kora-projects.github.io/kora-docs/ru/documentation/openapi-management/) |
+| [`kora-java-graalvm-kafka`](kora-java-graalvm-kafka) | Native Kafka service. | [KafkaModule](https://kora-projects.github.io/kora-docs/ru/documentation/kafka/) |

…a-java-graalvm-crud-cassandra/Dockerfile …a-java-graalvm-crud-cassandra/Dockerfilekora-java-graalvm-crud-cassandra/Dockerfile renamed to examples/graalvm/kora-java-graalvm-crud-cassandra/Dockerfile kora-java-graalvm-crud-cassandra/Dockerfile renamed to examples/graalvm/kora-java-graalvm-crud-cassandra/Dockerfile

@@ -12,8 +12,15 @@ plugins {
     id "application"
 
     id "org.openapi.generator" version "7.14.0"
-    id "com.gradleup.shadow" version "9.2.2"
-    id "org.graalvm.buildtools.native" version "0.11.1"
+    id "com.gradleup.shadow" version "9.4.1"
+    id "org.graalvm.buildtools.native"
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+        vendor = JvmVendorSpec.ADOPTIUM
+    }
 }
 
 configurations {
@@ -49,14 +56,9 @@ dependencies {
 
     testImplementation "org.mockito:mockito-core:5.18.0"
     testImplementation "ru.tinkoff.kora:test-junit5"
-    testImplementation "io.goodforgod:testcontainers-extensions-cassandra:0.12.2"
-    testImplementation "io.goodforgod:testcontainers-extensions-redis:0.12.2"
-    testImplementation "org.testcontainers:junit-jupiter:1.19.8"
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    testImplementation "io.goodforgod:testcontainers-extensions-scylla:0.13.1"
+    testImplementation "io.goodforgod:testcontainers-extensions-redis:0.13.1"
+    testImplementation "org.testcontainers:junit-jupiter:1.21.4"
 }
 
 application {
@@ -122,9 +124,7 @@ shadowJar {
     }
 }
 
-artifacts {
-    archives shadowJar
-}
+assemble.dependsOn shadowJar
 
 test {
     dependsOn tasks.shadowJar
@@ -140,9 +140,9 @@ test {
 
     useJUnitPlatform()
     testLogging {
-        showStandardStreams(true)
+        showStandardStreams = true
         events("passed", "skipped", "failed")
-        exceptionFormat("full")
+        exceptionFormat = "full"
     }
 
     exclude("**/\$*")
@@ -158,8 +158,8 @@ test {
 }
 
 compileJava {
-    options.encoding("UTF-8")
-    options.incremental(true)
+    options.encoding = "UTF-8"
+    options.incremental = true
     options.fork = false
 }
 

…ra-java-graalvm-crud-cassandra/README.md …ra-java-graalvm-crud-cassandra/README.mdkora-java-graalvm-crud-cassandra/README.md renamed to examples/graalvm/kora-java-graalvm-crud-cassandra/README.md kora-java-graalvm-crud-cassandra/README.md renamed to examples/graalvm/kora-java-graalvm-crud-cassandra/README.md

@@ -4,9 +4,6 @@ services:
     restart: unless-stopped
     ports:
       - '5432:5432'
-
-
-
 # Можно закомментировать секцию application и использовать docker-compose
 # как окружения для запуска сервиса через gradle run
   application:

…java-graalvm-crud-cassandra/build.gradle …java-graalvm-crud-cassandra/build.gradlekora-java-graalvm-crud-cassandra/build.gradle renamed to examples/graalvm/kora-java-graalvm-crud-cassandra/build.gradle kora-java-graalvm-crud-cassandra/build.gradle renamed to examples/graalvm/kora-java-graalvm-crud-cassandra/build.gradle

@@ -13,4 +13,3 @@ redisPort=6379
 redisDatabase=0
 redisUser=default
 redisPassword=redis
-