From caaedd2df62e550f49478908b4e10fc4dc30bd5d Mon Sep 17 00:00:00 2001 From: John Andre Hestad Date: Fri, 20 Dec 2024 17:43:44 +0100 Subject: [PATCH] Rydd opp i compiler warnings og ktlint --- .gitattributes | 6 ++++ auth-core/build.gradle.kts | 5 --- auth-ktor/build.gradle.kts | 5 --- auth-test-core/build.gradle.kts | 5 --- build.gradle.kts | 34 ++++++++++++++----- common/build.gradle.kts | 5 --- datadeling-dtos/build.gradle.kts | 5 --- jobber/build.gradle.kts | 5 --- .../tiltakspenger/libs/jobber/StoppableJob.kt | 12 +++++-- json/build.gradle.kts | 5 --- ktor-common/build.gradle.kts | 5 --- ktor-test-common/build.gradle.kts | 5 --- logging/build.gradle.kts | 5 --- .../periode/PeriodeTilst\303\270terTest.kt" | 2 +- .../persistering-domene/build.gradle.kts | 5 --- .../build.gradle.kts | 5 --- .../personklient-domene/build.gradle.kts | 5 --- .../build.gradle.kts | 5 --- .../TilgangsstyringServiceImpl.kt | 1 - test-common/build.gradle.kts | 7 ++-- tiltak-dtos/build.gradle.kts | 5 --- 21 files changed, 44 insertions(+), 93 deletions(-) create mode 100644 .gitattributes rename "periodisering/test/no/nav/tiltakspenger/libs/periodisering/periode/Periode_tilst\303\270terTest.kt" => "periodisering/test/no/nav/tiltakspenger/libs/periodisering/periode/PeriodeTilst\303\270terTest.kt" (98%) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..00a51af --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/auth-core/build.gradle.kts b/auth-core/build.gradle.kts index b000b6f..b114748 100644 --- a/auth-core/build.gradle.kts +++ b/auth-core/build.gradle.kts @@ -16,8 +16,3 @@ dependencies { testImplementation(project(":test-common")) } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git a/auth-ktor/build.gradle.kts b/auth-ktor/build.gradle.kts index f4c3bc2..b1167dc 100644 --- a/auth-ktor/build.gradle.kts +++ b/auth-ktor/build.gradle.kts @@ -34,8 +34,3 @@ dependencies { } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git a/auth-test-core/build.gradle.kts b/auth-test-core/build.gradle.kts index 196eacd..729ea43 100644 --- a/auth-test-core/build.gradle.kts +++ b/auth-test-core/build.gradle.kts @@ -11,8 +11,3 @@ dependencies { api("com.auth0:java-jwt:4.4.0") api("com.auth0:jwks-rsa:0.22.1") } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git a/build.gradle.kts b/build.gradle.kts index 2fd20c9..0bc9b33 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,4 @@ +import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.jetbrains.kotlin.gradle.dsl.JvmTarget val javaVersion = JavaVersion.VERSION_21 @@ -27,22 +28,29 @@ subprojects { apply(plugin = "java-library") apply(plugin = "com.diffplug.spotless") + dependencies { + testImplementation(platform("org.junit:junit-bom:5.11.4")) + testImplementation("org.junit.jupiter:junit-jupiter") + testImplementation("org.junit.jupiter:junit-jupiter-params") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") + } + spotless { kotlin { - ktlint("0.48.2") + ktlint() + .editorConfigOverride( + mapOf( + "ktlint_standard_max-line-length" to "off", + ), + ) } } tasks { - compileKotlin { - compilerOptions { - jvmTarget.set(jvmVersion) - } - } - compileTestKotlin { + kotlin { compilerOptions { jvmTarget.set(jvmVersion) - freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn") + freeCompilerArgs.add("-Xconsistent-data-class-copy-visibility") } } test { @@ -50,6 +58,11 @@ subprojects { useJUnitPlatform() // https://phauer.com/2018/best-practices-unit-testing-kotlin/ systemProperty("junit.jupiter.testinstance.lifecycle.default", "per_class") + testLogging { + // We only want to log failed and skipped tests when running Gradle. + events("skipped", "failed") + exceptionFormat = TestExceptionFormat.FULL + } } withType { duplicatesStrategy = DuplicatesStrategy.INCLUDE @@ -90,6 +103,11 @@ subprojects { sourceSets["test"].resources.srcDirs("test") } +configurations.all { + // exclude JUnit 4 + exclude(group = "junit", module = "junit") +} + tasks { register("addPreCommitGitHookOnBuild") { if (System.getenv()["GITHUB_ACTIONS"] == "true") { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 14bb9fb..7ff5503 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -7,8 +7,3 @@ dependencies { testImplementation(project(":test-common")) } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git a/datadeling-dtos/build.gradle.kts b/datadeling-dtos/build.gradle.kts index eca52b4..14b9c86 100644 --- a/datadeling-dtos/build.gradle.kts +++ b/datadeling-dtos/build.gradle.kts @@ -1,8 +1,3 @@ dependencies { implementation(project(":json")) } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git a/jobber/build.gradle.kts b/jobber/build.gradle.kts index 1697f05..1bd7c32 100644 --- a/jobber/build.gradle.kts +++ b/jobber/build.gradle.kts @@ -8,8 +8,3 @@ dependencies { testImplementation(project(":test-common")) } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git a/jobber/main/no/nav/tiltakspenger/libs/jobber/StoppableJob.kt b/jobber/main/no/nav/tiltakspenger/libs/jobber/StoppableJob.kt index a8b9b6e..7123384 100644 --- a/jobber/main/no/nav/tiltakspenger/libs/jobber/StoppableJob.kt +++ b/jobber/main/no/nav/tiltakspenger/libs/jobber/StoppableJob.kt @@ -110,11 +110,17 @@ private fun startStoppableJob( return scheduleJob { Either.catch { if (runJobCheck.shouldRun()) { - if (enableDebuggingLogging) { log.debug("Kjører skeduleringsjobb '$jobName'.") } + if (enableDebuggingLogging) { + log.debug("Kjører skeduleringsjobb '$jobName'.") + } withCorrelationId(log, mdcCallIdKey) { job(it) } - if (enableDebuggingLogging) { log.debug("Fullførte skeduleringsjobb '$jobName'.") } + if (enableDebuggingLogging) { + log.debug("Fullførte skeduleringsjobb '$jobName'.") + } } else { - if (enableDebuggingLogging) { log.debug("Skeduleringsjobb '$jobName' kjører ikke pga. startKriterier i runJobCheck. Eksempelvis er vi ikke leader pod.") } + if (enableDebuggingLogging) { + log.debug("Skeduleringsjobb '$jobName' kjører ikke pga. startKriterier i runJobCheck. Eksempelvis er vi ikke leader pod.") + } } }.onLeft { log.error( diff --git a/json/build.gradle.kts b/json/build.gradle.kts index 5d062e1..dd18875 100644 --- a/json/build.gradle.kts +++ b/json/build.gradle.kts @@ -9,8 +9,3 @@ dependencies { testImplementation(project(":test-common")) } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git a/ktor-common/build.gradle.kts b/ktor-common/build.gradle.kts index e558925..d49b9ba 100644 --- a/ktor-common/build.gradle.kts +++ b/ktor-common/build.gradle.kts @@ -13,8 +13,3 @@ dependencies { testImplementation(project(":test-common")) } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git a/ktor-test-common/build.gradle.kts b/ktor-test-common/build.gradle.kts index 9eeb252..1b75987 100644 --- a/ktor-test-common/build.gradle.kts +++ b/ktor-test-common/build.gradle.kts @@ -18,8 +18,3 @@ dependencies { testImplementation(project(":test-common")) } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts index 60b403f..85cb5b4 100644 --- a/logging/build.gradle.kts +++ b/logging/build.gradle.kts @@ -3,8 +3,3 @@ dependencies { testImplementation(project(":test-common")) } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git "a/periodisering/test/no/nav/tiltakspenger/libs/periodisering/periode/Periode_tilst\303\270terTest.kt" "b/periodisering/test/no/nav/tiltakspenger/libs/periodisering/periode/PeriodeTilst\303\270terTest.kt" similarity index 98% rename from "periodisering/test/no/nav/tiltakspenger/libs/periodisering/periode/Periode_tilst\303\270terTest.kt" rename to "periodisering/test/no/nav/tiltakspenger/libs/periodisering/periode/PeriodeTilst\303\270terTest.kt" index 75d86db..c12aa99 100644 --- "a/periodisering/test/no/nav/tiltakspenger/libs/periodisering/periode/Periode_tilst\303\270terTest.kt" +++ "b/periodisering/test/no/nav/tiltakspenger/libs/periodisering/periode/PeriodeTilst\303\270terTest.kt" @@ -7,7 +7,7 @@ import no.nav.tiltakspenger.libs.periodisering.tilstøter import org.junit.jupiter.api.Test import java.time.LocalDate -internal class Periode_tilstøterTest { +internal class PeriodeTilstøterTest { @Test fun `ingen elementer gir true`() { diff --git a/persistering/persistering-domene/build.gradle.kts b/persistering/persistering-domene/build.gradle.kts index fa4d5fc..d9ee251 100644 --- a/persistering/persistering-domene/build.gradle.kts +++ b/persistering/persistering-domene/build.gradle.kts @@ -6,11 +6,6 @@ dependencies { testImplementation(project(":test-common")) } -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} - tasks.withType { archiveBaseName.set("persistering-domene") } diff --git a/persistering/persistering-infrastruktur/build.gradle.kts b/persistering/persistering-infrastruktur/build.gradle.kts index aef4570..31c3ff3 100644 --- a/persistering/persistering-infrastruktur/build.gradle.kts +++ b/persistering/persistering-infrastruktur/build.gradle.kts @@ -19,11 +19,6 @@ dependencies { testImplementation("org.postgresql:postgresql:42.7.4") } -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} - tasks.withType { archiveBaseName.set("persistering-infrastruktur") } diff --git a/personklient/personklient-domene/build.gradle.kts b/personklient/personklient-domene/build.gradle.kts index 9a3aa7b..98c62d2 100644 --- a/personklient/personklient-domene/build.gradle.kts +++ b/personklient/personklient-domene/build.gradle.kts @@ -4,11 +4,6 @@ dependencies { implementation("io.arrow-kt:arrow-core:1.2.4") } -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} - tasks.withType { archiveBaseName.set("personklient-domene") } diff --git a/personklient/personklient-infrastruktur/build.gradle.kts b/personklient/personklient-infrastruktur/build.gradle.kts index 7ac06c0..61e823f 100644 --- a/personklient/personklient-infrastruktur/build.gradle.kts +++ b/personklient/personklient-infrastruktur/build.gradle.kts @@ -12,11 +12,6 @@ dependencies { testImplementation(project(":test-common")) } -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} - tasks.withType { archiveBaseName.set("personklient-infrastruktur") } diff --git a/personklient/personklient-infrastruktur/main/no/nav/tiltakspenger/libs/personklient/tilgangsstyring/TilgangsstyringServiceImpl.kt b/personklient/personklient-infrastruktur/main/no/nav/tiltakspenger/libs/personklient/tilgangsstyring/TilgangsstyringServiceImpl.kt index 96b83d3..f58c7db 100644 --- a/personklient/personklient-infrastruktur/main/no/nav/tiltakspenger/libs/personklient/tilgangsstyring/TilgangsstyringServiceImpl.kt +++ b/personklient/personklient-infrastruktur/main/no/nav/tiltakspenger/libs/personklient/tilgangsstyring/TilgangsstyringServiceImpl.kt @@ -144,7 +144,6 @@ class TilgangsstyringServiceImpl( timeout = timeout, sikkerlogg = sikkerlogg, ), - ): TilgangsstyringService { return TilgangsstyringServiceImpl( fellesPersonTilgangsstyringsklient = fellesPersonTilgangsstyringsklient, diff --git a/test-common/build.gradle.kts b/test-common/build.gradle.kts index 41ed653..494aa17 100644 --- a/test-common/build.gradle.kts +++ b/test-common/build.gradle.kts @@ -13,6 +13,8 @@ dependencies { api(platform("org.junit:junit-bom:5.11.4")) api("org.junit.jupiter:junit-jupiter") + api("org.junit.jupiter:junit-jupiter-params") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") api("io.mockk:mockk:$mockkVersion") api("io.mockk:mockk-dsl-jvm:$mockkVersion") @@ -24,8 +26,3 @@ dependencies { api("ch.qos.logback:logback-classic:1.5.14") } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -} diff --git a/tiltak-dtos/build.gradle.kts b/tiltak-dtos/build.gradle.kts index bbf8ce4..971eb95 100644 --- a/tiltak-dtos/build.gradle.kts +++ b/tiltak-dtos/build.gradle.kts @@ -1,8 +1,3 @@ dependencies { implementation("io.arrow-kt:arrow-core:1.2.4") } - -configurations.all { - // exclude JUnit 4 - exclude(group = "junit", module = "junit") -}