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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
kotlin("jvm") version "2.1.21" apply false
kotlin("jvm") version "2.2.0" apply false
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading