Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 26 additions & 28 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -58,19 +64,26 @@ 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"
}

application {
applicationName = "application"
mainClassName = "ru.tinkoff.kora.java.crud.Application"
applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"]
}

distTar {
archiveFileName = "application.tar"
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"
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

//noinspection GroovyAssignabilityCheck
run {
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
groupId=ru.tinkoff.kora
koraVersion=1.1.18
koraVersion=1.1.25


##### GRADLE #####
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/application.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
httpServer {
publicApiHttpPort = 8080
privateApiHttpPort = 8085
privateApiHttpMetricsPath = "/metrics"
privateApiHttpReadinessPath = "/system/readiness"
privateApiHttpLivenessPath = "/system/liveness"
telemetry.logging.enabled = true
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/logback-test.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</root>

<logger level="INFO" name="ru.tinkoff.kora"/>
<logger level="DEBUG" name="ru.tinkoff.kora.kotlin.crud"/>
<logger level="DEBUG" name="ru.tinkoff.kora.java.crud"/>

<logger level="WARN" name="org.testcontainers.containers"/>
<logger level="DEBUG" name="io.goodforgod.testcontainers.extensions"/>
Expand Down
Loading