From a0da5a3a5e185b1262ab09253c06437ab3604caa Mon Sep 17 00:00:00 2001 From: Anton Kurako Date: Wed, 23 Apr 2025 00:08:25 +0300 Subject: [PATCH 1/3] 1.1.25 --- build.gradle | 46 ++++++++++++++--------------- gradle.properties | 2 +- src/main/resources/application.conf | 3 ++ src/test/resources/logback-test.xml | 2 +- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index 095c339..0494e0a 100644 --- a/build.gradle +++ b/build.gradle @@ -58,20 +58,33 @@ dependencies { testImplementation "org.mockito:mockito-core:5.7.0" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.12.0" + testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.12.2" testImplementation "org.testcontainers:junit-jupiter:1.19.8" } +def openApiGeneratePetV3 = tasks.register("openApiGenerateHttpServer", GenerateTask) { + generatorName = "kora" + group = "openapi tools" + inputSpec = "$projectDir/src/main/resources/openapi/petstoreV3.yaml" + outputDir = "$buildDir/generated/openapi" + def corePackage = "ru.tinkoff.kora.java.crud.openapi.http.server" + apiPackage = "${corePackage}.api" + modelPackage = "${corePackage}.model" + invokerPackage = "${corePackage}.invoker" + configOptions = [ + mode : "java-server", + enableServerValidation: "true", + ] +} +sourceSets.main { java.srcDirs += openApiGeneratePetV3.get().outputDir } +compileJava.dependsOn openApiGeneratePetV3 + application { applicationName = "application" mainClassName = "ru.tinkoff.kora.java.crud.Application" applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"] } -distTar { - archiveFileName = "application.tar" -} - //noinspection GroovyAssignabilityCheck run { environment([ @@ -81,28 +94,13 @@ run { ]) } -tasks.register("openApiGenerateHttpServer", GenerateTask) { - generatorName = "kora" - group = "openapi tools" - inputSpec = "$projectDir/src/main/resources/openapi/http-server.yaml" - outputDir = "$buildDir/generated/openapi" - apiPackage = "ru.tinkoff.kora.java.crud.openapi.http.server.api" - modelPackage = "ru.tinkoff.kora.java.crud.openapi.http.server.model" - invokerPackage = "ru.tinkoff.kora.java.crud.openapi.http.server.invoker" - configOptions = [ - mode : "java-server", // так же есть java-server вариация HTTP Server"а - enableServerValidation: "true" - ] -} - -sourceSets.main { - java.srcDirs += "$buildDir/generated/openapi" +distTar { + archiveFileName = "application.tar" } -compileJava.dependsOn tasks.openApiGenerateHttpServer -test.dependsOn tasks.distTar - test { + dependsOn tasks.distTar + jvmArgs += [ "-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1", diff --git a/gradle.properties b/gradle.properties index cab2a05..13efd40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ groupId=ru.tinkoff.kora -koraVersion=1.1.18 +koraVersion=1.1.25 ##### GRADLE ##### diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 5612165..dae8397 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -1,6 +1,9 @@ httpServer { publicApiHttpPort = 8080 privateApiHttpPort = 8085 + privateApiHttpMetricsPath = "/metrics" + privateApiHttpReadinessPath = "/system/readiness" + privateApiHttpLivenessPath = "/system/liveness" telemetry.logging.enabled = true } diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 4352145..6b3018c 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -17,7 +17,7 @@ - + From 155f9efec7f1a9e97e08508624c370573e198fd5 Mon Sep 17 00:00:00 2001 From: Anton Kurako Date: Wed, 23 Apr 2025 00:14:19 +0300 Subject: [PATCH 2/3] 1.1.25 --- build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 0494e0a..7f5f41f 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,12 @@ plugins { group = groupId version = koraVersion +application { + applicationName = "application" + mainClassName = "ru.tinkoff.kora.java.crud.Application" + applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"] +} + sourceCompatibility = JavaVersion.VERSION_21 targetCompatibility = JavaVersion.VERSION_21 @@ -79,12 +85,6 @@ def openApiGeneratePetV3 = tasks.register("openApiGenerateHttpServer", GenerateT sourceSets.main { java.srcDirs += openApiGeneratePetV3.get().outputDir } compileJava.dependsOn openApiGeneratePetV3 -application { - applicationName = "application" - mainClassName = "ru.tinkoff.kora.java.crud.Application" - applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"] -} - //noinspection GroovyAssignabilityCheck run { environment([ From d3ae848fb9179fe68c67e8c84b566db1f33b53b8 Mon Sep 17 00:00:00 2001 From: Anton Kurako Date: Wed, 23 Apr 2025 00:32:37 +0300 Subject: [PATCH 3/3] 1.1.25 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7f5f41f..05ff174 100644 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,7 @@ dependencies { def openApiGeneratePetV3 = tasks.register("openApiGenerateHttpServer", GenerateTask) { generatorName = "kora" group = "openapi tools" - inputSpec = "$projectDir/src/main/resources/openapi/petstoreV3.yaml" + inputSpec = "$projectDir/src/main/resources/openapi/http-server.yaml" outputDir = "$buildDir/generated/openapi" def corePackage = "ru.tinkoff.kora.java.crud.openapi.http.server" apiPackage = "${corePackage}.api"