1.2.3

Dockerfile

@@ -1,4 +1,4 @@
-ARG RUN_IMAGE=eclipse-temurin:21-jre-jammy
+ARG RUN_IMAGE=eclipse-temurin:25-jre-jammy
 FROM ${RUN_IMAGE}
 
 ARG TARGET_DIR=/opt/app

build.gradle

@@ -19,15 +19,11 @@ plugins {
 group = groupId
 version = koraVersion
 
-application {
-    applicationName = "application"
-    mainClassName = "ru.tinkoff.kora.java.crud.Application"
-    applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"]
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
-
 repositories {
     mavenCentral()
     maven { url "https://central.sonatype.com/repository/maven-snapshots" }
@@ -69,12 +65,27 @@ dependencies {
     testImplementation "org.testcontainers:junit-jupiter:1.19.8"
 }
 
+application {
+    applicationName = "application"
+    mainClass = "ru.tinkoff.kora.example.Application"
+    applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"]
+}
+
+//noinspection GroovyAssignabilityCheck
+run {
+    environment([
+            "POSTGRES_JDBC_URL": "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase",
+            "POSTGRES_USER"    : "$postgresUser",
+            "POSTGRES_PASS"    : "$postgresPassword",
+    ])
+}
+
 def openApiGeneratePetV3 = tasks.register("openApiGenerateHttpServer", GenerateTask) {
     generatorName = "kora"
     group = "openapi tools"
     inputSpec = "$projectDir/src/main/resources/openapi/http-server.yaml"
     outputDir = "$buildDir/generated/openapi"
-    def corePackage = "ru.tinkoff.kora.java.crud.openapi.http.server"
+    def corePackage = "ru.tinkoff.kora.example.openapi.http.server"
     apiPackage = "${corePackage}.api"
     modelPackage = "${corePackage}.model"
     invokerPackage = "${corePackage}.invoker"
@@ -86,15 +97,6 @@ def openApiGeneratePetV3 = tasks.register("openApiGenerateHttpServer", GenerateT
 sourceSets.main { java.srcDirs += openApiGeneratePetV3.get().outputDir }
 compileJava.dependsOn openApiGeneratePetV3
 
-//noinspection GroovyAssignabilityCheck
-run {
-    environment([
-            "POSTGRES_JDBC_URL": "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase",
-            "POSTGRES_USER"    : "$postgresUser",
-            "POSTGRES_PASS"    : "$postgresPassword",
-    ])
-}
-
 distTar {
     archiveFileName = "application.tar"
 }
@@ -118,8 +120,10 @@ test {
         exceptionFormat("full")
     }
 
+    exclude("**/\$*")
+
     jacoco {
-        excludes += ["**/Application*"]
+        excludes += ["**/generated/**", "**/Application*", "**/\$*"]
     }
 
     reports {
@@ -128,14 +132,6 @@ test {
     }
 }
 
-check.dependsOn jacocoTestReport
-jacocoTestReport {
-    reports {
-        xml.required = true
-        html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
-    }
-}
-
 flyway {
     url = "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase"
     user = "$postgresUser"
@@ -149,6 +145,15 @@ compileJava {
     options.fork = false
 }
 
+check.dependsOn jacocoTestReport
+jacocoTestReport {
+    reports {
+        xml.required = true
+        html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
+    }
+    classDirectories = files(classDirectories.files.collect { fileTree(dir: it, excludes: test.jacoco.excludes) })
+}
+
 javadoc {
     options.encoding = "UTF-8"
     if (JavaVersion.current().isJava9Compatible()) {

gradle.properties

@@ -1,5 +1,5 @@
 groupId=ru.tinkoff.kora
-koraVersion=1.2.0
+koraVersion=1.2.3
 
 
 ##### GRADLE #####

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/ru/tinkoff/kora/java/crud/Application.java → src/main/java/ru/tinkoff/kora/example/Application.java

@@ -1,4 +1,4 @@
-package ru.tinkoff.kora.java.crud;
+package ru.tinkoff.kora.example;
 
 import ru.tinkoff.kora.application.graph.KoraApplication;
 import ru.tinkoff.kora.cache.caffeine.CaffeineCacheModule;

src/main/java/ru/tinkoff/kora/java/crud/controller/HttpExceptionHandler.java → src/main/java/ru/tinkoff/kora/example/controller/HttpExceptionHandler.java

@@ -1,19 +1,18 @@
-package ru.tinkoff.kora.java.crud.controller;
+package ru.tinkoff.kora.example.controller;
 
 import io.micrometer.core.instrument.config.validate.ValidationException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeoutException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ru.tinkoff.kora.common.Component;
 import ru.tinkoff.kora.common.Context;
 import ru.tinkoff.kora.common.Tag;
+import ru.tinkoff.kora.example.openapi.http.server.model.MessageTO;
 import ru.tinkoff.kora.http.common.body.HttpBody;
 import ru.tinkoff.kora.http.server.common.*;
-import ru.tinkoff.kora.java.crud.openapi.http.server.model.MessageTO;
 import ru.tinkoff.kora.json.common.JsonWriter;
 
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeoutException;
-
 @Tag(HttpServerModule.class)
 @Component
 public final class HttpExceptionHandler implements HttpServerInterceptor {