Java 21.

New version of token-utils.

Author: flexable777

.github/workflows/deploy-to-dev.yaml

@@ -31,10 +31,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Install Java 17
+      - name: Install Java 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: Test and build

.github/workflows/pull-requests.yaml

@@ -13,10 +13,10 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Sett opp Java 17
+      - name: Sett opp Java 21
         uses: actions/setup-java@main
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
       - name: test and build
         run: ./gradlew test build

Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/java17-debian12:latest
+FROM gcr.io/distroless/java21-debian12:nonroot
 ENV TZ="Europe/Oslo"
 
 COPY build/libs/app.jar /app/app.jar

build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 }
 
 plugins {
-    val kotlinVersion = "1.8.0"
+    val kotlinVersion = "1.9.23"
     id("org.springframework.boot") version "3.2.4"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.spring") version kotlinVersion
@@ -54,12 +54,12 @@ dependencies {
     testImplementation("org.mockito:mockito-inline:5.2.0")
 }
 
-java.sourceCompatibility = JavaVersion.VERSION_17
+java.sourceCompatibility = JavaVersion.VERSION_21
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 }
 

src/main/kotlin/no/nav/klage/document/api/CommentsController.kt

@@ -165,7 +165,7 @@ class CommentsController(
     }
 
     fun getIdent(): String? =
-        tokenValidationContextHolder.tokenValidationContext.getJwtToken(ISSUER_AAD)
-            .jwtTokenClaims?.get("NAVident")?.toString()
+        tokenValidationContextHolder.getTokenValidationContext().getJwtToken(ISSUER_AAD)
+            ?.jwtTokenClaims?.get("NAVident")?.toString()
 
 }

src/main/kotlin/no/nav/klage/document/util/TokenUtil.kt

@@ -19,7 +19,7 @@ class TokenUtil(
         getIdentNullable() ?: throw RuntimeException("NAVident not found in token")
 
     fun getIdentNullable(): String? =
-        tokenValidationContextHolder.tokenValidationContext.getJwtToken(ISSUER_AAD)
-            .jwtTokenClaims?.get("NAVident")?.toString()
+        tokenValidationContextHolder.getTokenValidationContext().getJwtToken(ISSUER_AAD)
+            ?.jwtTokenClaims?.get("NAVident")?.toString()
 
 }