diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 57867fa..73946a5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - val kotlinVersion = "2.1.21" + val kotlinVersion = "2.2.0" val springBootVersion = "3.5.3" val springDepMgmtVersion = "1.1.7" @@ -28,7 +28,7 @@ repositories { dependencies { val logstashVersion = "8.1" val opensearchVersion = "1.7.0" - val jsoupVersion = "1.20.1" + val jsoupVersion = "1.21.1" val opensearchTestcontainersVersion = "2.1.3" val testcontainersVersion = "1.21.3" val wiremockVersion = "4.3.0" diff --git a/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/azuread/AzureADConsumer.kt b/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/azuread/AzureADConsumer.kt index 690edd0..83695aa 100644 --- a/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/azuread/AzureADConsumer.kt +++ b/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/azuread/AzureADConsumer.kt @@ -17,9 +17,9 @@ import org.springframework.web.client.exchange @Component class AzureADConsumer( val restTemplate: RestTemplate, - @Value("\${no.nav.security.jwt.issuer.azuread.accepted-audience}") val clientId: String, - @Value("\${no.nav.security.jwt.issuer.azuread.client-secret}") val clientSecret: String, - @Value("\${no.nav.security.jwt.issuer.azuread.token-endpoint}") val tokenEndpoint: String, + @param:Value("\${no.nav.security.jwt.issuer.azuread.accepted-audience}") val clientId: String, + @param:Value("\${no.nav.security.jwt.issuer.azuread.client-secret}") val clientSecret: String, + @param:Value("\${no.nav.security.jwt.issuer.azuread.token-endpoint}") val tokenEndpoint: String, ) { fun getAccessToken(scope: String): String { try { diff --git a/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/azuread/dto/outbound/TokenResponse.kt b/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/azuread/dto/outbound/TokenResponse.kt index dd43c92..0dd968e 100644 --- a/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/azuread/dto/outbound/TokenResponse.kt +++ b/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/azuread/dto/outbound/TokenResponse.kt @@ -3,5 +3,5 @@ package no.nav.navnosearchadminapi.consumer.azuread.dto.outbound import com.fasterxml.jackson.annotation.JsonProperty data class TokenResponse( - @JsonProperty("access_token") val accessToken: String, + @param:JsonProperty("access_token") val accessToken: String, ) \ No newline at end of file diff --git a/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/kodeverk/KodeverkConsumer.kt b/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/kodeverk/KodeverkConsumer.kt index 70fc425..17d00d8 100644 --- a/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/kodeverk/KodeverkConsumer.kt +++ b/app/src/main/kotlin/no/nav/navnosearchadminapi/consumer/kodeverk/KodeverkConsumer.kt @@ -17,8 +17,8 @@ import java.util.* class KodeverkConsumer( val restTemplate: RestTemplate, val azureADConsumer: AzureADConsumer, - @Value("\${kodeverk.spraak.url}") val kodeverkUrl: String, - @Value("\${kodeverk.scope}") val kodeverkScope: String, + @param:Value("\${kodeverk.spraak.url}") val kodeverkUrl: String, + @param:Value("\${kodeverk.scope}") val kodeverkScope: String, ) { @Cacheable("spraakkoder") diff --git a/app/src/main/kotlin/no/nav/navnosearchadminapi/rest/aspect/ApiKeyProtectedAspect.kt b/app/src/main/kotlin/no/nav/navnosearchadminapi/rest/aspect/ApiKeyProtectedAspect.kt index 3e0957f..2253689 100644 --- a/app/src/main/kotlin/no/nav/navnosearchadminapi/rest/aspect/ApiKeyProtectedAspect.kt +++ b/app/src/main/kotlin/no/nav/navnosearchadminapi/rest/aspect/ApiKeyProtectedAspect.kt @@ -10,7 +10,7 @@ import org.springframework.web.context.request.ServletRequestAttributes @Aspect @Component -class HeaderCheckAspect(@Value("\${api-key}") val apiKey: String) { +class HeaderCheckAspect(@param:Value("\${api-key}") val apiKey: String) { @Before("@annotation(apiKeyProtected)") fun checkHeader(apiKeyProtected: ApiKeyProtected) { diff --git a/app/src/main/kotlin/no/nav/navnosearchadminapi/service/AdminService.kt b/app/src/main/kotlin/no/nav/navnosearchadminapi/service/AdminService.kt index 87c2616..05190db 100644 --- a/app/src/main/kotlin/no/nav/navnosearchadminapi/service/AdminService.kt +++ b/app/src/main/kotlin/no/nav/navnosearchadminapi/service/AdminService.kt @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service class AdminService( val validator: ContentDtoValidator, val repository: ContentRepository, - @Value("\${opensearch.page-size}") val pageSize: Int, + @param:Value("\${opensearch.page-size}") val pageSize: Int, ) { val logger: Logger = LoggerFactory.getLogger(AdminService::class.java) diff --git a/app/src/test/kotlin/no/nav/navnosearchadminapi/validation/ContentDtoValidatorTest.kt b/app/src/test/kotlin/no/nav/navnosearchadminapi/validation/ContentDtoValidatorTest.kt index a0adb9d..dd79101 100644 --- a/app/src/test/kotlin/no/nav/navnosearchadminapi/validation/ContentDtoValidatorTest.kt +++ b/app/src/test/kotlin/no/nav/navnosearchadminapi/validation/ContentDtoValidatorTest.kt @@ -22,7 +22,7 @@ import org.mockito.Mockito import org.mockito.junit.jupiter.MockitoExtension @ExtendWith(MockitoExtension::class) -class ContentDtoValidatorTest(@Mock val kodeverkConsumer: KodeverkConsumer) { +class ContentDtoValidatorTest(@param:Mock val kodeverkConsumer: KodeverkConsumer) { private val invalidValue = "invalidValue" private val id = dummyContentDto().id diff --git a/build.gradle.kts b/build.gradle.kts index 50f2ab2..9e5554c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,3 @@ plugins { - kotlin("jvm") version "2.1.21" apply false + kotlin("jvm") version "2.2.0" apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0b55a3b..3ae1e2f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index fa12076..db8bae0 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -19,7 +19,7 @@ repositories { } dependencies { - val opensearchVersion = "1.7.0" + val opensearchVersion = "1.8.1" implementation("org.opensearch.client:spring-data-opensearch-starter:$opensearchVersion") { exclude("org.opensearch.client", "opensearch-rest-client-sniffer")