Merge branch 'refs/heads/master' into cleanup/vault_token_nocode

# Conflicts:
#	apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/StatiskDataForvalterApplicationStarter.java
#	apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java
#	libs/vault/src/main/java/no/nav/dolly/libs/vault/VaultTokenApplicationContextInitializer.java

Author: rfc3092

apps/adresse-service/build.gradle

@@ -14,7 +14,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-web"

apps/altinn3-tilgang-service/build.gradle

@@ -13,7 +13,6 @@ dependencies {
     implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

apps/amelding-service/build.gradle

@@ -16,7 +16,6 @@ dependencies {
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/app-tilgang-analyse-service/build.gradle

@@ -13,7 +13,6 @@ dependencies {
     implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/arbeidsforhold-service/build.gradle

@@ -16,7 +16,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/batch-bestilling-service/build.gradle

@@ -18,7 +18,6 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/brreg-stub/build.gradle

@@ -27,7 +27,6 @@ dependencies {
 
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:vault"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-web-services"

apps/bruker-service/build.gradle

@@ -27,7 +27,6 @@ dependencies {
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

apps/budpro-service/build.gradle

@@ -10,7 +10,6 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/dolly-backend/build.gradle

@@ -10,56 +10,54 @@ sonarqube {
 }
 
 dependencies {
-    implementation "no.nav.testnav.libs:servlet-core"
-    implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:servlet-insecure-security"
-    implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:data-transfer-objects"
-    implementation "no.nav.testnav.libs:data-transfer-search-objects"
-    implementation "no.nav.testnav.libs:reactive-core"
-    implementation "no.nav.testnav.libs:reactive-security"
-    implementation "no.nav.testnav.libs:testing"
+    implementation 'no.nav.testnav.libs:servlet-core'
+    implementation 'no.nav.testnav.libs:servlet-security'
+    implementation 'no.nav.testnav.libs:servlet-insecure-security'
+    implementation 'no.nav.testnav.libs:security-core'
+    implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation 'no.nav.testnav.libs:data-transfer-search-objects'
+    implementation 'no.nav.testnav.libs:reactive-core'
 
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
-    implementation "org.springframework.boot:spring-boot-starter-web"
-    implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
-    implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
-    implementation "org.springframework.boot:spring-boot-starter-data-jpa"
-    implementation "org.springframework.boot:spring-boot-starter-security"
-    implementation "org.springframework.boot:spring-boot-starter-validation"
-    implementation "org.springframework.retry:spring-retry"
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.retry:spring-retry'
 
-    implementation "org.springframework.boot:spring-boot-starter-data-elasticsearch"
+    implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
     implementation "org.opensearch.client:spring-data-opensearch:$versions.opensearch"
 
-    implementation "org.apache.commons:commons-lang3"
-    implementation "org.springframework.boot:spring-boot-starter-cache"
-    implementation "com.github.ben-manes.caffeine:caffeine"
+    implementation 'org.apache.commons:commons-lang3'
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
+    implementation 'com.github.ben-manes.caffeine:caffeine'
 
-    implementation "org.ehcache:ehcache:3.10.8"
+    implementation 'org.ehcache:ehcache:3.10.8'
     implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
 
-    implementation "org.postgresql:postgresql"
-    implementation "org.flywaydb:flyway-core"
-    implementation "org.flywaydb:flyway-database-postgresql"
+    implementation 'org.postgresql:postgresql'
+    implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-database-postgresql'
 
     implementation "ma.glasnost.orika:orika-core:$versions.orika"
-    implementation "org.codehaus.jettison:jettison:1.5.4"
+    implementation 'org.codehaus.jettison:jettison:1.5.4'
     implementation "org.apache.poi:poi:$versions.apachePoi"
     implementation "org.apache.poi:poi-ooxml:$versions.apachePoi"
 
-    testImplementation "org.opensearch:opensearch-testcontainers:2.1.2"
+    testImplementation 'org.opensearch:opensearch-testcontainers:2.1.2'
 
-    testImplementation "org.springframework.security:spring-security-test"
-    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
-    testImplementation "com.h2database:h2"
+    testImplementation 'org.springframework.security:spring-security-test'
+    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
+    testImplementation 'com.h2database:h2'
     testImplementation "io.projectreactor:reactor-test:$versions.reactorTest"
-    testImplementation "org.testcontainers:junit-jupiter"
-    testImplementation "org.springframework.boot:spring-boot-testcontainers"
-    testImplementation "org.testcontainers:postgresql"
-    testImplementation "org.bitbucket.b_c:jose4j:0.9.6"
+    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.springframework.boot:spring-boot-testcontainers'
+    testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.bitbucket.b_c:jose4j:0.9.6'
 
-    implementation "net.java.dev.jna:jna:5.14.0"
+    implementation 'net.java.dev.jna:jna:5.14.0'
 }

apps/dolly-backend/settings.gradle

@@ -9,7 +9,6 @@ includeBuild "../../plugins/java"
 includeBuild "../../libs/data-transfer-objects"
 includeBuild "../../libs/data-transfer-search-objects"
 includeBuild "../../libs/reactive-core"
-includeBuild "../../libs/reactive-security"
 includeBuild "../../libs/security-core"
 includeBuild "../../libs/servlet-core"
 includeBuild "../../libs/servlet-insecure-security"

apps/dolly-frontend/build.gradle

@@ -26,7 +26,6 @@ dependencies {
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:reactive-session-security"
     implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:testing"
 
     // Session
     implementation "redis.clients:jedis:5.2.0"

apps/dollystatus/build.gradle

@@ -11,7 +11,5 @@ sonarqube {
 }
 
 dependencies {
-    implementation "no.nav.testnav.libs:testing"
-
     implementation 'org.springframework.boot:spring-boot-starter-web'
 }

apps/endringsmelding-frontend/build.gradle

@@ -18,6 +18,8 @@ configurations {
 }
 
 dependencies {
+    implementation "io.grpc:grpc-netty:$versions.grpc"
+
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-frontend"
     implementation("no.nav.testnav.libs:reactive-session-security") {
@@ -27,10 +29,9 @@ dependencies {
     implementation("no.nav.testnav.libs:security-core") {
         exclude group: "org.springframework.session", module: "spring-session-data-redis"
     }
-    implementation "no.nav.testnav.libs:testing"
 
-    implementation "io.grpc:grpc-netty:$versions.grpc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
+
     implementation "org.springframework.cloud:spring-cloud-starter-gateway"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

apps/endringsmelding-service/build.gradle

@@ -15,7 +15,6 @@ dependencies {
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
 

apps/faste-data-frontend/build.gradle

@@ -18,6 +18,8 @@ configurations {
 }
 
 dependencies {
+    implementation "io.grpc:grpc-netty:$versions.grpc"
+
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-frontend"
     implementation("no.nav.testnav.libs:reactive-session-security") {
@@ -27,10 +29,9 @@ dependencies {
     implementation("no.nav.testnav.libs:security-core") {
         exclude group: "org.springframework.session", module: "spring-session-data-redis"
     }
-    implementation "no.nav.testnav.libs:testing"
 
-    implementation "io.grpc:grpc-netty:$versions.grpc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
+
     implementation "org.springframework.cloud:spring-cloud-starter-gateway"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

apps/generer-arbeidsforhold-populasjon-service/build.gradle

@@ -15,7 +15,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

apps/generer-navn-service/build.gradle

@@ -15,7 +15,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/generer-organisasjon-populasjon-service/build.gradle

@@ -19,7 +19,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

apps/generer-synt-amelding-service/build.gradle

@@ -15,7 +15,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/helsepersonell-service/build.gradle

@@ -15,7 +15,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-web"

apps/inntektsmelding-generator-service/build.gradle

@@ -13,7 +13,6 @@ dependencies {
     implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/inntektsmelding-service/build.gradle

@@ -14,7 +14,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/jenkins-batch-status-service/build.gradle

@@ -16,7 +16,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/joark-dokument-service/build.gradle

@@ -15,7 +15,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/kodeverk-service/build.gradle

@@ -15,7 +15,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/kodeverk-service/src/main/java/no/nav/testnav/kodeverkservice/consumer/KodeverkConsumer.java

@@ -42,7 +42,6 @@ public Mono<KodeverkBetydningerResponse> getKodeverk(String kodeverk) {
         return tokenService.exchange(serverProperties)
                 .flatMap(token -> new KodeverkGetCommand(webClient,
                         FilterUtility.hentKodeverk(kodeverk),
-                        token.getTokenValue()).call())
-                .map(FilterUtility::filtrerKodeverk);
+                        token.getTokenValue()).call());
     }
 }

apps/kodeverk-service/src/main/java/no/nav/testnav/kodeverkservice/consumer/command/KodeverkGetCommand.java

@@ -45,10 +45,6 @@ public Mono<KodeverkBetydningerResponse> call() {
                 .header(HEADER_NAV_CALL_ID, generateCallId())
                 .retrieve()
                 .bodyToMono(KodeverkBetydningerResponse.class)
-                .map(response -> {
-                    response.setKodeverknavn(kodeverk);
-                    return response;
-                })
                 .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                         .filter(WebClientFilter::is5xxException));
     }

apps/kodeverk-service/src/main/java/no/nav/testnav/kodeverkservice/dto/KodeverkBetydningerResponse.java

@@ -18,8 +18,6 @@
 @AllArgsConstructor
 public class KodeverkBetydningerResponse {
 
-    private String kodeverknavn;
-
     private Map<String, List<Betydning>> betydninger;
 
     public Map<String, List<Betydning>> getBetydninger() {

apps/kodeverk-service/src/main/java/no/nav/testnav/kodeverkservice/utility/FilterUtility.java

@@ -17,15 +17,4 @@ public static String hentKodeverk(String kodeverk) {
             return kodeverk;
         }
     }
-
-    public static KodeverkBetydningerResponse filtrerKodeverk(KodeverkBetydningerResponse kodeverk) {
-
-        if (KOMMUNER.equals(kodeverk.getKodeverknavn())) {
-
-            kodeverk.getBetydninger().entrySet()
-                    .removeIf(entry -> entry.getKey().equals("9999"));
-        }
-
-        return kodeverk;
-    }
 }

apps/levende-arbeidsforhold-ansettelse/build.gradle

@@ -16,7 +16,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

apps/levende-arbeidsforhold-scheduler/build.gradle

@@ -15,7 +15,6 @@ dependencies {
     implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:servlet-security"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-quartz"