1.2.3

Author: GoodforGod

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

@@ -9,12 +9,6 @@ plugins {
 group = groupId
 version = koraVersion
 
-application {
-    applicationName = "application"
-    mainClassName = "ru.tinkoff.kora.java.Application"
-    applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"]
-}
-
 sourceCompatibility = JavaVersion.VERSION_21
 targetCompatibility = JavaVersion.VERSION_21
 
@@ -29,14 +23,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 +40,12 @@ dependencies {
     testImplementation "org.testcontainers:junit-jupiter:1.19.8"
 }
 
+application {
+    applicationName = "application"
+    mainClassName = "ru.tinkoff.kora.java.Application"
+    applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"]
+}
+
 //noinspection GroovyAssignabilityCheck
 run {
     environment([
@@ -75,8 +76,10 @@ test {
         exceptionFormat("full")
     }
 
+    exclude("**/\$*")
+
     jacoco {
-        excludes += ["**/Application*"]
+        excludes += ["**/generated/**", "**/Application*", "**/\$*"]
     }
 
     reports {
@@ -91,6 +94,7 @@ jacocoTestReport {
         xml.required = true
         html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
     }
+    classDirectories = files(classDirectories.files.collect { fileTree(dir: it, excludes: test.jacoco.excludes) })
 }
 
 compileJava {

gradle.properties

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

src/main/java/ru/tinkoff/kora/java/Application.java

@@ -5,12 +5,10 @@
 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 {
 

src/main/java/ru/tinkoff/kora/java/SomeService.java

@@ -3,6 +3,7 @@
 import ru.tinkoff.kora.common.Component;
 import ru.tinkoff.kora.common.annotation.Root;
 
+//TODO remove this class
 @Root
 @Component
 public final class SomeService {

src/test/java/ru/tinkoff/kora/java/AppContainer.java

@@ -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));
     }

src/test/java/ru/tinkoff/kora/java/BlackBoxTests.java

@@ -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();
 

src/test/java/ru/tinkoff/kora/java/UnitTests.java

@@ -10,10 +10,10 @@
 class UnitTests {
 
     @TestComponent
-    private SomeService someService;
+    private SomeService service;
 
     @Test
     void getSomeSuccess() {
-        assertEquals("1", someService.getSome());
+        assertEquals("1", service.getSome());
     }
 }