Added missing GHA adjustments.

navikt · Dec 20, 2021 · 6ceb204 · 6ceb204
1 parent 67db2e3
commit 6ceb204
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/manual-to-dev.yaml b/.github/workflows/manual-to-dev.yaml
@@ -18,10 +18,11 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Install Java 11
-        uses: actions/setup-java@v1
+      - name: Install Java 17
+        uses: actions/setup-java@v2.4.0
         with:
-          java-version: 11
+          java-version: 17
+          distribution: temurin
       - name: test and build
         run: ./gradlew test bootJar
         env:

diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -20,6 +20,11 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+      - name: Install Java 17
+        uses: actions/[email protected]
+        with:
+          java-version: 17
+          distribution: temurin
       - name: test and build
         run: ./gradlew test bootJar
         env:

diff --git a/.github/workflows/pull-requests.yaml b/.github/workflows/pull-requests.yaml
@@ -13,10 +13,11 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Sett opp Java 11
-        uses: actions/setup-java@v1
+      - name: Sett opp Java 17
+        uses: actions/setup-java@v2.4.0
         with:
-          java-version: 11      
+          java-version: 17
+          distribution: temurin
       - name: test and build
         run: ./gradlew test build
         env:

diff --git a/src/main/kotlin/no/nav/klage/clients/PDFGeneratorClient.kt b/src/main/kotlin/no/nav/klage/clients/PDFGeneratorClient.kt
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Component
 import org.springframework.web.reactive.function.client.WebClient
 import org.springframework.web.reactive.function.client.bodyToMono
 import java.time.format.DateTimeFormatter
+import java.util.*
 
 
 @Component
@@ -71,7 +72,7 @@ class PDFGeneratorClient(
         saksnummer = sanitizeText(getSaksnummerString(userSaksnummer, internalSaksnummer)),
         oversiktVedlegg = getOversiktVedlegg(vedlegg),
         dato = dato.format(DateTimeFormatter.ofPattern("dd.MM.yyyy")),
-        ytelse = ytelse.decapitalize(),
+        ytelse = ytelse.replaceFirstChar { it.lowercase(Locale.getDefault()) },
         userChoices = userChoices,
         fullmektigNavn = fullmektigNavn ?: "",
         fullmektigFnr = fullmektigFnr ?: ""