Merge pull request #3 from kora-projects/feature/1.2.3

GoodforGod · web-flow · commit 93042fbfa2e7 · 2025-09-30T19:11:28.000+03:00
1.2.3
diff --git a/Dockerfile b/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
diff --git a/build.gradle b/build.gradle
@@ -9,15 +9,11 @@ plugins {
 group = groupId
 version = koraVersion
 
-application {
-    applicationName = "application"
-    mainClassName = "ru.tinkoff.kora.java.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" }
@@ -29,14 +25,15 @@ configurations {
     compileOnly.extendsFrom(koraBom)
     implementation.extendsFrom(koraBom)
     api.extendsFrom(koraBom)
+    testImplementation.extendsFrom(koraBom)
+    testAnnotationProcessor.extendsFrom(koraBom)
 }
 
 dependencies {
     koraBom platform("ru.tinkoff.kora:kora-parent:$koraVersion")
     annotationProcessor "ru.tinkoff.kora:annotation-processors"
 
     implementation "ru.tinkoff.kora:http-server-undertow"
-    implementation "ru.tinkoff.kora:micrometer-module"
     implementation "ru.tinkoff.kora:config-hocon"
     implementation "ru.tinkoff.kora:logging-logback"
 
@@ -45,6 +42,12 @@ 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([
@@ -75,8 +78,10 @@ test {
         exceptionFormat("full")
     }
 
+    exclude("**/\$*")
+
     jacoco {
-        excludes += ["**/Application*"]
+        excludes += ["**/generated/**", "**/Application*", "**/\$*"]
     }
 
     reports {
@@ -91,6 +96,7 @@ jacocoTestReport {
         xml.required = true
         html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
     }
+    classDirectories = files(classDirectories.files.collect { fileTree(dir: it, excludes: test.jacoco.excludes) })
 }
 
 compileJava {
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 groupId=ru.tinkoff.kora
-koraVersion=1.2.0
+koraVersion=1.2.3
 
 
 ##### GRADLE #####
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/ru/tinkoff/kora/example/Application.java b/src/main/java/ru/tinkoff/kora/example/Application.java
@@ -1,16 +1,14 @@
-package ru.tinkoff.kora.java;
+package ru.tinkoff.kora.example;
 
 import ru.tinkoff.kora.application.graph.KoraApplication;
 import ru.tinkoff.kora.common.KoraApp;
 import ru.tinkoff.kora.config.hocon.HoconConfigModule;
 import ru.tinkoff.kora.http.server.undertow.UndertowModule;
 import ru.tinkoff.kora.logging.logback.LogbackModule;
-import ru.tinkoff.kora.micrometer.module.MetricsModule;
 
 @KoraApp
 public interface Application extends
         UndertowModule, // only private server for health & metrics
-        MetricsModule,
         HoconConfigModule,
         LogbackModule {
 
diff --git a/src/main/java/ru/tinkoff/kora/example/SomeService.java b/src/main/java/ru/tinkoff/kora/example/SomeService.java
@@ -1,8 +1,9 @@
-package ru.tinkoff.kora.java;
+package ru.tinkoff.kora.example;
 
 import ru.tinkoff.kora.common.Component;
 import ru.tinkoff.kora.common.annotation.Root;
 
+//TODO remove this class
 @Root
 @Component
 public final class SomeService {
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -9,6 +9,14 @@ httpServer {
 
 logging.level {
   "root": "WARN"
+  "root": ${?LOGGING_LEVEL_ALL}
+  "root": ${?LOGGING_LEVEL_ROOT}
+
   "ru.tinkoff.kora": "INFO"
-  "ru.tinkoff.kora.java": "INFO"
+  "ru.tinkoff.kora": ${?LOGGING_LEVEL_ALL}
+  "ru.tinkoff.kora": ${?LOGGING_LEVEL_KORA}
+
+  "ru.tinkoff.kora.example": "INFO"
+  "ru.tinkoff.kora.example": ${?LOGGING_LEVEL_ALL}
+  "ru.tinkoff.kora.example": ${?LOGGING_LEVEL_APP}
 }
diff --git a/src/test/java/ru/tinkoff/kora/example/AppContainer.java b/src/test/java/ru/tinkoff/kora/example/AppContainer.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.kora.java;
+package ru.tinkoff.kora.example;
 
 import java.net.URI;
 import java.nio.file.Paths;
@@ -32,7 +32,7 @@ public static AppContainer build() {
     protected void configure() {
         super.configure();
         withExposedPorts(8085);
-        withStartupTimeout(Duration.ofSeconds(120));
+        withStartupTimeout(Duration.ofSeconds(10));
         withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(AppContainer.class)));
         waitingFor(Wait.forHttp("/system/readiness").forPort(8085).forStatusCode(200));
     }
diff --git a/src/test/java/ru/tinkoff/kora/example/BlackBoxTests.java b/src/test/java/ru/tinkoff/kora/example/BlackBoxTests.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.kora.java;
+package ru.tinkoff.kora.example;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -12,7 +12,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@Disabled("example of black box testing against default /metric endpoint")
+@Disabled("example of black box testing against default /system/readiness endpoint")
 class BlackBoxTests {
 
     private static final AppContainer container = AppContainer.build()
@@ -36,7 +36,7 @@ public static void cleanup() {
     void serviceReady() throws Exception {
         var request = HttpRequest.newBuilder()
                 .GET()
-                .uri(container.getPrivateURI().resolve("/metrics"))
+                .uri(container.getPrivateURI().resolve("/system/readiness"))
                 .timeout(Duration.ofSeconds(1))
                 .build();
 
diff --git a/src/test/java/ru/tinkoff/kora/example/UnitTests.java b/src/test/java/ru/tinkoff/kora/example/UnitTests.java
@@ -1,4 +1,4 @@
-package ru.tinkoff.kora.java;
+package ru.tinkoff.kora.example;
 
 import org.junit.jupiter.api.Test;
 import ru.tinkoff.kora.test.extension.junit5.KoraAppTest;
@@ -10,10 +10,10 @@
 class UnitTests {
 
     @TestComponent
-    private SomeService someService;
+    private SomeService service;
 
     @Test
     void getSomeSuccess() {
-        assertEquals("1", someService.getSome());
+        assertEquals("1", service.getSome());
     }
 }
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
@@ -17,7 +17,7 @@
     </root>
 
     <logger level="INFO" name="ru.tinkoff.kora"/>
-    <logger level="DEBUG" name="ru.tinkoff.kora.java"/>
+    <logger level="DEBUG" name="ru.tinkoff.kora.example"/>
 
     <logger level="WARN" name="org.testcontainers.containers"/>
     <logger level="DEBUG" name="io.goodforgod.testcontainers.extensions"/>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG RUN_IMAGE=eclipse-temurin:21-jre-jammy`
	`1`	`+ARG RUN_IMAGE=eclipse-temurin:25-jre-jammy`
`2`	`2`	`FROM ${RUN_IMAGE}`
`3`	`3`
`4`	`4`	`ARG TARGET_DIR=/opt/app`