Oppgraderer java, pakker og plugins.

Author: ramrock93

.github/workflows/build-and-deploy.yml

@@ -20,6 +20,7 @@ jobs:
     with:
       readertoken: true
       buildcommand: './gradlew check'
+      javaversion: 21
 
   codeql:
     uses: navikt/sif-gha-workflows/.github/workflows/gradle-codeql.yml@main
@@ -33,6 +34,7 @@ jobs:
       readertoken: true
       package-command: './gradlew clean build -x test'
       branch: master
+      javaversion: 21
 
   build:
     uses: navikt/sif-gha-workflows/.github/workflows/gradle-build.yml@main
@@ -45,6 +47,7 @@ jobs:
       team: dusseldorf
       readertoken: true
       buildcommand: '--configuration-cache build -x test'
+      javaversion: 21
 
   trivy:
     needs: [ build ]

Dockerfile

@@ -1,4 +1,4 @@
-FROM amazoncorretto:17-alpine3.15
+FROM amazoncorretto:21-alpine3.15
 
 COPY build/libs/*.jar app.jar
 

build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 
 group = "no.nav"
 version = "0.0.1-SNAPSHOT"
-java.sourceCompatibility = JavaVersion.VERSION_17
+java.sourceCompatibility = JavaVersion.VERSION_21
 
 configurations {
     compileOnly {
@@ -161,7 +161,7 @@ tasks.withType<Test> {
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 }
 

src/main/kotlin/no/nav/sifinnsynapi/filter/LoggerInterceptor.kt

@@ -14,7 +14,7 @@ class LoggerInterceptor(private val tokenValidationContextHolder: TokenValidatio
         private val logger = LoggerFactory.getLogger(LoggerInterceptor::class.java)
     }
     override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
-        val jwtToken = tokenValidationContextHolder.tokenValidationContext.firstValidToken.orElse(null)
+        val jwtToken = tokenValidationContextHolder.getTokenValidationContext().firstValidToken
         if (jwtToken !== null) {
             logger.info("Issuer [${jwtToken.issuer}]")
         }

src/main/kotlin/no/nav/sifinnsynapi/k9sakinnsynapi/K9SakInnsynApiClientConfig.kt

@@ -51,7 +51,7 @@ class K9SakInnsynApiClientConfig(
     private fun bearerTokenInterceptor(): ClientHttpRequestInterceptor {
         return ClientHttpRequestInterceptor { request: HttpRequest, body: ByteArray, execution: ClientHttpRequestExecution ->
             val response = oAuth2AccessTokenService.getAccessToken(tokenxK9SakInnsynApiClientProperties)
-            request.headers.setBearerAuth(response.accessToken)
+            request.headers.setBearerAuth(response.accessToken!!)
             execution.execute(request, body)
         }
     }

src/main/kotlin/no/nav/sifinnsynapi/oppslag/OppslagsKlientKonfig.kt

@@ -85,8 +85,8 @@ class OppslagsKlientKonfig(
                 else -> {
                     val response = oAuth2AccessTokenService.getAccessToken(tokenxK9SelvbetjeningOppslagClientProperties)
                     val expiresIn = response.expiresIn
-                    logger.debug("Utveklset token utgår kl. {}, ({} min)", ZonedDateTime.now(UTC).plusSeconds(expiresIn.toLong()), expiresIn/60)
-                    request.headers.setBearerAuth(response.accessToken)
+                    logger.debug("Utveklset token utgår kl. {}, ({} min)", ZonedDateTime.now(UTC).plusSeconds(expiresIn!!.toLong()), expiresIn/60)
+                    request.headers.setBearerAuth(response.accessToken!!)
                 }
             }
             execution.execute(request, body)

src/main/kotlin/no/nav/sifinnsynapi/saf/SafClientConfig.kt

@@ -61,6 +61,6 @@ class SafClientConfig(
     )
 
     private fun accessToken(clientProperties: ClientProperties): String {
-        return oAuth2AccessTokenService.getAccessToken(clientProperties).accessToken
+        return oAuth2AccessTokenService.getAccessToken(clientProperties).accessToken!!
     }
 }

src/main/kotlin/no/nav/sifinnsynapi/safselvbetjening/SafSelvbetjeningClientsConfig.kt

@@ -86,7 +86,7 @@ class SafSelvbetjeningClientsConfig(
     ): ClientHttpRequestInterceptor {
         return ClientHttpRequestInterceptor { request: HttpRequest, body: ByteArray, execution: ClientHttpRequestExecution ->
             val response = oAuth2AccessTokenService.getAccessToken(clientProperties)
-            request.headers.setBearerAuth(response.accessToken)
+            request.headers.setBearerAuth(response.accessToken!!)
             execution.execute(request, body)
         }
     }

src/main/kotlin/no/nav/sifinnsynapi/util/TokenUtils.kt

@@ -11,8 +11,8 @@ object TokenClaims {
 }
 
 fun SpringTokenValidationContextHolder.personIdent(): String {
-    val jwtToken = tokenValidationContext.firstValidToken
-        .orElseThrow { IllegalStateException("Ingen gyldige tokens i Authorization headeren") }
+    val jwtToken = getTokenValidationContext().firstValidToken
+        ?: throw IllegalStateException("Ingen gyldige tokens i Authorization headeren")
 
     val pid = jwtToken.jwtTokenClaims.getStringClaim(TokenClaims.CLAIM_PID)
     val sub = jwtToken.jwtTokenClaims.getStringClaim(TokenClaims.CLAIM_SUB)