From ff89607f5dabc098473a6c5d08685560b50617ad Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Fri, 9 Jun 2023 12:10:59 +0200 Subject: [PATCH 01/49] - Bump Spring Boot til 3.1.0. - Bump Spring Cloud til 2022.0.3. --- apps/adresse-service/build.gradle | 4 ++-- apps/amelding-service/build.gradle | 4 ++-- apps/app-tilgang-analyse-service/build.gradle | 4 ++-- apps/arbeidsforhold-export-api/build.gradle | 2 +- apps/arbeidsforhold-service/build.gradle | 4 ++-- apps/batch-bestilling-service/build.gradle | 4 ++-- apps/bruker-service/build.gradle | 4 ++-- apps/dolly-backend/build.gradle | 4 ++-- apps/dolly-frontend/build.gradle | 4 ++-- apps/dollystatus/build.gradle | 2 +- apps/endringsmelding-frontend/build.gradle | 4 ++-- apps/endringsmelding-service/build.gradle | 4 ++-- apps/ereg-batch-status-service/build.gradle | 4 ++-- apps/faste-data-frontend/build.gradle | 4 ++-- apps/generer-arbeidsforhold-populasjon-service/build.gradle | 4 ++-- apps/generer-navn-service/build.gradle | 4 ++-- apps/generer-organisasjon-populasjon-service/build.gradle | 4 ++-- apps/generer-synt-amelding-service/build.gradle | 4 ++-- apps/geografiske-kodeverk-service/build.gradle | 4 ++-- apps/helsepersonell-service/build.gradle | 4 ++-- apps/hodejegeren/build.gradle | 4 ++-- apps/import-person-service/build.gradle | 4 ++-- apps/inntektsmelding-generator-service/build.gradle | 4 ++-- apps/inntektsmelding-service/build.gradle | 4 ++-- apps/jenkins-batch-status-service/build.gradle | 4 ++-- apps/joark-dokument-service/build.gradle | 4 ++-- apps/miljoer-service/build.gradle | 4 ++-- apps/mn-synt-arbeidsforhold-service/build.gradle | 4 ++-- apps/oppsummeringsdokument-service/build.gradle | 2 +- apps/organisasjon-bestilling-service/build.gradle | 4 ++-- apps/organisasjon-faste-data-service/build.gradle | 4 ++-- apps/organisasjon-forvalter/build.gradle | 4 ++-- apps/organisasjon-mottak-service/build.gradle | 4 ++-- apps/organisasjon-service/build.gradle | 4 ++-- apps/organisasjon-tilgang-frontend/build.gradle | 4 ++-- apps/organisasjon-tilgang-service/build.gradle | 4 ++-- apps/orgnummer-service/build.gradle | 4 ++-- apps/oversikt-frontend/build.gradle | 4 ++-- apps/pdl-forvalter/build.gradle | 4 ++-- apps/person-export-api/build.gradle | 4 ++-- apps/person-faste-data-service/build.gradle | 4 ++-- apps/person-organisasjon-tilgang-service/build.gradle | 4 ++-- apps/person-search-service/build.gradle | 4 ++-- apps/person-service/build.gradle | 4 ++-- apps/profil-api/build.gradle | 4 ++-- apps/sykemelding-api/build.gradle | 4 ++-- apps/synt-sykemelding-api/build.gradle | 4 ++-- apps/synt-vedtakshistorikk-service/build.gradle | 4 ++-- apps/testnav-ident-pool/build.gradle | 4 ++-- apps/testnorge-statisk-data-forvalter/build.gradle | 4 ++-- apps/testnorge-tp/build.gradle | 4 ++-- apps/tilbakemelding-api/build.gradle | 4 ++-- apps/tps-messaging-service/build.gradle | 4 ++-- apps/udi-stub/build.gradle | 4 ++-- apps/varslinger-service/build.gradle | 4 ++-- examples/reactive-rest-example/build.gradle | 4 ++-- libs/database/build.gradle | 2 +- libs/reactive-frontend/build.gradle | 2 +- libs/reactive-proxy/build.gradle | 2 +- libs/testing/build.gradle | 2 +- mocks/maskinporten-mock/build.gradle | 4 ++-- mocks/tokendings-mock/build.gradle | 4 ++-- proxies/aareg-proxy/build.gradle | 4 ++-- proxies/aareg-synt-services-proxy/build.gradle | 4 ++-- proxies/arbeidsplassencv-proxy/build.gradle | 4 ++-- proxies/arena-forvalteren-proxy/build.gradle | 4 ++-- proxies/batch-adeo-proxy/build.gradle | 4 ++-- proxies/brregstub-proxy/build.gradle | 4 ++-- proxies/dokarkiv-proxy/build.gradle | 4 ++-- proxies/ereg-proxy/build.gradle | 4 ++-- proxies/histark-proxy/build.gradle | 4 ++-- proxies/hodejegeren-proxy/build.gradle | 4 ++-- proxies/inntektstub-proxy/build.gradle | 4 ++-- proxies/inst-proxy/build.gradle | 4 ++-- proxies/kodeverk-proxy/build.gradle | 4 ++-- proxies/kontoregister-person-proxy/build.gradle | 4 ++-- proxies/krrstub-proxy/build.gradle | 4 ++-- proxies/medl-proxy/build.gradle | 4 ++-- proxies/norg2-proxy/build.gradle | 4 ++-- proxies/pdl-proxy/build.gradle | 4 ++-- proxies/pensjon-testdata-facade-proxy/build.gradle | 4 ++-- proxies/saf-proxy/build.gradle | 4 ++-- proxies/samhandlerregisteret-proxy/build.gradle | 4 ++-- proxies/sigrunstub-proxy/build.gradle | 4 ++-- proxies/skjermingsregister-proxy/build.gradle | 4 ++-- proxies/statisk-data-forvalter-proxy/build.gradle | 4 ++-- proxies/sykemelding-api-proxy/build.gradle | 4 ++-- proxies/synthdata-meldekort-proxy/build.gradle | 4 ++-- proxies/tps-forvalteren-proxy/build.gradle | 4 ++-- proxies/udistub-proxy/build.gradle | 4 ++-- 90 files changed, 173 insertions(+), 173 deletions(-) diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index b451ef958c1..fdcfa34725c 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index b0bf3ec81ee..fc0e0911a9a 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index f0ccf90a813..750a0fac9ed 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/arbeidsforhold-export-api/build.gradle b/apps/arbeidsforhold-export-api/build.gradle index d439a91e217..8b79d4e6eed 100644 --- a/apps/arbeidsforhold-export-api/build.gradle +++ b/apps/arbeidsforhold-export-api/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.2' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 37655a753fd..1f5084db53e 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index 802ad45e358..499ca42cd5a 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index 5beb638075c..47247039225 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -48,7 +48,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index d3c0c604c02..2a114cdfd5d 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -41,7 +41,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle index 5058312391d..9c9d3067e4f 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java' - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' mavenBom 'org.springframework.session:spring-session-bom:2021.2.0' } diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle index 11034d5b93b..779de9a196b 100644 --- a/apps/dollystatus/build.gradle +++ b/apps/dollystatus/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle index 5a6c9b5d6b8..690a2f6cc9b 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index bcb9e4dfe10..3896e6aad49 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -32,7 +32,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index 93cff9aea0e..ce5ae980746 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index 47974aab84c..8dadb0efcfa 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index 2e84845441e..49558b9c9b1 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index 087a4f44ce7..b177833ef82 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index e3b630e334b..fa8f41e87ad 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index 5e2a68f46bd..3cb99ddc6bd 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -32,7 +32,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/geografiske-kodeverk-service/build.gradle b/apps/geografiske-kodeverk-service/build.gradle index d8ba658177a..a092b59cee7 100644 --- a/apps/geografiske-kodeverk-service/build.gradle +++ b/apps/geografiske-kodeverk-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index 014fdb051cc..bedc17c0ef2 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/hodejegeren/build.gradle b/apps/hodejegeren/build.gradle index 862bb13d06d..c348ab6b86d 100644 --- a/apps/hodejegeren/build.gradle +++ b/apps/hodejegeren/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/import-person-service/build.gradle b/apps/import-person-service/build.gradle index a2a46a6c55b..d86d7be43f9 100644 --- a/apps/import-person-service/build.gradle +++ b/apps/import-person-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 6d4d9d42111..0b6093b53bd 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 2b5ae98060c..3ae838fa4f2 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index f3b79544efd..e4df9ce2b1b 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index abca655ea8d..e28d5da7b85 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index 5a6828d8afe..471e9bfdac6 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/mn-synt-arbeidsforhold-service/build.gradle b/apps/mn-synt-arbeidsforhold-service/build.gradle index 821d5185dab..f458202ec3a 100644 --- a/apps/mn-synt-arbeidsforhold-service/build.gradle +++ b/apps/mn-synt-arbeidsforhold-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 508b8a4a116..77eba61c0cd 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.2' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index a592205b580..562e62cbdbe 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index 483d5f9b1ca..63481e7d920 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index 417f038c58f..1b4fd80385c 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index 0096cd7c3b0..9adac673fb5 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index 1b67dc5a469..2a08183743d 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index 232f4fbee91..36bf5ad3b6d 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index cfc9d598269..ef6ff960237 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index cb255760031..fd4e059382b 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index 9eb49959bb9..4e3f28b55e6 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' mavenBom 'org.springframework.session:spring-session-bom:2021.2.0' } } diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index 66843b53301..86390f96667 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/person-export-api/build.gradle b/apps/person-export-api/build.gradle index dc1976fcb8b..2a391505b0f 100644 --- a/apps/person-export-api/build.gradle +++ b/apps/person-export-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index 7802099f79d..92ddaf4cf9b 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index afa1e0bf952..8eee283b053 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -51,7 +51,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index f5386bec303..e2890e5465f 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index 1878a54038d..086cad2353a 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index 0381b3b1c33..95a72c4b8d9 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index 6c3d0f89ead..d7219485b64 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index a5cee4e87cd..9b08bb88164 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 339f84bb1e7..f6e3f07f8ec 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index a97f96e0824..6649baca2e5 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index dfbf10ea21e..3b93e195f63 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -35,7 +35,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/testnorge-tp/build.gradle b/apps/testnorge-tp/build.gradle index 8069e54375d..00c5a4e17ca 100644 --- a/apps/testnorge-tp/build.gradle +++ b/apps/testnorge-tp/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index d739f495a93..61c071371da 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index ae14e844162..c9a231b4231 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index 51daf033df4..c56bd408680 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java' id "uk.co.boothen.gradle.wsimport" version "0.18" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -37,7 +37,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index e6fd15716e3..fcf230609a1 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index 0cd7690bbf1..b6a06e1a517 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/libs/database/build.gradle b/libs/database/build.gradle index 665d3647c7a..3d5e059bcad 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -30,7 +30,7 @@ dependencyManagement { applyMavenExclusions = false imports { mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle index 01f3e1025fb..4ec78c0f155 100644 --- a/libs/reactive-frontend/build.gradle +++ b/libs/reactive-frontend/build.gradle @@ -39,7 +39,7 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' } } diff --git a/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle index 8d8d8bbadb4..2da47fd7479 100644 --- a/libs/reactive-proxy/build.gradle +++ b/libs/reactive-proxy/build.gradle @@ -38,7 +38,7 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' } } diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index 21a4cc931c8..4208c6c1818 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -37,7 +37,7 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' } } diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index bc526055b0b..bc6849b598a 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" } @@ -11,7 +11,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index 564cbad2e92..d25a23fc713 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" } @@ -11,7 +11,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index 8ebf58906a0..9631ed428ee 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -3,7 +3,7 @@ plugins { id 'io.spring.dependency-management' version "1.1.0" id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index 2598eac6740..45bd985250d 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index 86360e06668..9fd05af0e87 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 0210e06b13d..cc29e8f8d0f 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index 6e20ca7d5d2..aa713592878 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index bdf1b1e0cb9..f16daa3ee25 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle index c26083094f4..b2f3e535827 100644 --- a/proxies/dokarkiv-proxy/build.gradle +++ b/proxies/dokarkiv-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "jacoco" } @@ -33,7 +33,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index 857b7effedf..0ef5ee00547 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index 8121db84f4e..48ab46e842c 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/hodejegeren-proxy/build.gradle b/proxies/hodejegeren-proxy/build.gradle index 07430a15e59..5c04d7a8c52 100644 --- a/proxies/hodejegeren-proxy/build.gradle +++ b/proxies/hodejegeren-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index 90b4256fcfe..171a58755e6 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index 206df6cc338..e4de534c9ad 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle index 9c1759d6911..0147f13d183 100644 --- a/proxies/kodeverk-proxy/build.gradle +++ b/proxies/kodeverk-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index 3a7643bb5e8..0e9e8accf33 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index 0a850c5229d..5b93a8054e6 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 0a850c5229d..5b93a8054e6 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index b761c286a11..4859d1127bf 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -32,7 +32,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index a510c861f5e..e63c04f9e36 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index 07bb79a6609..2e06da04006 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index 2375dfd7c77..7dcbd7d10ef 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/samhandlerregisteret-proxy/build.gradle b/proxies/samhandlerregisteret-proxy/build.gradle index 0810c57d82d..c5282ae3ffe 100644 --- a/proxies/samhandlerregisteret-proxy/build.gradle +++ b/proxies/samhandlerregisteret-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index 8018f2aae7d..f618b26eb4f 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index 8a7840726b6..b13efd4c407 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/statisk-data-forvalter-proxy/build.gradle b/proxies/statisk-data-forvalter-proxy/build.gradle index 54247a1d4df..b6c7366cac2 100644 --- a/proxies/statisk-data-forvalter-proxy/build.gradle +++ b/proxies/statisk-data-forvalter-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/sykemelding-api-proxy/build.gradle b/proxies/sykemelding-api-proxy/build.gradle index faeadb3c20d..19a802141e0 100644 --- a/proxies/sykemelding-api-proxy/build.gradle +++ b/proxies/sykemelding-api-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index b49aa37e9b1..c26c6fe26be 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/tps-forvalteren-proxy/build.gradle b/proxies/tps-forvalteren-proxy/build.gradle index 9e30241ab83..ec11fd1f79a 100644 --- a/proxies/tps-forvalteren-proxy/build.gradle +++ b/proxies/tps-forvalteren-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index b308b1480b6..dae85a12df6 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.4" + id 'org.springframework.boot' version "3.1.0" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' } } From 81c09bf0090b3494eca01f46c9eb5f2381582aa4 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Fri, 9 Jun 2023 12:11:34 +0200 Subject: [PATCH 02/49] Lagt til @JoinColumn pga. endring i Hibernate. --- .../repository/model/OrganisasjonModel.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/repository/model/OrganisasjonModel.java b/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/repository/model/OrganisasjonModel.java index 7a712ce77d1..7172380ff5c 100644 --- a/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/repository/model/OrganisasjonModel.java +++ b/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/repository/model/OrganisasjonModel.java @@ -1,17 +1,6 @@ package no.nav.registre.testnorge.organisasjonfastedataservice.repository.model; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Entity; -import jakarta.persistence.EntityListeners; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; -import jakarta.persistence.Temporal; -import jakarta.persistence.TemporalType; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -51,7 +40,8 @@ public class OrganisasjonModel { @Column(name = "GRUPPE", nullable = false) private Gruppe gruppe; - @OneToMany(mappedBy = "overenhet", fetch = FetchType.LAZY) + @OneToMany(fetch = FetchType.LAZY) + @JoinColumn(name = "OVERENHET") @Builder.Default private List underenheter = new ArrayList<>(); From 67df63da64fec19133e185672054a29a5dad4ccd Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Tue, 17 Oct 2023 13:08:34 +0200 Subject: [PATCH 03/49] Bump versjoner til siste for spring-cloud-dependencies og spring-boot-dependencies. --- apps/adresse-service/build.gradle | 2 +- apps/amelding-service/build.gradle | 2 +- apps/app-tilgang-analyse-service/build.gradle | 2 +- apps/arbeidsforhold-export-api/build.gradle | 2 +- apps/arbeidsforhold-service/build.gradle | 2 +- apps/batch-bestilling-service/build.gradle | 2 +- apps/brreg-stub/build.gradle | 2 +- apps/bruker-service/build.gradle | 2 +- apps/dolly-backend/build.gradle | 4 +++- apps/dolly-frontend/build.gradle | 2 +- apps/endringsmelding-frontend/build.gradle | 2 +- apps/endringsmelding-service/build.gradle | 2 +- apps/ereg-batch-status-service/build.gradle | 2 +- apps/faste-data-frontend/build.gradle | 2 +- apps/generer-arbeidsforhold-populasjon-service/build.gradle | 2 +- apps/generer-navn-service/build.gradle | 2 +- apps/generer-organisasjon-populasjon-service/build.gradle | 2 +- apps/generer-synt-amelding-service/build.gradle | 2 +- apps/geografiske-kodeverk-service/build.gradle | 2 +- apps/helsepersonell-service/build.gradle | 2 +- apps/hodejegeren/build.gradle | 2 +- apps/import-person-service/build.gradle | 2 +- apps/inntektsmelding-generator-service/build.gradle | 2 +- apps/inntektsmelding-service/build.gradle | 2 +- apps/jenkins-batch-status-service/build.gradle | 2 +- apps/joark-dokument-service/build.gradle | 2 +- apps/miljoer-service/build.gradle | 2 +- apps/mn-synt-arbeidsforhold-service/build.gradle | 2 +- apps/oppsummeringsdokument-service/build.gradle | 2 +- apps/organisasjon-bestilling-service/build.gradle | 2 +- apps/organisasjon-faste-data-service/build.gradle | 2 +- apps/organisasjon-forvalter/build.gradle | 2 +- apps/organisasjon-mottak-service/build.gradle | 2 +- apps/organisasjon-service/build.gradle | 2 +- apps/organisasjon-tilgang-frontend/build.gradle | 2 +- apps/organisasjon-tilgang-service/build.gradle | 2 +- apps/orgnummer-service/build.gradle | 2 +- apps/oversikt-frontend/build.gradle | 2 +- apps/pdl-forvalter/build.gradle | 2 +- apps/person-export-api/build.gradle | 2 +- apps/person-faste-data-service/build.gradle | 2 +- apps/person-organisasjon-tilgang-service/build.gradle | 2 +- apps/person-search-service/build.gradle | 2 +- apps/person-service/build.gradle | 2 +- apps/profil-api/build.gradle | 2 +- apps/sykemelding-api/build.gradle | 2 +- apps/synt-sykemelding-api/build.gradle | 2 +- apps/synt-vedtakshistorikk-service/build.gradle | 2 +- apps/testnav-ident-pool/build.gradle | 2 +- apps/testnorge-bisys/build.gradle | 4 ++-- apps/testnorge-statisk-data-forvalter/build.gradle | 2 +- apps/testnorge-tp/build.gradle | 2 +- apps/tilbakemelding-api/build.gradle | 2 +- apps/tps-messaging-service/build.gradle | 2 +- apps/udi-stub/build.gradle | 2 +- apps/varslinger-service/build.gradle | 2 +- examples/reactive-rest-example/build.gradle | 2 +- libs/commands/build.gradle | 2 +- libs/csv-converter/build.gradle | 2 +- libs/data-transfer-objects/build.gradle | 2 +- libs/database/build.gradle | 4 ++-- libs/domain/build.gradle | 2 +- libs/integration-test/build.gradle | 2 +- libs/kafka-config/build.gradle | 2 +- libs/kafka-producers/build.gradle | 2 +- libs/reactive-core/build.gradle | 2 +- libs/reactive-frontend/build.gradle | 4 ++-- libs/reactive-proxy/build.gradle | 4 ++-- libs/reactive-security/build.gradle | 2 +- libs/reactive-session-security/build.gradle | 2 +- libs/security-core/build.gradle | 2 +- libs/security-token-service/build.gradle | 2 +- libs/servlet-core/build.gradle | 2 +- libs/servlet-insecure-security/build.gradle | 2 +- libs/servlet-security/build.gradle | 2 +- libs/slack/build.gradle | 2 +- libs/testing/build.gradle | 4 ++-- mocks/maskinporten-mock/build.gradle | 2 +- mocks/tokendings-mock/build.gradle | 2 +- proxies/aareg-proxy/build.gradle | 2 +- proxies/aareg-synt-services-proxy/build.gradle | 2 +- proxies/arbeidsplassencv-proxy/build.gradle | 2 +- proxies/arena-forvalteren-proxy/build.gradle | 2 +- proxies/batch-adeo-proxy/build.gradle | 2 +- proxies/brregstub-proxy/build.gradle | 2 +- proxies/dokarkiv-proxy/build.gradle | 2 +- proxies/ereg-proxy/build.gradle | 2 +- proxies/histark-proxy/build.gradle | 2 +- proxies/hodejegeren-proxy/build.gradle | 2 +- proxies/inntektstub-proxy/build.gradle | 2 +- proxies/inst-proxy/build.gradle | 2 +- proxies/kodeverk-proxy/build.gradle | 2 +- proxies/kontoregister-person-proxy/build.gradle | 2 +- proxies/krrstub-proxy/build.gradle | 2 +- proxies/medl-proxy/build.gradle | 2 +- proxies/norg2-proxy/build.gradle | 2 +- proxies/pdl-proxy/build.gradle | 2 +- proxies/pensjon-testdata-facade-proxy/build.gradle | 2 +- proxies/saf-proxy/build.gradle | 2 +- proxies/sigrunstub-proxy/build.gradle | 2 +- proxies/skjermingsregister-proxy/build.gradle | 2 +- proxies/statisk-data-forvalter-proxy/build.gradle | 2 +- proxies/synthdata-meldekort-proxy/build.gradle | 2 +- proxies/tps-forvalteren-proxy/build.gradle | 2 +- proxies/udistub-proxy/build.gradle | 2 +- 105 files changed, 112 insertions(+), 110 deletions(-) diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index fdcfa34725c..4ce2732bbb9 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index fc0e0911a9a..c9837849fa3 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index 750a0fac9ed..021d5bedad3 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/arbeidsforhold-export-api/build.gradle b/apps/arbeidsforhold-export-api/build.gradle index 8b79d4e6eed..559e3211a8a 100644 --- a/apps/arbeidsforhold-export-api/build.gradle +++ b/apps/arbeidsforhold-export-api/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 1f5084db53e..50887222e5d 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index 499ca42cd5a..6c229e44557 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index 0334f255857..a69055639aa 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -38,7 +38,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2021.0.5' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index 47247039225..1faaba796e8 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -48,7 +48,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index 5a11176eff9..f1ac787d107 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -41,7 +41,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } @@ -115,4 +115,6 @@ dependencies { implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' + + implementation 'org.hibernate.orm:hibernate-core:6.3.1.Final' } \ No newline at end of file diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle index 9c9d3067e4f..3941d59fb77 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' mavenBom 'org.springframework.session:spring-session-bom:2021.2.0' } diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle index e9259682749..0baf0dedd8e 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index 3896e6aad49..0a10204f219 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -32,7 +32,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index ce5ae980746..772c7c590eb 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index 8dadb0efcfa..503e91a7e91 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index 49558b9c9b1..1906b45957d 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index 0c7a8490194..7355c95d854 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index fa8f41e87ad..a37bbd8fd30 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index 3cb99ddc6bd..c86b9f5e72e 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -32,7 +32,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/geografiske-kodeverk-service/build.gradle b/apps/geografiske-kodeverk-service/build.gradle index a092b59cee7..cf184726355 100644 --- a/apps/geografiske-kodeverk-service/build.gradle +++ b/apps/geografiske-kodeverk-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index e2cefebeac2..35d28f5d306 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/hodejegeren/build.gradle b/apps/hodejegeren/build.gradle index c348ab6b86d..9084e356bf6 100644 --- a/apps/hodejegeren/build.gradle +++ b/apps/hodejegeren/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/import-person-service/build.gradle b/apps/import-person-service/build.gradle index d86d7be43f9..52f09a9ab0d 100644 --- a/apps/import-person-service/build.gradle +++ b/apps/import-person-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 0b6093b53bd..5ecad49646f 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 3ae838fa4f2..58f5fd2e76f 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index e4df9ce2b1b..1ab4da4e027 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index e28d5da7b85..437795a1e3a 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index 471e9bfdac6..c049c0d572a 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/mn-synt-arbeidsforhold-service/build.gradle b/apps/mn-synt-arbeidsforhold-service/build.gradle index f458202ec3a..097c12cd54c 100644 --- a/apps/mn-synt-arbeidsforhold-service/build.gradle +++ b/apps/mn-synt-arbeidsforhold-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 77eba61c0cd..5e814b3b82a 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index 562e62cbdbe..fb8a7f9bc90 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index 63481e7d920..6e6f6fdd00f 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index 1b4fd80385c..a7ad6b535a8 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index 9adac673fb5..432a58e60a1 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index 936035f0e51..729f4738706 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index b6f5499a918..170ae00586d 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index c6b8dd05266..5e1f67a6da1 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index 4c831ede752..cc33fb7b08f 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index 4e3f28b55e6..ca594f2f75c 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' mavenBom 'org.springframework.session:spring-session-bom:2021.2.0' } } diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index 86390f96667..27e79a339a4 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/person-export-api/build.gradle b/apps/person-export-api/build.gradle index 2a391505b0f..18e1ee5b9c2 100644 --- a/apps/person-export-api/build.gradle +++ b/apps/person-export-api/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index 92ddaf4cf9b..42ba5834e23 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index 8eee283b053..6e472ab5cb9 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -51,7 +51,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index e2890e5465f..24a194737ff 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index b4a53c4aaa8..56880ca9a53 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index 95a72c4b8d9..1b1fdce13a7 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index 2ec0315c589..272d760e35d 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index bdfdf737927..362ffdb02a5 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index f6e3f07f8ec..6bdfba6389c 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index 6649baca2e5..ee069dfc796 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/testnorge-bisys/build.gradle b/apps/testnorge-bisys/build.gradle index 10d100168a7..3184bc3cdde 100644 --- a/apps/testnorge-bisys/build.gradle +++ b/apps/testnorge-bisys/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2021.0.5' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } @@ -63,7 +63,7 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-insecure-security' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-sleuth' + implementation 'org.springframework.cloud:spring-cloud-starter-sleuth:3.1.9' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index 3b93e195f63..51e98397128 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -35,7 +35,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/testnorge-tp/build.gradle b/apps/testnorge-tp/build.gradle index 00c5a4e17ca..c5170c70b6a 100644 --- a/apps/testnorge-tp/build.gradle +++ b/apps/testnorge-tp/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index 61c071371da..87c9ee7436d 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index c9a231b4231..4d6a8e8aa14 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index c56bd408680..d3c4f05b7e2 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -37,7 +37,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index fcf230609a1..6d9737c11da 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index b6a06e1a517..88da17a11c0 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/libs/commands/build.gradle b/libs/commands/build.gradle index e251133cd34..034c9c05b36 100644 --- a/libs/commands/build.gradle +++ b/libs/commands/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/csv-converter/build.gradle b/libs/csv-converter/build.gradle index 51041f3fff6..d2f46d7dfc1 100644 --- a/libs/csv-converter/build.gradle +++ b/libs/csv-converter/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index 4a2f25b5424..e26b9c6c5ba 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -31,7 +31,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/database/build.gradle b/libs/database/build.gradle index 3d5e059bcad..473637b0556 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -29,8 +29,8 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle index 487fc271f3c..d0985298460 100644 --- a/libs/domain/build.gradle +++ b/libs/domain/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/integration-test/build.gradle b/libs/integration-test/build.gradle index b2cea4968b0..5e6047741f9 100644 --- a/libs/integration-test/build.gradle +++ b/libs/integration-test/build.gradle @@ -34,7 +34,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/kafka-config/build.gradle b/libs/kafka-config/build.gradle index 8baebd2e844..806a5a43b14 100644 --- a/libs/kafka-config/build.gradle +++ b/libs/kafka-config/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle index 72d50a9ee2d..8054186a7c8 100644 --- a/libs/kafka-producers/build.gradle +++ b/libs/kafka-producers/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } group = 'no.nav.testnav.libs' diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle index 7612f4a5808..ae275ff7514 100644 --- a/libs/reactive-core/build.gradle +++ b/libs/reactive-core/build.gradle @@ -35,7 +35,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle index 4ec78c0f155..9b5cac219b0 100644 --- a/libs/reactive-frontend/build.gradle +++ b/libs/reactive-frontend/build.gradle @@ -39,8 +39,8 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle index 2da47fd7479..52f65746340 100644 --- a/libs/reactive-proxy/build.gradle +++ b/libs/reactive-proxy/build.gradle @@ -38,8 +38,8 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle index 9dc8d62b938..88513bce891 100644 --- a/libs/reactive-security/build.gradle +++ b/libs/reactive-security/build.gradle @@ -75,7 +75,7 @@ publishing { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle index f023f9873dd..c6797f70408 100644 --- a/libs/reactive-session-security/build.gradle +++ b/libs/reactive-session-security/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' mavenBom 'org.springframework.session:spring-session-bom:2021.0.3' } } diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle index 854f47ee17b..614ea17c28d 100644 --- a/libs/security-core/build.gradle +++ b/libs/security-core/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/security-token-service/build.gradle b/libs/security-token-service/build.gradle index f8c3a3e4467..7aeea3c2a60 100644 --- a/libs/security-token-service/build.gradle +++ b/libs/security-token-service/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index 170a631a950..b89453312a9 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -34,7 +34,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/servlet-insecure-security/build.gradle b/libs/servlet-insecure-security/build.gradle index 0da97c857bc..50b9deaf11f 100644 --- a/libs/servlet-insecure-security/build.gradle +++ b/libs/servlet-insecure-security/build.gradle @@ -32,7 +32,7 @@ group = 'no.nav.testnav.libs' dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle index 139b996a658..379467d1467 100644 --- a/libs/servlet-security/build.gradle +++ b/libs/servlet-security/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/slack/build.gradle b/libs/slack/build.gradle index c80d8507b7e..7dbe6c5d76d 100644 --- a/libs/slack/build.gradle +++ b/libs/slack/build.gradle @@ -29,7 +29,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index 4208c6c1818..d5b4c10d767 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -37,8 +37,8 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index bc6849b598a..4827a01e5b8 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -11,7 +11,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index d25a23fc713..d384ca5a93d 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -11,7 +11,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index 9631ed428ee..d0170de9885 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index 45bd985250d..0b145c06a3b 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index 9fd05af0e87..85d84b7a5c3 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 60f298549aa..109f43ac211 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -40,7 +40,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index aa713592878..637af55479d 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index 9b52cc7eb86..db95a6399d8 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle index 7a50dfc72ed..13374df1c16 100644 --- a/proxies/dokarkiv-proxy/build.gradle +++ b/proxies/dokarkiv-proxy/build.gradle @@ -33,7 +33,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index 0ef5ee00547..ba69529ab8b 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index bf35fb22634..e7f35ad128c 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/hodejegeren-proxy/build.gradle b/proxies/hodejegeren-proxy/build.gradle index 5c04d7a8c52..327109e43f3 100644 --- a/proxies/hodejegeren-proxy/build.gradle +++ b/proxies/hodejegeren-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index 182fc876fbf..84923654687 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index d7c174aa306..8a0a82524ae 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle index a50afba4d2c..2f8bcac4749 100644 --- a/proxies/kodeverk-proxy/build.gradle +++ b/proxies/kodeverk-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index a5132ed4e1a..0850c6abe91 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index 5b93a8054e6..9f2ecc09585 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 1e09434b581..1fffe7cab6f 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index 9a6ebab29e6..1c52a1fef57 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -32,7 +32,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index 4c825cabb4f..1ab8fc68f24 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index 5e862035062..912817ab25f 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index 404174a9041..8995bd35b08 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index a8906a4ffb3..73db980cf7c 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index 06d5f25702d..001d8ea4151 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/statisk-data-forvalter-proxy/build.gradle b/proxies/statisk-data-forvalter-proxy/build.gradle index 5a4a62fa167..ddf4fb92de1 100644 --- a/proxies/statisk-data-forvalter-proxy/build.gradle +++ b/proxies/statisk-data-forvalter-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index abbf60a7f90..f2d735c198d 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/tps-forvalteren-proxy/build.gradle b/proxies/tps-forvalteren-proxy/build.gradle index cf9db1e3989..9c7c88038f1 100644 --- a/proxies/tps-forvalteren-proxy/build.gradle +++ b/proxies/tps-forvalteren-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index d5752917c59..73e964ef014 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' } } From 62767ab729bb5c0c95b9fa55f04a1c2ff820242d Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Tue, 17 Oct 2023 13:09:09 +0200 Subject: [PATCH 04/49] Fjerner ubrukt metode (brukte id som String, ikke Long). --- .../dolly/repository/OrganisasjonBestillingMalRepository.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/repository/OrganisasjonBestillingMalRepository.java b/apps/dolly-backend/src/main/java/no/nav/dolly/repository/OrganisasjonBestillingMalRepository.java index ca0f0ce4775..53cdd422887 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/repository/OrganisasjonBestillingMalRepository.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/repository/OrganisasjonBestillingMalRepository.java @@ -11,8 +11,6 @@ public interface OrganisasjonBestillingMalRepository extends CrudRepository { - List findByIdContaining(String id); - List findByBrukerAndMalNavn(Bruker bruker, String navn); List findByBruker(Bruker bruker); From 23ad0c67d22677ee271705877603d19b2607c0d4 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Tue, 17 Oct 2023 13:22:03 +0200 Subject: [PATCH 05/49] =?UTF-8?q?Rettet=20tester=20(satte=20eksplisitt=20I?= =?UTF-8?q?D=20f=C3=B8r=20persistering),=20fjernet=20warnings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BestillingMalServiceTest.java | 33 +++++-------------- .../OrganisasjonBestillingMalServiceTest.java | 24 ++++---------- 2 files changed, 15 insertions(+), 42 deletions(-) diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/service/BestillingMalServiceTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/service/BestillingMalServiceTest.java index a4349b3ee20..941853f4068 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/service/BestillingMalServiceTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/service/BestillingMalServiceTest.java @@ -1,17 +1,11 @@ package no.nav.dolly.service; -import com.fasterxml.jackson.databind.ObjectMapper; import no.nav.dolly.MockedJwtAuthenticationTokenUtils; import no.nav.dolly.domain.jpa.Bestilling; import no.nav.dolly.domain.jpa.BestillingMal; import no.nav.dolly.domain.jpa.Bruker; import no.nav.dolly.domain.jpa.Testgruppe; -import no.nav.dolly.repository.BestillingMalRepository; -import no.nav.dolly.repository.BestillingRepository; -import no.nav.dolly.repository.BrukerFavoritterRepository; -import no.nav.dolly.repository.BrukerRepository; -import no.nav.dolly.repository.IdentRepository; -import no.nav.dolly.repository.TestgruppeRepository; +import no.nav.dolly.repository.*; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -31,14 +25,9 @@ import java.time.LocalDate; import java.time.LocalDateTime; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.*; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -48,20 +37,18 @@ @EnableAutoConfiguration @ComponentScan("no.nav.dolly") @AutoConfigureMockMvc(addFilters = false) -public class BestillingMalServiceTest { +class BestillingMalServiceTest { private final static String MALNAVN = "test"; private final static String NYTT_MALNAVN = "nyttMalnavn"; private final static String BEST_KRITERIER = "Testeteste"; private static final Bruker DUMMY_EN = Bruker.builder() - .id(1L) .brukerId("testbruker_en") .brukernavn("test_en") .brukertype(Bruker.Brukertype.AZURE) .epost("epost@test_en") .build(); private static final Bruker DUMMY_TO = Bruker.builder() - .id(2L) .brukerId("testbruker_to") .brukernavn("test_to") .brukertype(Bruker.Brukertype.AZURE) @@ -88,8 +75,6 @@ public class BestillingMalServiceTest { @Autowired private IdentRepository identRepository; @Autowired - private ObjectMapper objectMapper; - @Autowired private Flyway flyway; @Transactional @@ -114,8 +99,8 @@ public void afterEach() { void shouldCreateAndGetMaler() throws Exception { - var bruker_en = brukerRepository.findBrukerByBrukerId(DUMMY_EN.getBrukerId()).get(); - var bruker_to = brukerRepository.findBrukerByBrukerId(DUMMY_TO.getBrukerId()).get(); + var bruker_en = brukerRepository.findBrukerByBrukerId(DUMMY_EN.getBrukerId()).orElseThrow(); + var bruker_to = brukerRepository.findBrukerByBrukerId(DUMMY_TO.getBrukerId()).orElseThrow(); saveDummyBestillingMal(bruker_en); saveDummyBestillingMal(bruker_to); @@ -136,7 +121,7 @@ void shouldCreateAndGetMaler() void shouldCreateMalerFromExistingOrder() throws Exception { - var bruker_en = brukerRepository.findBrukerByBrukerId(DUMMY_EN.getBrukerId()).get(); + var bruker_en = brukerRepository.findBrukerByBrukerId(DUMMY_EN.getBrukerId()).orElseThrow(); var testgruppe = saveDummyGruppe(); var bestilling = saveDummyBestilling(bruker_en, testgruppe); @@ -157,7 +142,7 @@ void shouldCreateMalerFromExistingOrder() void shouldCreateUpdateAndDeleteMal() throws Exception { - var bruker_en = brukerRepository.findBrukerByBrukerId(DUMMY_EN.getBrukerId()).get(); + var bruker_en = brukerRepository.findBrukerByBrukerId(DUMMY_EN.getBrukerId()).orElseThrow(); var bestillingMal = saveDummyBestillingMal(bruker_en); mockMvc.perform(put("/api/v1/bestilling/malbestilling/{id}", bestillingMal.getId()) @@ -193,7 +178,6 @@ Bestilling saveDummyBestilling(Bruker bruker, Testgruppe testgruppe) { return bestillingRepository.save( Bestilling .builder() - .id(1L) .gruppe(testgruppe) .ferdig(false) .antallIdenter(1) @@ -215,7 +199,6 @@ Testgruppe saveDummyGruppe() { .navn(TESTGRUPPE) .hensikt(TESTGRUPPE) .datoEndret(LocalDate.now()) - .id(1L) .build() ); } diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/service/OrganisasjonBestillingMalServiceTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/service/OrganisasjonBestillingMalServiceTest.java index 9926499ec5e..ae9a697efad 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/service/OrganisasjonBestillingMalServiceTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/service/OrganisasjonBestillingMalServiceTest.java @@ -1,6 +1,5 @@ package no.nav.dolly.service; -import com.fasterxml.jackson.databind.ObjectMapper; import no.nav.dolly.MockedJwtAuthenticationTokenUtils; import no.nav.dolly.domain.jpa.Bruker; import no.nav.dolly.domain.jpa.OrganisasjonBestilling; @@ -25,14 +24,9 @@ import java.time.LocalDateTime; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.*; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -42,20 +36,18 @@ @EnableAutoConfiguration @ComponentScan("no.nav.dolly") @AutoConfigureMockMvc(addFilters = false) -public class OrganisasjonBestillingMalServiceTest { +class OrganisasjonBestillingMalServiceTest { private final static String MALNAVN = "test"; private final static String NYTT_MALNAVN = "nyttMalnavn"; private final static String BEST_KRITERIER = "Testeteste"; private static final Bruker DUMMY_EN = Bruker.builder() - .id(1L) .brukernavn("test_en") .brukerId("testbruker_en") .brukertype(Bruker.Brukertype.AZURE) .epost("epost@test_en") .build(); private static final Bruker DUMMY_TO = Bruker.builder() - .id(2L) .brukernavn("test_to") .brukerId("testbruker_to") .brukertype(Bruker.Brukertype.AZURE) @@ -73,8 +65,6 @@ public class OrganisasjonBestillingMalServiceTest { @Autowired private BrukerRepository brukerRepository; @Autowired - private ObjectMapper objectMapper; - @Autowired private Flyway flyway; @BeforeEach @@ -99,8 +89,8 @@ public void afterEach() { void shouldCreateAndGetMaler() throws Exception { - var bruker_en = brukerRepository.findBrukerByBrukerId(DUMMY_EN.getBrukerId()).get(); - var bruker_to = brukerRepository.findBrukerByBrukerId(DUMMY_TO.getBrukerId()).get(); + var bruker_en = brukerRepository.findBrukerByBrukerId(DUMMY_EN.getBrukerId()).orElseThrow(); + var bruker_to = brukerRepository.findBrukerByBrukerId(DUMMY_TO.getBrukerId()).orElseThrow(); saveDummyBestillingMal(bruker_en); saveDummyBestillingMal(bruker_to); @@ -121,7 +111,7 @@ void shouldCreateAndGetMaler() void shouldCreateMalerFromExistingOrder() throws Exception { - var bruker_en = brukerRepository.findBrukerByBrukerId(DUMMY_EN.getBrukerId()).get(); + var bruker_en = brukerRepository.findBrukerByBrukerId(DUMMY_EN.getBrukerId()).orElseThrow(); var bestilling = saveDummyBestilling(bruker_en); mockMvc.perform(post("/api/v1/organisasjon/bestilling/malbestilling") @@ -141,7 +131,7 @@ void shouldCreateMalerFromExistingOrder() void shouldCreateUpdateAndDeleteMal() throws Exception { - var bruker_to = brukerRepository.findBrukerByBrukerId(DUMMY_TO.getBrukerId()).get(); + var bruker_to = brukerRepository.findBrukerByBrukerId(DUMMY_TO.getBrukerId()).orElseThrow(); var bestillingMal = saveDummyBestillingMal(bruker_to); mockMvc.perform(put("/api/v1/organisasjon/bestilling/malbestilling/{id}", bestillingMal.getId()) From 2e92c58154b39c75c61c57f2a4dc8260e756d8ca Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Tue, 17 Oct 2023 14:03:02 +0200 Subject: [PATCH 06/49] Bump plugin org.springframework.boot til siste versjon. --- apps/adresse-service/build.gradle | 2 +- apps/amelding-service/build.gradle | 2 +- apps/app-tilgang-analyse-service/build.gradle | 2 +- apps/arbeidsforhold-export-api/build.gradle | 2 +- apps/arbeidsforhold-service/build.gradle | 2 +- apps/batch-bestilling-service/build.gradle | 2 +- apps/brreg-stub/build.gradle | 3 ++- apps/bruker-service/build.gradle | 2 +- apps/dolly-backend/build.gradle | 2 +- apps/dolly-frontend/build.gradle | 2 +- apps/dollystatus/build.gradle | 2 +- apps/endringsmelding-frontend/build.gradle | 2 +- apps/endringsmelding-service/build.gradle | 2 +- apps/ereg-batch-status-service/build.gradle | 2 +- apps/faste-data-frontend/build.gradle | 2 +- apps/generer-arbeidsforhold-populasjon-service/build.gradle | 2 +- apps/generer-navn-service/build.gradle | 2 +- apps/generer-organisasjon-populasjon-service/build.gradle | 2 +- apps/generer-synt-amelding-service/build.gradle | 2 +- apps/geografiske-kodeverk-service/build.gradle | 2 +- apps/helsepersonell-service/build.gradle | 2 +- apps/hodejegeren/build.gradle | 2 +- apps/import-person-service/build.gradle | 2 +- apps/inntektsmelding-generator-service/build.gradle | 2 +- apps/inntektsmelding-service/build.gradle | 2 +- apps/jenkins-batch-status-service/build.gradle | 2 +- apps/joark-dokument-service/build.gradle | 2 +- apps/miljoer-service/build.gradle | 2 +- apps/mn-synt-arbeidsforhold-service/build.gradle | 2 +- apps/oppsummeringsdokument-service/build.gradle | 2 +- apps/organisasjon-bestilling-service/build.gradle | 2 +- apps/organisasjon-faste-data-service/build.gradle | 2 +- apps/organisasjon-forvalter/build.gradle | 2 +- apps/organisasjon-mottak-service/build.gradle | 2 +- apps/organisasjon-service/build.gradle | 2 +- apps/organisasjon-tilgang-frontend/build.gradle | 2 +- apps/organisasjon-tilgang-service/build.gradle | 2 +- apps/orgnummer-service/build.gradle | 2 +- apps/oversikt-frontend/build.gradle | 2 +- apps/pdl-forvalter/build.gradle | 2 +- apps/person-export-api/build.gradle | 2 +- apps/person-faste-data-service/build.gradle | 2 +- apps/person-organisasjon-tilgang-service/build.gradle | 2 +- apps/person-search-service/build.gradle | 2 +- apps/person-service/build.gradle | 2 +- apps/profil-api/build.gradle | 2 +- apps/sykemelding-api/build.gradle | 2 +- apps/synt-sykemelding-api/build.gradle | 2 +- apps/synt-vedtakshistorikk-service/build.gradle | 2 +- apps/testnav-ident-pool/build.gradle | 2 +- apps/testnorge-bisys/build.gradle | 2 +- apps/testnorge-statisk-data-forvalter/build.gradle | 2 +- apps/testnorge-tp/build.gradle | 2 +- apps/tilbakemelding-api/build.gradle | 2 +- apps/tps-messaging-service/build.gradle | 2 +- apps/udi-stub/build.gradle | 2 +- apps/varslinger-service/build.gradle | 2 +- examples/reactive-rest-example/build.gradle | 2 +- mocks/maskinporten-mock/build.gradle | 2 +- mocks/tokendings-mock/build.gradle | 2 +- proxies/aareg-proxy/build.gradle | 2 +- proxies/aareg-synt-services-proxy/build.gradle | 2 +- proxies/arbeidsplassencv-proxy/build.gradle | 2 +- proxies/arena-forvalteren-proxy/build.gradle | 2 +- proxies/batch-adeo-proxy/build.gradle | 2 +- proxies/brregstub-proxy/build.gradle | 2 +- proxies/dokarkiv-proxy/build.gradle | 2 +- proxies/ereg-proxy/build.gradle | 2 +- proxies/histark-proxy/build.gradle | 2 +- proxies/hodejegeren-proxy/build.gradle | 2 +- proxies/inntektstub-proxy/build.gradle | 2 +- proxies/inst-proxy/build.gradle | 2 +- proxies/kodeverk-proxy/build.gradle | 2 +- proxies/kontoregister-person-proxy/build.gradle | 2 +- proxies/krrstub-proxy/build.gradle | 2 +- proxies/medl-proxy/build.gradle | 2 +- proxies/norg2-proxy/build.gradle | 2 +- proxies/pdl-proxy/build.gradle | 2 +- proxies/pensjon-testdata-facade-proxy/build.gradle | 2 +- proxies/saf-proxy/build.gradle | 2 +- proxies/sigrunstub-proxy/build.gradle | 2 +- proxies/skjermingsregister-proxy/build.gradle | 2 +- proxies/statisk-data-forvalter-proxy/build.gradle | 2 +- proxies/synthdata-meldekort-proxy/build.gradle | 2 +- proxies/tps-forvalteren-proxy/build.gradle | 2 +- proxies/udistub-proxy/build.gradle | 2 +- 86 files changed, 87 insertions(+), 86 deletions(-) diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index 4ce2732bbb9..9cca0f9ea83 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index c9837849fa3..cfafded651c 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index 021d5bedad3..aec4a61e37b 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/arbeidsforhold-export-api/build.gradle b/apps/arbeidsforhold-export-api/build.gradle index 559e3211a8a..13c4589931e 100644 --- a/apps/arbeidsforhold-export-api/build.gradle +++ b/apps/arbeidsforhold-export-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.6" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 50887222e5d..fde23761709 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index 6c229e44557..d07a8b9c172 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index a69055639aa..f73e1845076 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id "uk.co.boothen.gradle.wsimport" version "0.17" id 'com.ewerk.gradle.plugins.jaxb2' version '1.0.10' - id 'org.springframework.boot' version "2.7.5" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } @@ -39,6 +39,7 @@ dependencyManagement { applyMavenExclusions = false imports { mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + } } diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index 1faaba796e8..e862120cbc0 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index f1ac787d107..503dad95b75 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle index 3941d59fb77..60b15712d42 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java' - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle index 779de9a196b..145579b4f03 100644 --- a/apps/dollystatus/build.gradle +++ b/apps/dollystatus/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle index 0baf0dedd8e..d39aa187344 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index 0a10204f219..59719f97ae4 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index 772c7c590eb..b25cf49b07c 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index 503e91a7e91..f978721690f 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index 1906b45957d..dd282fee1e1 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index 7355c95d854..b6cd49d463c 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index a37bbd8fd30..80f27eea971 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index c86b9f5e72e..2fa6a936ab4 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/geografiske-kodeverk-service/build.gradle b/apps/geografiske-kodeverk-service/build.gradle index cf184726355..dc8a0a1e7d3 100644 --- a/apps/geografiske-kodeverk-service/build.gradle +++ b/apps/geografiske-kodeverk-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index 35d28f5d306..de133453614 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/hodejegeren/build.gradle b/apps/hodejegeren/build.gradle index 9084e356bf6..29923cef07c 100644 --- a/apps/hodejegeren/build.gradle +++ b/apps/hodejegeren/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/import-person-service/build.gradle b/apps/import-person-service/build.gradle index 52f09a9ab0d..59b1aa10785 100644 --- a/apps/import-person-service/build.gradle +++ b/apps/import-person-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 5ecad49646f..b23621f89ee 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 58f5fd2e76f..b7091a02eea 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index 1ab4da4e027..ed5ace02693 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index 437795a1e3a..4e4635f0134 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index c049c0d572a..a2c98325fe5 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/mn-synt-arbeidsforhold-service/build.gradle b/apps/mn-synt-arbeidsforhold-service/build.gradle index 097c12cd54c..bb47e9f57c5 100644 --- a/apps/mn-synt-arbeidsforhold-service/build.gradle +++ b/apps/mn-synt-arbeidsforhold-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 5e814b3b82a..92cc79defb2 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.0.6" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index fb8a7f9bc90..5b27c04a78b 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index 6e6f6fdd00f..06727b6d1b5 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index a7ad6b535a8..377a175af7a 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index 432a58e60a1..29bc489013c 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index 729f4738706..604fe0d0d3c 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index 170ae00586d..5d447d47f12 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index 5e1f67a6da1..6d1310cd669 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index cc33fb7b08f..20aaafe4cb7 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index ca594f2f75c..797cf90c4f3 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index 27e79a339a4..5fe336d564b 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/person-export-api/build.gradle b/apps/person-export-api/build.gradle index 18e1ee5b9c2..415a51d2d3f 100644 --- a/apps/person-export-api/build.gradle +++ b/apps/person-export-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index 42ba5834e23..e0b5a269fbe 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index 6e472ab5cb9..9d4eb5f5671 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index 24a194737ff..8365ae63b3f 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index 56880ca9a53..f374757e2be 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index 1b1fdce13a7..1aca8db3727 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index 272d760e35d..c4312b59fda 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index 362ffdb02a5..bcb237ff01f 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 6bdfba6389c..0e69a00b0fe 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index ee069dfc796..fcacd42ef8a 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/testnorge-bisys/build.gradle b/apps/testnorge-bisys/build.gradle index 3184bc3cdde..abd1805a143 100644 --- a/apps/testnorge-bisys/build.gradle +++ b/apps/testnorge-bisys/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "2.7.5" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index 51e98397128..7c253531428 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/testnorge-tp/build.gradle b/apps/testnorge-tp/build.gradle index c5170c70b6a..0abfd6e48fb 100644 --- a/apps/testnorge-tp/build.gradle +++ b/apps/testnorge-tp/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index 87c9ee7436d..07d4ad79aaa 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index 4d6a8e8aa14..8decc9587e8 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index d3c4f05b7e2..5b6bdc4c50f 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java' id "uk.co.boothen.gradle.wsimport" version "0.18" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index 6d9737c11da..ab9bc910164 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index 88da17a11c0..4ed58a239ad 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index 4827a01e5b8..9263548a684 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" } diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index d384ca5a93d..ba03c2446f4 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" } diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index d0170de9885..c8dc258db19 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -3,7 +3,7 @@ plugins { id 'io.spring.dependency-management' version "1.1.0" id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id "jacoco" } diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index 0b145c06a3b..18f35d0f551 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index 85d84b7a5c3..b94523dbcc6 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 109f43ac211..4a9ff2d6f82 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "io.freefair.lombok" version "6.6.2" id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index 637af55479d..6541d7010c4 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index db95a6399d8..07708f1e5bd 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle index 13374df1c16..b1e88d6422a 100644 --- a/proxies/dokarkiv-proxy/build.gradle +++ b/proxies/dokarkiv-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "jacoco" } diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index ba69529ab8b..b7885b6af90 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index e7f35ad128c..90fb897e377 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/hodejegeren-proxy/build.gradle b/proxies/hodejegeren-proxy/build.gradle index 327109e43f3..23cd57f51ea 100644 --- a/proxies/hodejegeren-proxy/build.gradle +++ b/proxies/hodejegeren-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index 84923654687..4d9eac714aa 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index 8a0a82524ae..bb3d01a57ed 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle index 2f8bcac4749..a45ccba211d 100644 --- a/proxies/kodeverk-proxy/build.gradle +++ b/proxies/kodeverk-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index 0850c6abe91..e53818c2614 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index 9f2ecc09585..427b17ca70a 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 1fffe7cab6f..2d623139d1f 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index 1c52a1fef57..7189ffd0a8e 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index 1ab8fc68f24..52a41fa6eaf 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index 912817ab25f..67bb1dc0f3f 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "io.freefair.lombok" version "6.6.2" id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index 8995bd35b08..9571e855891 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index 73db980cf7c..8559cb48b63 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index 001d8ea4151..a739f303a24 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/statisk-data-forvalter-proxy/build.gradle b/proxies/statisk-data-forvalter-proxy/build.gradle index ddf4fb92de1..cfa4463b29f 100644 --- a/proxies/statisk-data-forvalter-proxy/build.gradle +++ b/proxies/statisk-data-forvalter-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index f2d735c198d..ed68cba3329 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/tps-forvalteren-proxy/build.gradle b/proxies/tps-forvalteren-proxy/build.gradle index 9c7c88038f1..4152475dc49 100644 --- a/proxies/tps-forvalteren-proxy/build.gradle +++ b/proxies/tps-forvalteren-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index 73e964ef014..22c3c6ecce0 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.0" + id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.0" id "jacoco" } From 5b4ec02e6c60d1d3f19422e833a35cee493d48cd Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Tue, 17 Oct 2023 14:30:57 +0200 Subject: [PATCH 07/49] Endrer fra annotasjoner fra javax.persistence til jakarta.persistence. --- .../main/java/no/nav/brregstub/database/domene/HentRolle.java | 2 +- .../java/no/nav/brregstub/database/domene/Rolleoversikt.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java index e781173c42e..9829d9756b6 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java @@ -1,9 +1,9 @@ package no.nav.brregstub.database.domene; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; import javax.validation.constraints.NotNull; @Entity diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java index 6f7ef158994..54ed118a22f 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java @@ -1,9 +1,9 @@ package no.nav.brregstub.database.domene; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; import javax.validation.constraints.NotNull; @Entity From 51cfdd7caba2d527ec16c4d50e981493b9492445 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Tue, 17 Oct 2023 15:10:15 +0200 Subject: [PATCH 08/49] =?UTF-8?q?Bytter=20fra=20javax.validation=20til=20j?= =?UTF-8?q?akarta.validation,=20n=C3=A5=20basert=20p=C3=A5=20dependency=20?= =?UTF-8?q?spring-boot-starter-validation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/brreg-stub/build.gradle | 3 +-- .../nav/brregstub/api/common/RsAdresse.java | 3 +-- .../no/nav/brregstub/api/common/RsNavn.java | 3 +-- .../brregstub/api/common/RsOrganisasjon.java | 4 ++-- .../brregstub/api/common/RsPersonOgRolle.java | 3 +-- .../brregstub/api/common/RsSamendring.java | 6 +++--- .../java/no/nav/brregstub/api/v1/RolleTo.java | 4 ++-- .../nav/brregstub/api/v1/RolleoversiktTo.java | 8 ++++---- .../java/no/nav/brregstub/api/v2/RsRolle.java | 3 +-- .../nav/brregstub/api/v2/RsRolleStatus.java | 3 +-- .../nav/brregstub/api/v2/RsRolleoversikt.java | 8 ++++---- .../brregstub/database/domene/HentRolle.java | 3 +-- .../database/domene/Rolleoversikt.java | 3 +-- .../brregstub/rs/v1/HentRolleController.java | 4 ++-- .../rs/v1/HentRolleoversiktController.java | 5 ++--- .../rs/v2/RolleoversiktController.java | 5 ++--- .../v1/HentRolleoversiktControllerTest.java | 20 ++++++++++--------- 17 files changed, 40 insertions(+), 48 deletions(-) diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index f73e1845076..fffa148cc6f 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -88,6 +88,7 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'io.micrometer:micrometer-registry-prometheus' jaxb2 'org.jvnet.jaxb2_commons:jaxb2-basics-runtime:1.11.1' @@ -107,8 +108,6 @@ dependencies { implementation 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.5' implementation 'wsdl4j:wsdl4j:1.6.3' implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.hibernate.validator:hibernate-validator' - implementation 'javax.validation:validation-api:2.0.1.Final' implementation 'org.springdoc:springdoc-openapi-ui:1.6.9' implementation 'no.nav.common:cxf:2.2021.11.10_07.34-c6f02734d4ab' implementation 'com.h2database:h2' diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsAdresse.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsAdresse.java index a6daae2447b..a3bb0075ea8 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsAdresse.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsAdresse.java @@ -1,10 +1,9 @@ package no.nav.brregstub.api.common; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - @Data @NoArgsConstructor public class RsAdresse { diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsNavn.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsNavn.java index add33d5352f..579ff241215 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsNavn.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsNavn.java @@ -1,13 +1,12 @@ package no.nav.brregstub.api.common; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotBlank; - @Setter @Getter @AllArgsConstructor diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsOrganisasjon.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsOrganisasjon.java index 9d6a5e816ce..5308f393455 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsOrganisasjon.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsOrganisasjon.java @@ -1,13 +1,13 @@ package no.nav.brregstub.api.common; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.util.LinkedList; import java.util.List; diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsPersonOgRolle.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsPersonOgRolle.java index d266e7e6597..c3701dacfcd 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsPersonOgRolle.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsPersonOgRolle.java @@ -1,13 +1,12 @@ package no.nav.brregstub.api.common; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotBlank; - @Setter @Getter @AllArgsConstructor diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsSamendring.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsSamendring.java index 0a7db58c9a0..e5d9fa0aaa6 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsSamendring.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/common/RsSamendring.java @@ -1,13 +1,13 @@ package no.nav.brregstub.api.common; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.util.LinkedList; import java.util.List; diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v1/RolleTo.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v1/RolleTo.java index 4924b4bbf33..29a6218c46b 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v1/RolleTo.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v1/RolleTo.java @@ -1,10 +1,10 @@ package no.nav.brregstub.api.v1; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.time.LocalDate; import no.nav.brregstub.api.common.RsAdresse; diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v1/RolleoversiktTo.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v1/RolleoversiktTo.java index b40e98a3e5c..662ea320bf1 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v1/RolleoversiktTo.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v1/RolleoversiktTo.java @@ -1,14 +1,14 @@ package no.nav.brregstub.api.v1; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.util.LinkedList; import java.util.List; diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolle.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolle.java index 08c72c24574..f619d745894 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolle.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolle.java @@ -1,10 +1,9 @@ package no.nav.brregstub.api.v2; import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.util.List; diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolleStatus.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolleStatus.java index 3e6c03ae843..35d63c6d907 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolleStatus.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolleStatus.java @@ -1,10 +1,9 @@ package no.nav.brregstub.api.v2; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - import no.nav.brregstub.api.common.Egenskap; @Data diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolleoversikt.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolleoversikt.java index 6b6f20ab001..27dca012fd0 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolleoversikt.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/api/v2/RsRolleoversikt.java @@ -1,14 +1,14 @@ package no.nav.brregstub.api.v2; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.util.ArrayList; import java.util.LinkedList; diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java index 9829d9756b6..6b7e319927e 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java @@ -1,11 +1,10 @@ package no.nav.brregstub.database.domene; import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotNull; - @Entity @Getter @Setter diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java index 54ed118a22f..e630e4e6a26 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java @@ -1,11 +1,10 @@ package no.nav.brregstub.database.domene; import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotNull; - @Entity @Getter @Setter diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java index 56b35c7cf4a..df6374f0463 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java @@ -1,5 +1,7 @@ package no.nav.brregstub.rs.v1; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -13,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.Map; import no.nav.brregstub.api.common.RsOrganisasjon; diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java index 79655438153..60e45271cb9 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java @@ -1,5 +1,7 @@ package no.nav.brregstub.rs.v1; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -13,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import no.nav.brregstub.api.v1.RolleoversiktTo; import no.nav.brregstub.exception.CouldNotCreateStubException; import no.nav.brregstub.exception.NotFoundException; diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java index 853c694d3e9..0494500460f 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java @@ -1,5 +1,7 @@ package no.nav.brregstub.rs.v2; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -13,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import no.nav.brregstub.api.v2.RsRolleoversikt; import no.nav.brregstub.exception.CouldNotCreateStubException; import no.nav.brregstub.exception.NotFoundException; diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java index e9f3bdf274f..5bf4f32d655 100644 --- a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java +++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java @@ -44,7 +44,7 @@ public class HentRolleoversiktControllerTest { @Test @DisplayName("GET rolleoversikt returnerer 404 hvis ikke eksisterer") - public void skalKasteNotFoundHvisRolleIkkeEksister() { + void skalKasteNotFoundHvisRolleIkkeEksister() { var response = restTemplate.exchange(API_V_1_ROLLEUTSKRIFT, HttpMethod.GET, createHttpEntity("eksister ikke", null), @@ -55,14 +55,14 @@ public void skalKasteNotFoundHvisRolleIkkeEksister() { @Test @DisplayName("GET rolleoversikt returnerer 400 hvis input mangler") - public void skalKasteBadRequestHvisInputMangler() { + void skalKasteBadRequestHvisInputMangler() { var response = restTemplate.getForEntity(API_V_1_ROLLEUTSKRIFT, Map.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); } @Test @DisplayName("GET rolleoversikt returnerer 200 hvis ikke eksisterer") - public void skalHenteRolleutskriftFraDatabase() { + void skalHenteRolleutskriftFraDatabase() { var nyRolle = new Rolleoversikt(); nyRolle.setIdent(IDENT); nyRolle.setJson("{\"fnr\":\"ident\"}"); @@ -73,12 +73,13 @@ public void skalHenteRolleutskriftFraDatabase() { createHttpEntity("ident", null), RolleoversiktTo.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getFnr()).isEqualTo("ident"); } @Test @DisplayName("DELETE rolleoversikt skal slette rolleoversikt") - public void skalSletteRolleutskrift() { + void skalSletteRolleutskrift() { var nyRolle = new Rolleoversikt(); nyRolle.setIdent("slettes"); nyRolle.setJson("{\"fnr\":\"slettes\"}"); @@ -94,7 +95,7 @@ public void skalSletteRolleutskrift() { @Test @DisplayName("DELETE rolleoversikt returnerer 400 hvis input mangler") - public void deleteSkalKasteBadRequestHvisInputMangler() { + void deleteSkalKasteBadRequestHvisInputMangler() { var responseDelete = restTemplate.exchange(API_V_1_ROLLEUTSKRIFT, HttpMethod.DELETE, null, Map.class); assertThat(responseDelete.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); @@ -102,19 +103,20 @@ public void deleteSkalKasteBadRequestHvisInputMangler() { @Test @DisplayName("POST rolleoversikt skal opprette ny rolleoversikt") - public void skalLagreRequestIDatabase() { + void skalLagreRequestIDatabase() { RolleoversiktTo to = lagGyldigRolleoversiktTo(); var response = restTemplate.exchange(API_V_1_ROLLEUTSKRIFT, HttpMethod.POST, createHttpEntity("ny", to), RolleoversiktTo.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED); + assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getFnr()).isEqualTo("ny"); } @Test @DisplayName("POST rolleoversikt skal returnere bad request ved mangle input") - public void skalReturnereBadRequestVedPost() { + void skalReturnereBadRequestVedPost() { RolleoversiktTo to = new RolleoversiktTo(); var response = @@ -142,12 +144,12 @@ private RolleoversiktTo lagGyldigRolleoversiktTo() { return to; } - private HttpEntity createHttpEntity( + private HttpEntity createHttpEntity( String ident, RolleoversiktTo body ) { var headers = new HttpHeaders(); headers.add("Nav-Personident", ident); - return new HttpEntity(body, headers); + return new HttpEntity<>(body, headers); } } From b7cac9ee1283f4756305cb8bb93cfe9dee4d8658 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Wed, 18 Oct 2023 09:41:32 +0200 Subject: [PATCH 09/49] Fjerner ubrukt testnorge-bisys. --- .github/workflows/app.testnorge-bisys.yml | 27 -- .gitignore | 2 - apps/testnorge-bisys/Dockerfile | 8 - apps/testnorge-bisys/README.md | 28 --- apps/testnorge-bisys/build.gradle | 99 -------- apps/testnorge-bisys/config.yml | 44 ---- .../gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - apps/testnorge-bisys/gradlew | 234 ------------------ apps/testnorge-bisys/gradlew.bat | 89 ------- apps/testnorge-bisys/gradlewUpdate.sh | 3 - apps/testnorge-bisys/settings.gradle | 18 -- .../TestnorgeBisysApplicationStarter.java | 12 - .../bisys/adapter/PersonSearchAdapter.java | 169 ------------- .../exception/PersonSearchException.java | 7 - .../bisys/adapter/model/FoedselModel.java | 17 -- .../model/ForelderBarnRelasjonModel.java | 17 -- .../bisys/adapter/model/HentIdenterModel.java | 16 -- .../bisys/adapter/model/HentPersonModel.java | 18 -- .../bisys/adapter/model/IdenterModel.java | 15 -- .../bisys/adapter/model/Metadata.java | 14 -- .../bisys/adapter/model/Response.java | 18 -- .../adapter/model/StatsborgerskapModel.java | 13 - .../bisys/adapter/model/WithMetadata.java | 5 - .../nav/registre/bisys/config/AppConfig.java | 15 -- .../registre/bisys/config/OpenApiConfig.java | 41 --- .../nav/registre/bisys/config/ProdConfig.java | 37 --- .../registre/bisys/config/SecurityConfig.java | 32 --- .../registre/bisys/config/VaultConfig.java | 29 --- .../credential/ElasticSearchCredentials.java | 19 -- .../consumer/BidragsmeldingConsumer.java | 28 --- .../bisys/consumer/SyntBisysConsumer.java | 45 ---- .../command/GetSyntBisysMeldingerCommand.java | 41 --- .../credential/SyntBisysProperties.java | 11 - .../response/PersonSearchResponse.java | 20 -- .../response/SyntetisertBidragsmelding.java | 77 ------ .../no/nav/registre/bisys/domain/Barn.java | 22 -- .../bisys/domain/search/FoedselSearch.java | 17 -- .../bisys/domain/search/PersonSearch.java | 26 -- .../bisys/domain/search/RelasjonSearch.java | 15 -- .../bisys/meter/WebClientTagsProvider.java | 27 -- .../provider/SyntetiseringController.java | 33 --- .../request/SyntetiserBisysRequest.java | 15 -- .../registre/bisys/service/IdentService.java | 149 ----------- .../bisys/service/SyntetiseringService.java | 126 ---------- .../bisys/service/utils/BidragUtils.java | 31 --- .../bisys/service/utils/DateUtils.java | 25 -- .../registre/bisys/util/WebClientFilter.java | 14 -- .../src/main/resources/application-dev.yml | 12 - .../src/main/resources/application-prod.yml | 6 - .../src/main/resources/application.yaml | 42 ---- .../src/main/resources/bootstrap.yml | 4 - .../src/main/resources/logback-spring.xml | 40 --- .../bisys/ApplicationContextTest.java | 21 -- .../bisys/service/utils/DateUtilsTest.java | 37 --- .../src/test/resources/application-test.yml | 22 -- .../test/resources/files/bidragsmelding.json | 36 --- .../files/bidragsmeldingEttBarn.json | 16 -- .../resources/files/bidragsmeldingForQ6.json | 16 -- ...agsmeldingForQ6BarnTilEksisterendeSak.json | 16 -- settings.gradle | 1 - 61 files changed, 2042 deletions(-) delete mode 100644 .github/workflows/app.testnorge-bisys.yml delete mode 100644 apps/testnorge-bisys/Dockerfile delete mode 100644 apps/testnorge-bisys/README.md delete mode 100644 apps/testnorge-bisys/build.gradle delete mode 100644 apps/testnorge-bisys/config.yml delete mode 100644 apps/testnorge-bisys/gradle/wrapper/gradle-wrapper.jar delete mode 100644 apps/testnorge-bisys/gradle/wrapper/gradle-wrapper.properties delete mode 100755 apps/testnorge-bisys/gradlew delete mode 100644 apps/testnorge-bisys/gradlew.bat delete mode 100755 apps/testnorge-bisys/gradlewUpdate.sh delete mode 100644 apps/testnorge-bisys/settings.gradle delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/TestnorgeBisysApplicationStarter.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/PersonSearchAdapter.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/exception/PersonSearchException.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/FoedselModel.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/ForelderBarnRelasjonModel.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/HentIdenterModel.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/HentPersonModel.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/IdenterModel.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/Metadata.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/Response.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/StatsborgerskapModel.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/WithMetadata.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/AppConfig.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/OpenApiConfig.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/ProdConfig.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/SecurityConfig.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/VaultConfig.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/credential/ElasticSearchCredentials.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/BidragsmeldingConsumer.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/SyntBisysConsumer.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/command/GetSyntBisysMeldingerCommand.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/credential/SyntBisysProperties.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/response/PersonSearchResponse.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/response/SyntetisertBidragsmelding.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/Barn.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/FoedselSearch.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/PersonSearch.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/RelasjonSearch.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/meter/WebClientTagsProvider.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/provider/SyntetiseringController.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/provider/request/SyntetiserBisysRequest.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/IdentService.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/SyntetiseringService.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/utils/BidragUtils.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/utils/DateUtils.java delete mode 100644 apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/util/WebClientFilter.java delete mode 100644 apps/testnorge-bisys/src/main/resources/application-dev.yml delete mode 100644 apps/testnorge-bisys/src/main/resources/application-prod.yml delete mode 100644 apps/testnorge-bisys/src/main/resources/application.yaml delete mode 100644 apps/testnorge-bisys/src/main/resources/bootstrap.yml delete mode 100644 apps/testnorge-bisys/src/main/resources/logback-spring.xml delete mode 100644 apps/testnorge-bisys/src/test/java/no/nav/registre/bisys/ApplicationContextTest.java delete mode 100644 apps/testnorge-bisys/src/test/java/no/nav/registre/bisys/service/utils/DateUtilsTest.java delete mode 100644 apps/testnorge-bisys/src/test/resources/application-test.yml delete mode 100644 apps/testnorge-bisys/src/test/resources/files/bidragsmelding.json delete mode 100644 apps/testnorge-bisys/src/test/resources/files/bidragsmeldingEttBarn.json delete mode 100644 apps/testnorge-bisys/src/test/resources/files/bidragsmeldingForQ6.json delete mode 100644 apps/testnorge-bisys/src/test/resources/files/bidragsmeldingForQ6BarnTilEksisterendeSak.json diff --git a/.github/workflows/app.testnorge-bisys.yml b/.github/workflows/app.testnorge-bisys.yml deleted file mode 100644 index 8d719b16368..00000000000 --- a/.github/workflows/app.testnorge-bisys.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: testnorge-bisys - -on: - push: - paths: - - libs/data-transfer-objects - - libs/security-core - - libs/servlet-core - - libs/servlet-insecure-security - - apps/testnorge-bisys/** - - .github/workflows/app.testnorge-bisys.yml - -jobs: - workflow: - uses: ./.github/workflows/common.workflow.backend.yml - with: - cluster: "dev-fss" - working-directory: "apps/testnorge-bisys" - deploy-tag: "#deploy-testnorge-bisys" - permissions: - contents: read - id-token: write - secrets: - NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }} - NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - NAV_TOKEN: ${{ secrets.NAV_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.gitignore b/.gitignore index a337f2b3bfc..88695f9e761 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,6 @@ navikt/*/lib/ *.DS_Store -*apps/testnorge-bisys/c:/ - ### Gradle ### .gradle *build/ diff --git a/apps/testnorge-bisys/Dockerfile b/apps/testnorge-bisys/Dockerfile deleted file mode 100644 index bc32367ff9d..00000000000 --- a/apps/testnorge-bisys/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM ghcr.io/navikt/baseimages/temurin:17 -LABEL maintainer="Team Dolly" - -ENV JAVA_OPTS="-Dspring.profiles.active=prod" - -ADD /build/libs/app.jar /app/app.jar - -EXPOSE 8080 diff --git a/apps/testnorge-bisys/README.md b/apps/testnorge-bisys/README.md deleted file mode 100644 index f572d2bc854..00000000000 --- a/apps/testnorge-bisys/README.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -layout: default -title: Testnorge Bisys -parent: Applikasjoner ---- - -# testnorge-bisys -Manages the creation of synthetic test data for Bisys. - -## MapStruct -MapStruct is utilized for mapping between different Java Bean formats. MapStruct processing requires that an implementation class is available -under /target/generated-sources/annotations/. The implementation class is auto generated by mapstruct-processor during mvn clean install. -Re-run mvn clean install if you get an error saying "Cannot find implementation for no.nav.registre.bisys.consumer.ui.TestnorgeToBisysMapper". - - -## Lokal kjøring -Ha naisdevice kjørende og kjør TestnorgeBisysApplicationStarter med følgende argumenter: -``` --Dspring.cloud.vault.token=[Kopi av token fra vault] --Dspring.profiles.active=dev -``` - -### Utviklerimage -I utviklerimage må du i tillegg ha følgende argumenter: - ``` - -Djavax.net.ssl.trustStore=[path til lokal truststore] - -Djavax.net.ssl.trustStorePassword=[passord til lokal truststore] - ``` diff --git a/apps/testnorge-bisys/build.gradle b/apps/testnorge-bisys/build.gradle deleted file mode 100644 index abd1805a143..00000000000 --- a/apps/testnorge-bisys/build.gradle +++ /dev/null @@ -1,99 +0,0 @@ -plugins { - id 'java' - id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" - id "jacoco" -} - -test { - useJUnitPlatform() -} - -jacocoTestReport { - reports { - xml.required = true - } -} - -sonarqube { - properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true - property "sonar.projectKey", "testnav-testnorge-bisys" - property "sonar.projectName", "testnorge-bisys" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - password System.getenv("NAV_TOKEN") - username 'token' - } - } -} - -dependencies { - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'no.nav.testnav.libs:servlet-core' - implementation 'no.nav.testnav.libs:servlet-insecure-security' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-sleuth:3.1.9' - implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - - implementation 'org.springframework.data:spring-data-elasticsearch' - - implementation 'no.nav.bidrag.ui:bisys-ui-connect:2020.09.23-11.42-60270558f930' - implementation 'org.aspectj:aspectjweaver:1.9.7' - implementation 'io.micrometer:micrometer-registry-prometheus' - - implementation 'org.hibernate.validator:hibernate-validator' - - implementation 'org.springdoc:springdoc-openapi-ui:1.6.9' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - - implementation 'com.squareup.okhttp3:okhttp:4.9.3' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.3' -} - -description = 'testnorge-bisys' -java.sourceCompatibility = JavaVersion.VERSION_17 diff --git a/apps/testnorge-bisys/config.yml b/apps/testnorge-bisys/config.yml deleted file mode 100644 index e709e48016f..00000000000 --- a/apps/testnorge-bisys/config.yml +++ /dev/null @@ -1,44 +0,0 @@ -apiVersion: nais.io/v1alpha1 -kind: Application -metadata: - name: testnorge-bisys - namespace: dolly - labels: - team: dolly -spec: - port: 8080 - webproxy: true - liveness: - path: /internal/isAlive - periodSeconds: 30 - initialDelay: 30 - readiness: - path: /internal/isReady - initialDelay: 30 - prometheus: - enabled: true - path: /internal/metrics - replicas: - min: 1 - max: 1 - vault: - enabled: true - resources: - requests: - cpu: 200m - memory: 1024Mi - limits: - memory: 2048Mi - image: {{ image }} - accessPolicy: - inbound: - rules: - - application: team-dolly-lokal-app - cluster: dev-gcp - azure: - application: - allowAllUsers: true - enabled: true - tenant: nav.no - ingresses: - - "https://testnorge-bisys.dev.intern.nav.no" # dev-fss \ No newline at end of file diff --git a/apps/testnorge-bisys/gradle/wrapper/gradle-wrapper.jar b/apps/testnorge-bisys/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/apps/testnorge-bisys/gradle/wrapper/gradle-wrapper.properties b/apps/testnorge-bisys/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e1bef7e873c..00000000000 --- a/apps/testnorge-bisys/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/apps/testnorge-bisys/gradlew b/apps/testnorge-bisys/gradlew deleted file mode 100755 index 3da45c161b0..00000000000 --- a/apps/testnorge-bisys/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright ? 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?, -# ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?; -# * compound commands having a testable exit status, especially ?case?; -# * various built-in commands including ?command?, ?set?, and ?ulimit?. -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/apps/testnorge-bisys/gradlew.bat b/apps/testnorge-bisys/gradlew.bat deleted file mode 100644 index ac1b06f9382..00000000000 --- a/apps/testnorge-bisys/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/apps/testnorge-bisys/gradlewUpdate.sh b/apps/testnorge-bisys/gradlewUpdate.sh deleted file mode 100755 index e5ee6361152..00000000000 --- a/apps/testnorge-bisys/gradlewUpdate.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -gradle wrapper \ No newline at end of file diff --git a/apps/testnorge-bisys/settings.gradle b/apps/testnorge-bisys/settings.gradle deleted file mode 100644 index 49ab758386a..00000000000 --- a/apps/testnorge-bisys/settings.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - id "com.gradle.enterprise" version "3.12.3" -} - -rootProject.name = 'testnorge-bisys' - - -includeBuild '../../libs/security-core' -includeBuild '../../libs/servlet-core' -includeBuild '../../libs/servlet-insecure-security' -includeBuild '../../libs/data-transfer-objects' - -gradleEnterprise { - buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" - } -} \ No newline at end of file diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/TestnorgeBisysApplicationStarter.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/TestnorgeBisysApplicationStarter.java deleted file mode 100644 index 5a53e6ff46f..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/TestnorgeBisysApplicationStarter.java +++ /dev/null @@ -1,12 +0,0 @@ -package no.nav.registre.bisys; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class TestnorgeBisysApplicationStarter { - - public static void main(String[] args) { - SpringApplication.run(TestnorgeBisysApplicationStarter.class, args); - } -} \ No newline at end of file diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/PersonSearchAdapter.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/PersonSearchAdapter.java deleted file mode 100644 index 208570a7914..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/PersonSearchAdapter.java +++ /dev/null @@ -1,169 +0,0 @@ -package no.nav.registre.bisys.adapter; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.bisys.adapter.exception.PersonSearchException; -import no.nav.registre.bisys.adapter.model.Response; -import no.nav.registre.bisys.domain.search.PersonSearch; -import org.apache.lucene.search.TotalHits; -import org.apache.lucene.search.join.ScoreMode; -import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.core.TimeValue; -import org.elasticsearch.index.query.BoolQueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.RangeQueryBuilder; -import org.elasticsearch.index.query.functionscore.RandomScoreFunctionBuilder; -import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.springframework.stereotype.Component; - -import java.time.LocalDate; -import java.util.Arrays; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.TimeUnit; - -import static java.util.Objects.nonNull; - - -@Slf4j -@Component -@RequiredArgsConstructor -public class PersonSearchAdapter { - private final ObjectMapper objectMapper; - private final RestHighLevelClient client; - - private List convert(SearchHit[] hits, Class clazz) { - return Arrays.stream(hits).map(SearchHit::getSourceAsString).map(json -> { - try { - return objectMapper.readValue(json, clazz); - } catch (JsonProcessingException e) { - throw new PersonSearchException("Feil med konvertering fra json: " + json, e); - } - }).toList(); - } - - @SneakyThrows - public List search(PersonSearch search) { - var queryBuilder = QueryBuilders.boolQuery(); - - addRandomScoreQuery(queryBuilder, search); - addTagsQueries(queryBuilder, search); - addLevendeQuery(queryBuilder, search); - addFoedselQuery(queryBuilder, search); - addRelasjonQueries(queryBuilder, search); - - var searchRequest = new SearchRequest(); - searchRequest.indices("pdl-sok"); - - var searchSourceBuilder = new SearchSourceBuilder(); - int page = search.getPage(); - int pageSize = search.getPageSize(); - searchSourceBuilder.from((page - 1) * pageSize); - searchSourceBuilder.timeout(new TimeValue(3, TimeUnit.SECONDS)); - searchSourceBuilder.size(pageSize); - searchSourceBuilder.query(queryBuilder); - - searchRequest.source(searchSourceBuilder); - - SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT); - TotalHits totalHits = searchResponse.getHits().getTotalHits(); - if (nonNull(totalHits)){ - log.info("Fant {} personer i pdl.", totalHits.value); - } - - return convert(searchResponse.getHits().getHits(), Response.class); - } - - private void queryFoedselsdato(LocalDate fom, LocalDate tom, BoolQueryBuilder queryBuilder) { - getBetween(fom, tom, "hentPerson.foedsel.foedselsdato") - .ifPresent(rangeQueryBuilder -> queryBuilder.must(QueryBuilders.nestedQuery( - "hentPerson.foedsel", - rangeQueryBuilder, - ScoreMode.Avg - )) - ); - } - - private void addRandomScoreQuery(BoolQueryBuilder queryBuilder, PersonSearch search) { - Optional.ofNullable(search.getRandomSeed()) - .ifPresent(value -> { - if (!value.isEmpty()) { - queryBuilder.must(QueryBuilders.functionScoreQuery(new RandomScoreFunctionBuilder().seed(value))); - } - }); - } - - private void addTagsQueries(BoolQueryBuilder queryBuilder, PersonSearch search) { - queryBuilder.must(QueryBuilders.matchQuery("tags", search.getTag())); - - Optional.ofNullable(search.getExcludeTags()) - .ifPresent(values -> { - if (!values.isEmpty()) { - queryBuilder.mustNot(QueryBuilders.termsQuery("tags", values)); - } - }); - } - - - private void addFoedselQuery(BoolQueryBuilder queryBuilder, PersonSearch search) { - Optional.ofNullable(search.getFoedsel()) - .ifPresent(value -> queryFoedselsdato(value.getFom(), value.getTom(), queryBuilder)); - } - - private void addRelasjonQueries(BoolQueryBuilder queryBuilder, PersonSearch search) { - Optional.ofNullable(search.getRelasjoner()) - .ifPresent(value -> { - if (value.getFar() != null && value.getFar()) { - queryBuilder.must(QueryBuilders.nestedQuery( - "hentPerson.forelderBarnRelasjon", - QueryBuilders.matchQuery("hentPerson.forelderBarnRelasjon.relatertPersonsRolle", "FAR"), - ScoreMode.Avg - )).must(); - } - if (value.getMor() != null && value.getMor()) { - queryBuilder.must(QueryBuilders.nestedQuery( - "hentPerson.forelderBarnRelasjon", - QueryBuilders.matchQuery("hentPerson.forelderBarnRelasjon.relatertPersonsRolle", "MOR"), - ScoreMode.Avg - )).must(); - } - }); - } - - private void addLevendeQuery(BoolQueryBuilder queryBuilder, PersonSearch search) { - Optional.ofNullable(search.getKunLevende()) - .ifPresent(value -> { - if (Boolean.TRUE.equals(value)) { - queryBuilder.mustNot(QueryBuilders.nestedQuery( - "hentPerson.doedsfall", - QueryBuilders.existsQuery("hentPerson.doedsfall.doedsdato"), - ScoreMode.Avg - )).must(); - } - }); - } - - private Optional getBetween(LocalDate fom, LocalDate tom, String field) { - if (fom == null && tom == null) { - return Optional.empty(); - } - var builder = QueryBuilders.rangeQuery(field); - - if (fom != null) { - builder.gte(fom); - } - - if (tom != null) { - builder.lte(tom); - } - return Optional.of(builder); - } - -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/exception/PersonSearchException.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/exception/PersonSearchException.java deleted file mode 100644 index 5beeb479003..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/exception/PersonSearchException.java +++ /dev/null @@ -1,7 +0,0 @@ -package no.nav.registre.bisys.adapter.exception; - -public class PersonSearchException extends RuntimeException { - public PersonSearchException(String message, Exception e) { - super(message, e); - } -} \ No newline at end of file diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/FoedselModel.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/FoedselModel.java deleted file mode 100644 index 4dcff79e135..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/FoedselModel.java +++ /dev/null @@ -1,17 +0,0 @@ -package no.nav.registre.bisys.adapter.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -import java.time.LocalDate; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class FoedselModel implements WithMetadata { - LocalDate foedselsdato; - Metadata metadata; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/ForelderBarnRelasjonModel.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/ForelderBarnRelasjonModel.java deleted file mode 100644 index abda465c1b1..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/ForelderBarnRelasjonModel.java +++ /dev/null @@ -1,17 +0,0 @@ -package no.nav.registre.bisys.adapter.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class ForelderBarnRelasjonModel implements WithMetadata { - String relatertPersonsIdent; - String relatertPersonsRolle; - String minRolleForPerson; - Metadata metadata; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/HentIdenterModel.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/HentIdenterModel.java deleted file mode 100644 index 308e195852d..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/HentIdenterModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package no.nav.registre.bisys.adapter.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -import java.util.List; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class HentIdenterModel { - List identer; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/HentPersonModel.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/HentPersonModel.java deleted file mode 100644 index 9b5893c646f..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/HentPersonModel.java +++ /dev/null @@ -1,18 +0,0 @@ -package no.nav.registre.bisys.adapter.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -import java.util.List; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class HentPersonModel { - List foedsel; - List statsborgerskap; - List forelderBarnRelasjon; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/IdenterModel.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/IdenterModel.java deleted file mode 100644 index 1a5f051dc60..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/IdenterModel.java +++ /dev/null @@ -1,15 +0,0 @@ -package no.nav.registre.bisys.adapter.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class IdenterModel { - String ident; - String gruppe; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/Metadata.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/Metadata.java deleted file mode 100644 index d679d48397f..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/Metadata.java +++ /dev/null @@ -1,14 +0,0 @@ -package no.nav.registre.bisys.adapter.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class Metadata { - Boolean historisk; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/Response.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/Response.java deleted file mode 100644 index b2c88c2c23c..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/Response.java +++ /dev/null @@ -1,18 +0,0 @@ -package no.nav.registre.bisys.adapter.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -import java.util.List; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class Response { - HentPersonModel hentPerson; - HentIdenterModel hentIdenter; - List tags; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/StatsborgerskapModel.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/StatsborgerskapModel.java deleted file mode 100644 index 0b5c0c4188b..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/StatsborgerskapModel.java +++ /dev/null @@ -1,13 +0,0 @@ -package no.nav.registre.bisys.adapter.model; - -import lombok.AllArgsConstructor; -import lombok.NoArgsConstructor; -import lombok.Value; - -@Value -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class StatsborgerskapModel implements WithMetadata { - String land; - Metadata metadata; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/WithMetadata.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/WithMetadata.java deleted file mode 100644 index 21e176d649e..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/adapter/model/WithMetadata.java +++ /dev/null @@ -1,5 +0,0 @@ -package no.nav.registre.bisys.adapter.model; - -public interface WithMetadata { - Metadata getMetadata(); -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/AppConfig.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/AppConfig.java deleted file mode 100644 index 3339c8aef14..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/AppConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -package no.nav.registre.bisys.config; - -import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -@Configuration -@Import(value = { - ApplicationCoreConfig.class, - InsecureJwtServerToServerConfiguration.class -}) -public class AppConfig { -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/OpenApiConfig.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/OpenApiConfig.java deleted file mode 100644 index 586109d666d..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/OpenApiConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -package no.nav.registre.bisys.config; - -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Contact; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.info.License; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import no.nav.testnav.libs.servletcore.config.ApplicationProperties; - -@Configuration -public class OpenApiConfig implements WebMvcConfigurer { - - @Bean - public OpenAPI openApi(ApplicationProperties applicationProperties) { - return new OpenAPI() - .info(new Info() - .title(applicationProperties.getName()) - .version(applicationProperties.getVersion()) - .description(applicationProperties.getDescription()) - .termsOfService("https://nav.no") - .contact(new Contact() - .url("https://nav-it.slack.com/archives/CA3P9NGA2") - .email("dolly@nav.no") - .name("Team Dolly") - ) - .license(new License() - .name("MIT License") - .url("https://opensource.org/licenses/MIT") - ) - ); - } - - @Override - public void addViewControllers(ViewControllerRegistry registry) { - registry.addViewController("/swagger").setViewName("redirect:/swagger-ui.html"); - } -} \ No newline at end of file diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/ProdConfig.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/ProdConfig.java deleted file mode 100644 index 3d4922f8fc1..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/ProdConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package no.nav.registre.bisys.config; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.bisys.config.credential.ElasticSearchCredentials; -import org.elasticsearch.client.RestHighLevelClient; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.data.elasticsearch.client.ClientConfiguration; -import org.springframework.data.elasticsearch.client.RestClients; - -import java.io.IOException; - - -@Slf4j -@Configuration -@Profile("prod") -@RequiredArgsConstructor -public class ProdConfig { - private final ElasticSearchCredentials elasticSearchCredentials; - - @Bean - public RestHighLevelClient client() throws IOException { - ClientConfiguration clientConfiguration - = ClientConfiguration.builder() - .connectedTo(elasticSearchCredentials.getHost() + ":" + elasticSearchCredentials.getPort()) - .usingSsl() - .withBasicAuth(elasticSearchCredentials.getUsername(), elasticSearchCredentials.getPassword()) - .build(); - - try (RestClients.ElasticsearchRestClient client = RestClients.create(clientConfiguration)){ - return client.rest(); - } - } - -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/SecurityConfig.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/SecurityConfig.java deleted file mode 100644 index df41f7b7f68..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/SecurityConfig.java +++ /dev/null @@ -1,32 +0,0 @@ -package no.nav.registre.bisys.config; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.annotation.Order; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.web.SecurityFilterChain; - -/** - * Remove this call with AzureAd config - */ -@Slf4j -@Configuration -@Order(1) -public class SecurityConfig { - - @Bean - public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { - - - httpSecurity - .httpBasic() - .and() - .headers().frameOptions().disable() - .and() - .csrf().disable() - .formLogin().disable(); - - return httpSecurity.build(); - } -} \ No newline at end of file diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/VaultConfig.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/VaultConfig.java deleted file mode 100644 index fcfab2afd40..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/VaultConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package no.nav.registre.bisys.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.vault.annotation.VaultPropertySource; -import org.springframework.vault.authentication.ClientAuthentication; -import org.springframework.vault.authentication.TokenAuthentication; -import org.springframework.vault.client.VaultEndpoint; -import org.springframework.vault.config.AbstractVaultConfiguration; - -@Configuration -@Profile("dev") -@VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false) -public class VaultConfig extends AbstractVaultConfiguration { - - @Override - public VaultEndpoint vaultEndpoint() { - return VaultEndpoint.create("vault.adeo.no", 443); - } - - @Override - public ClientAuthentication clientAuthentication() { - var token = System.getProperty("spring.cloud.vault.token"); - if (token == null) { - throw new IllegalArgumentException("Påkreved property 'spring.cloud.vault.token' er ikke satt."); - } - return new TokenAuthentication(System.getProperty("spring.cloud.vault.token")); - } -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/credential/ElasticSearchCredentials.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/credential/ElasticSearchCredentials.java deleted file mode 100644 index 59612f1aa0d..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/config/credential/ElasticSearchCredentials.java +++ /dev/null @@ -1,19 +0,0 @@ -package no.nav.registre.bisys.config.credential; - - -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Getter -@Setter -@Configuration -@ConfigurationProperties(prefix = "elasticsearch.client") -public class ElasticSearchCredentials { - private String host; - private String port; - private String username; - private String password; -} - diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/BidragsmeldingConsumer.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/BidragsmeldingConsumer.java deleted file mode 100644 index 407bf8834dc..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/BidragsmeldingConsumer.java +++ /dev/null @@ -1,28 +0,0 @@ -package no.nav.registre.bisys.consumer; - -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.bisys.consumer.response.SyntetisertBidragsmelding; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.client.WebClient; - -import java.util.List; - - -@Slf4j -@Component -public class BidragsmeldingConsumer { - - private final WebClient webClient; - - public BidragsmeldingConsumer( - @Value("${consumers.bidragsmelding.url}") String url) { - this.webClient = WebClient.builder() - .baseUrl(url) - .build(); - } - - public void opprett(List list, String miljoe) { - list.forEach(item -> log.info("Oppretting av bidragsmeldinger ikke ferdig implementert.")); - } -} \ No newline at end of file diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/SyntBisysConsumer.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/SyntBisysConsumer.java deleted file mode 100644 index 6c65f1e735b..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/SyntBisysConsumer.java +++ /dev/null @@ -1,45 +0,0 @@ -package no.nav.registre.bisys.consumer; - -import io.micrometer.core.annotation.Timed; -import no.nav.registre.bisys.consumer.command.GetSyntBisysMeldingerCommand; -import no.nav.registre.bisys.consumer.credential.SyntBisysProperties; -import no.nav.registre.bisys.consumer.response.SyntetisertBidragsmelding; -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; -import org.springframework.stereotype.Component; - -import org.springframework.web.reactive.function.client.ExchangeStrategies; -import org.springframework.web.reactive.function.client.WebClient; - -import java.util.List; - -@Component -public class SyntBisysConsumer { - - private final TokenExchange tokenExchange; - private final ServerProperties serviceProperties; - private final WebClient webClient; - - public SyntBisysConsumer( - SyntBisysProperties syntProperties, - TokenExchange tokenExchange) { - - this.serviceProperties = syntProperties; - this.tokenExchange = tokenExchange; - this.webClient = WebClient.builder() - .exchangeStrategies(ExchangeStrategies.builder() - .codecs(configurer -> configurer - .defaultCodecs() - .maxInMemorySize(16 * 1024 * 1024)) - .build()) - .baseUrl(syntProperties.getUrl()) - .build(); - } - - @Timed(value = "bisys.resource.latency", extraTags = {"operation", "bisys-syntetisereren"}) - public List getSyntetiserteBidragsmeldinger(int antallMeldinger) { - return tokenExchange.exchange(serviceProperties) - .flatMap(accessToken -> new GetSyntBisysMeldingerCommand(antallMeldinger, accessToken.getTokenValue(), webClient).call()) - .block(); - } -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/command/GetSyntBisysMeldingerCommand.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/command/GetSyntBisysMeldingerCommand.java deleted file mode 100644 index 8b22f6d0d62..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/command/GetSyntBisysMeldingerCommand.java +++ /dev/null @@ -1,41 +0,0 @@ -package no.nav.registre.bisys.consumer.command; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.bisys.consumer.response.SyntetisertBidragsmelding; -import org.springframework.core.ParameterizedTypeReference; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Mono; - -import java.util.Collections; -import java.util.List; -import java.util.concurrent.Callable; - -@Slf4j -@AllArgsConstructor -public class GetSyntBisysMeldingerCommand implements Callable>> { - - private final Integer antallMeldinger; - private final String token; - private final WebClient webClient; - - private static final ParameterizedTypeReference> RESPONSE_TYPE = new ParameterizedTypeReference<>() { - }; - - @Override - public Mono> call() { - try { - return webClient.get() - .uri(builder -> - builder.path("/api/v1/generate/bisys/{numToGenerate}") - .build(antallMeldinger) - ) - .header("Authorization", "Bearer " + token) - .retrieve() - .bodyToMono(RESPONSE_TYPE); - } catch (Exception e){ - log.error("Klarte ikke hente syntetiske bidragsmeldinger", e); - return Mono.just(Collections.emptyList()); - } - } -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/credential/SyntBisysProperties.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/credential/SyntBisysProperties.java deleted file mode 100644 index 62568e68345..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/credential/SyntBisysProperties.java +++ /dev/null @@ -1,11 +0,0 @@ -package no.nav.registre.bisys.consumer.credential; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -import no.nav.testnav.libs.securitycore.domain.ServerProperties; - -@Configuration -@ConfigurationProperties(prefix = "consumers.synt-bisys") -public class SyntBisysProperties extends ServerProperties { -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/response/PersonSearchResponse.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/response/PersonSearchResponse.java deleted file mode 100644 index b9f8d620c77..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/response/PersonSearchResponse.java +++ /dev/null @@ -1,20 +0,0 @@ -package no.nav.registre.bisys.consumer.response; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import no.nav.testnav.libs.dto.personsearchservice.v1.PersonDTO; - -import java.util.List; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class PersonSearchResponse { - private int numberOfItems; - private List items; -} \ No newline at end of file diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/response/SyntetisertBidragsmelding.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/response/SyntetisertBidragsmelding.java deleted file mode 100644 index 0ea5faa3b16..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/consumer/response/SyntetisertBidragsmelding.java +++ /dev/null @@ -1,77 +0,0 @@ -package no.nav.registre.bisys.consumer.response; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class SyntetisertBidragsmelding { - - private static final Integer DEFAULT_BA_ALDER = -1; - - @JsonProperty("BA") - private String barn; - - @Getter(AccessLevel.NONE) - @Setter(AccessLevel.NONE) - private Integer barnAlderIMnd; - - @JsonProperty("BM") - private String bidragsmottaker; - - @JsonProperty("BP") - private String bidragspliktig; - - @JsonProperty("FASTSATT_I") - private String fastsattI; - - @JsonProperty("GEBYRFRITAK_BM") - private String gebyrfritakBm; - - @JsonProperty("GEBYRFRITAK_BP") - private String gebyrfritakBp; - - @JsonProperty("GODKJENT_BELOP") - private int godkjentBelop; - - @JsonProperty("INNBETALT") - private String innbetalt; - - @JsonProperty("KRAVBELOP") - private int kravbelop; - - @JsonProperty("MOTTATT_DATO") - private String mottattDato; - - @JsonProperty("SOKNADSTYPE") - private String soknadstype; - - @JsonProperty("SOKNAD_FRA") - private String soknadFra; - - @JsonProperty("SOKT_FRA") - private String soktFra; - - @JsonProperty("SOKT_OM") - private String soktOm; - - @JsonProperty(value = "BA_ALDER") - public int getBarnAlderIMnd() { - return barnAlderIMnd == null ? DEFAULT_BA_ALDER : barnAlderIMnd; - } - - @JsonProperty(value = "BA_ALDER") - public void setBarnAlderIMnd(Integer barnAlderIMnd) { - this.barnAlderIMnd = barnAlderIMnd == null ? DEFAULT_BA_ALDER : barnAlderIMnd; - } - -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/Barn.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/Barn.java deleted file mode 100644 index 2b313cf2b07..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/Barn.java +++ /dev/null @@ -1,22 +0,0 @@ -package no.nav.registre.bisys.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDate; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class Barn { - - private String fnr; - private LocalDate foedselsdato; - private String morFnr; - private String farFnr; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/FoedselSearch.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/FoedselSearch.java deleted file mode 100644 index fecccf4c8f7..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/FoedselSearch.java +++ /dev/null @@ -1,17 +0,0 @@ -package no.nav.registre.bisys.domain.search; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -import java.time.LocalDate; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class FoedselSearch { - LocalDate fom; - LocalDate tom; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/PersonSearch.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/PersonSearch.java deleted file mode 100644 index 2feafa33e58..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/PersonSearch.java +++ /dev/null @@ -1,26 +0,0 @@ -package no.nav.registre.bisys.domain.search; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - -import java.util.Collections; -import java.util.List; - -@Builder -@Getter -@Setter -@AllArgsConstructor -public class PersonSearch { - private final String tag = "TESTNORGE"; - private final List excludeTags = Collections.singletonList("DOLLY"); - private final Boolean kunLevende = true; - - private Integer page; - private Integer pageSize; - private String randomSeed; - private FoedselSearch foedsel; - RelasjonSearch relasjoner; - -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/RelasjonSearch.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/RelasjonSearch.java deleted file mode 100644 index ddc907ca242..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/domain/search/RelasjonSearch.java +++ /dev/null @@ -1,15 +0,0 @@ -package no.nav.registre.bisys.domain.search; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import lombok.Value; - -@Value -@Builder -@AllArgsConstructor -@NoArgsConstructor(force = true) -public class RelasjonSearch { - Boolean mor; - Boolean far; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/meter/WebClientTagsProvider.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/meter/WebClientTagsProvider.java deleted file mode 100644 index 1a70fc0ed5a..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/meter/WebClientTagsProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -package no.nav.registre.bisys.meter; - -import io.micrometer.core.instrument.Tag; -import org.springframework.boot.actuate.metrics.web.reactive.client.WebClientExchangeTags; -import org.springframework.boot.actuate.metrics.web.reactive.client.WebClientExchangeTagsProvider; -import org.springframework.web.reactive.function.client.ClientRequest; -import org.springframework.web.reactive.function.client.ClientResponse; - -import java.util.List; - -public class WebClientTagsProvider implements WebClientExchangeTagsProvider { - - private static String stripRequestParams(Tag uriTag) { - - return uriTag.getValue().replaceFirst("\\?.*", ""); - } - - @Override - public Iterable tags(ClientRequest request, ClientResponse response, Throwable throwable) { - - return List.of( - WebClientExchangeTags.method(request), - Tag.of("uri", stripRequestParams(WebClientExchangeTags.uri(request))), - WebClientExchangeTags.status(response, throwable), - WebClientExchangeTags.outcome(response)); - } -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/provider/SyntetiseringController.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/provider/SyntetiseringController.java deleted file mode 100644 index de50c66aa99..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/provider/SyntetiseringController.java +++ /dev/null @@ -1,33 +0,0 @@ -package no.nav.registre.bisys.provider; - - -import io.swagger.v3.oas.annotations.Operation; -import lombok.RequiredArgsConstructor; -import no.nav.registre.bisys.service.SyntetiseringService; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import no.nav.registre.bisys.consumer.BidragsmeldingConsumer; -import no.nav.registre.bisys.provider.request.SyntetiserBisysRequest; - -@RestController -@RequestMapping("api/v1/syntetisering") -@RequiredArgsConstructor -public class SyntetiseringController { - - private final SyntetiseringService syntetiseringService; - private final BidragsmeldingConsumer bidragsmeldingConsumer; - - @Operation(summary = "Her kan man generere syntetiske bidragsmeldinger på Testnorge personer og lagre i Bisys UI.") - @PostMapping(value = "/opprett") - public void genererOgLagreBidragsmeldinger( - @RequestBody SyntetiserBisysRequest syntetiserBisysRequest - ){ - var syntetisertBidragsmeldinger = syntetiseringService.generateBidragsmeldinger(syntetiserBisysRequest.getAntallNyeIdenter()); - if (!syntetisertBidragsmeldinger.isEmpty()){ - bidragsmeldingConsumer.opprett(syntetisertBidragsmeldinger, syntetiserBisysRequest.getMiljoe()); - } - } -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/provider/request/SyntetiserBisysRequest.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/provider/request/SyntetiserBisysRequest.java deleted file mode 100644 index 796bbc33f3a..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/provider/request/SyntetiserBisysRequest.java +++ /dev/null @@ -1,15 +0,0 @@ -package no.nav.registre.bisys.provider.request; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.NoArgsConstructor; -import lombok.Value; - -@Value -@NoArgsConstructor(force = true) -public class SyntetiserBisysRequest { - - @JsonProperty("miljoe") - private String miljoe; - @JsonProperty("antallNyeIdenter") - private int antallNyeIdenter; -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/IdentService.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/IdentService.java deleted file mode 100644 index e727867cb9f..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/IdentService.java +++ /dev/null @@ -1,149 +0,0 @@ -package no.nav.registre.bisys.service; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.bisys.adapter.PersonSearchAdapter; -import no.nav.registre.bisys.adapter.model.Response; -import no.nav.registre.bisys.domain.search.FoedselSearch; -import no.nav.registre.bisys.domain.search.PersonSearch; -import no.nav.registre.bisys.domain.search.RelasjonSearch; -import no.nav.registre.bisys.consumer.response.SyntetisertBidragsmelding; -import no.nav.registre.bisys.domain.Barn; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.time.LocalDate; -import java.util.Random; - -import static no.nav.registre.bisys.service.utils.BidragUtils.isSoktOm18; -import static no.nav.registre.bisys.service.utils.BidragUtils.parseSoktFra; -import static no.nav.registre.bisys.service.utils.DateUtils.getMonthsBetween; - - -@Slf4j -@Service -@RequiredArgsConstructor -public class IdentService { - - private static final String RELASJON_MOR = "MOR"; - private static final String RELASJON_FAR = "FAR"; - private static final LocalDate MIN_MOTTATT_DATO = LocalDate.of(2007, 1, 1); - - private final Random rand = new Random(); - private final PersonSearchAdapter personSearchAdapter; - - @Value("${USE_HISTORICAL_MOTTATTDATO}") - private boolean useHistoricalMottattdato; - - public Barn getValidId(SyntetisertBidragsmelding bidragsmelding) { - boolean needYoungAdult = isSoktOm18(bidragsmelding.getSoktOm()); - if (needYoungAdult) { - return getYoungAdultWithForeldre(bidragsmelding); - } else { - return getBarnWithForeldre(bidragsmelding); - } - } - - private Barn getBarnWithForeldre(SyntetisertBidragsmelding bidragsmelding) { - int soktFra = parseSoktFra(bidragsmelding); - var soktFraDate = LocalDate.now().minusMonths(soktFra); - if (useHistoricalMottattdato) { - int lowerBound = 0; - int upperBound = 17 * 12 + 6 + getMonthsBetween(MIN_MOTTATT_DATO, LocalDate.now()); - // Look for barn in the age range of currently 17.5 years to max 17.5 years at MIN_MOTTATT_DATO - return getBarnInValidAgeRange(soktFraDate.minusMonths(upperBound).plusDays(1), soktFraDate.minusMonths(lowerBound).minusDays(1)); - } else { - int lowerBound = 0; - int upperBound = 17 * 12 + 6; - // Look for barn between 0 and 17.5 of age at soktFraDate - return getBarnInValidAgeRange(soktFraDate.minusMonths(upperBound).plusDays(1), soktFraDate.minusMonths(lowerBound).minusDays(1)); - } - } - - private Barn getYoungAdultWithForeldre(SyntetisertBidragsmelding bidragsmelding) { - int soktFra = parseSoktFra(bidragsmelding); - var soktFraDate = LocalDate.now().minusMonths(soktFra); - if (useHistoricalMottattdato) { - int lowerBound = 17 * 12 + 6; - int upperBound = getMonthsBetween(MIN_MOTTATT_DATO.minusMonths(lowerBound), LocalDate.now()); - // Look for barn in the age range of currently 17.5 years at soktFraDate to max 17.5 years at MIN_MOTTATT_DATO - return getBarnInValidAgeRange(soktFraDate.minusMonths(upperBound).plusDays(1), soktFraDate.minusMonths(lowerBound).minusDays(1)); - } else { - int lowerBound = 17 * 12 + 6; - int upperBound = lowerBound + (2 * 12); - // Look for barn between 17.5 and 19.5 years of age at soktFraDate - return getBarnInValidAgeRange(soktFraDate.minusMonths(upperBound).plusDays(1), soktFraDate.minusMonths(lowerBound).minusDays(1)); - } - } - - private Barn getBarnInValidAgeRange(LocalDate bornFom, LocalDate bornTom) { - var searchRequest = PersonSearch.builder() - .page(1) - .pageSize(10) - .randomSeed(rand.nextFloat() + "") - .foedsel(FoedselSearch.builder() - .fom(bornFom) - .tom(bornTom) - .build()) - .relasjoner(RelasjonSearch.builder() - .mor(true) - .far(true) - .build()) - .build(); - - var response = personSearchAdapter.search(searchRequest); - if (response.isEmpty()){ - return null; - } else{ - return convert(response.get(0)); - } - } - - private Barn convert(Response response) { - try { - return Barn.builder() - .fnr(getIdent(response)) - .foedselsdato(getFoedselsdato(response)) - .farFnr(getForelder(response, RELASJON_FAR)) - .morFnr(getForelder(response, RELASJON_MOR)) - .build(); - } catch (Exception e) { - log.error("Feil i konvertering av søke resultat"); - return null; - } - } - - private String getIdent(Response response) { - return response - .getHentIdenter() - .getIdenter() - .stream() - .filter(identer -> identer.getGruppe().equals("FOLKEREGISTERIDENT")) - .findFirst() - .orElseThrow() - .getIdent(); - } - - private LocalDate getFoedselsdato(Response response) { - return response - .getHentPerson() - .getFoedsel() - .stream().filter(foedsel -> !foedsel.getMetadata().getHistorisk()) - .findFirst() - .orElseThrow() - .getFoedselsdato(); - } - - private String getForelder(Response response, String forelder) { - return response - .getHentPerson() - .getForelderBarnRelasjon() - .stream() - .filter(relasjon -> relasjon.getRelatertPersonsRolle().equals(forelder)) - .findFirst() - .orElseThrow() - .getRelatertPersonsIdent(); - } - -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/SyntetiseringService.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/SyntetiseringService.java deleted file mode 100644 index 2111ee89f4f..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/SyntetiseringService.java +++ /dev/null @@ -1,126 +0,0 @@ -package no.nav.registre.bisys.service; - -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.List; -import java.util.Random; - -import lombok.RequiredArgsConstructor; - -import lombok.extern.slf4j.Slf4j; -import no.nav.bidrag.ui.bisys.soknad.Soknad; -import no.nav.registre.bisys.consumer.SyntBisysConsumer; -import no.nav.registre.bisys.consumer.response.SyntetisertBidragsmelding; - -import no.nav.registre.bisys.domain.Barn; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import static no.nav.registre.bisys.service.utils.DateUtils.getAgeInMonths; -import static no.nav.registre.bisys.service.utils.DateUtils.getMonthsBetween; -import static no.nav.registre.bisys.service.utils.BidragUtils.isSoktOm18; -import static no.nav.registre.bisys.service.utils.BidragUtils.parseSoktFra; - -@Slf4j -@Service -@RequiredArgsConstructor -public class SyntetiseringService { - - private final SyntBisysConsumer syntBisysConsumer; - private final IdentService identService; - private final Random rand = new Random(); - - @Value("${USE_HISTORICAL_MOTTATTDATO}") - private boolean useHistoricalMottattdato; - - private static final LocalDate MIN_MOTTATT_DATO = LocalDate.of(2007, 1, 1); - - public List generateBidragsmeldinger(int antallIdenter) { - var bidragsmeldinger = syntBisysConsumer.getSyntetiserteBidragsmeldinger(antallIdenter); - - for (var melding : bidragsmeldinger) { - var barn = identService.getValidId(melding); - if (barn != null) { - finalizeBidragsmelding(barn, melding); - } - } - - var oppdaterteBidragsmeldinger = bidragsmeldinger.stream() - .filter(bidragsmelding -> bidragsmelding.getBarn() != null && !bidragsmelding.getBarn().equals("")) - .toList(); - - if (oppdaterteBidragsmeldinger.size() < antallIdenter) { - log.warn("Oppretter {} av {} bidragsmelding(er).", oppdaterteBidragsmeldinger.size(), antallIdenter); - } - - return oppdaterteBidragsmeldinger; - } - - private void finalizeBidragsmelding(Barn barn, SyntetisertBidragsmelding bidragsmelding) { - var mottattdato = useHistoricalMottattdato ? getHistoricalMottattdato(bidragsmelding, barn) : LocalDate.now(); - - alignBaAlderWithMottattdato(bidragsmelding, barn.getFoedselsdato(), mottattdato); - adjustSoktFra(bidragsmelding, barn.getFoedselsdato(), mottattdato); - - bidragsmelding.setBarn(barn.getFnr()); - - if (rand.nextDouble() >= 0.5) { - bidragsmelding.setBidragsmottaker(barn.getMorFnr()); - bidragsmelding.setBidragspliktig(barn.getFarFnr()); - } else { - bidragsmelding.setBidragsmottaker(barn.getFarFnr()); - bidragsmelding.setBidragspliktig(barn.getMorFnr()); - } - bidragsmelding.setMottattDato(mottattdato.format(DateTimeFormatter.ofPattern(Soknad.STANDARD_DATE_FORMAT_TESTNORGEBISYS_REQUEST))); - } - - private LocalDate getHistoricalMottattdato(SyntetisertBidragsmelding bidragsmelding, Barn barn) { - LocalDate mottattdato = barn.getFoedselsdato().plusMonths(bidragsmelding.getBarnAlderIMnd()); - mottattdato = mottattdato.isAfter(LocalDate.now()) ? LocalDate.now() : mottattdato; - mottattdato = mottattdato.isBefore(MIN_MOTTATT_DATO) - ? getRandomizedMottattdatoInValidRange(barn.getFoedselsdato(), MIN_MOTTATT_DATO) - : mottattdato; - return mottattdato; - } - - private LocalDate getRandomizedMottattdatoInValidRange(LocalDate foedselsdato, LocalDate minMottattdato) { - int minAge = getAgeInMonths(foedselsdato, minMottattdato); - int maxAge = 17 * 12 + 6; - int newAge = minAge + (rand.nextInt() * (maxAge - minAge + 1)); - return foedselsdato.plusMonths(newAge); - } - - private void alignBaAlderWithMottattdato(SyntetisertBidragsmelding bidragsmelding, LocalDate fodselsdato, LocalDate mottattdato) { - int adjustedBaAlder = getMonthsBetween(fodselsdato, mottattdato); - bidragsmelding.setBarnAlderIMnd(adjustedBaAlder); - } - - /** - * Adjust soktFra for soktOm 18 or II to the first month after barn turns 18. For other types, ensure barn is born at - * soktFra date. - */ - private void adjustSoktFra(SyntetisertBidragsmelding bidragsmelding, LocalDate birthdate, LocalDate mottattdato) { - int ageInMonthsAtMottattdato = getMonthsBetween(birthdate.withDayOfMonth(1), mottattdato.withDayOfMonth(1)); - - if (isSoktOm18(bidragsmelding.getSoktOm())) { - int age18Plus1MonthInMonths = getMonthsBetween(birthdate, birthdate.plusYears(18).plusMonths(1)); - int adjustedSoktFra = ageInMonthsAtMottattdato - age18Plus1MonthInMonths; - bidragsmelding.setSoktFra(Integer.toString(adjustedSoktFra)); - } else { - adjustLowerAndUpperBound(bidragsmelding, ageInMonthsAtMottattdato); - } - } - - private void adjustLowerAndUpperBound(SyntetisertBidragsmelding bidragsmelding, int ageInMonthsAtMottattdato) { - int soktFra = parseSoktFra(bidragsmelding); - - if (ageInMonthsAtMottattdato - soktFra < 0) { - bidragsmelding.setSoktFra(Integer.toString(ageInMonthsAtMottattdato)); - } else if (ageInMonthsAtMottattdato - soktFra > 18 * 12 - 1) { - int monthsAbove18 = ageInMonthsAtMottattdato - 18 * 12; - int randomizedSoktFra = monthsAbove18 + (rand.nextInt() * 24 + 1); - bidragsmelding.setSoktFra(Integer.toString(randomizedSoktFra)); - } - } - -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/utils/BidragUtils.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/utils/BidragUtils.java deleted file mode 100644 index a3d2338e7f5..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/utils/BidragUtils.java +++ /dev/null @@ -1,31 +0,0 @@ -package no.nav.registre.bisys.service.utils; - -import lombok.extern.slf4j.Slf4j; -import no.nav.bidrag.ui.bisys.kodeverk.KodeSoknGrKomConstants; -import no.nav.registre.bisys.consumer.response.SyntetisertBidragsmelding; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -public class BidragUtils { - - private BidragUtils(){ - - } - - private static final String FORMAT_WARNING = "soktFra incorrectly formatted as {} in SyntetisertBidragsmelding, attempting to parse string as floating number"; - - public static boolean isSoktOm18(String soktOm) { - return KodeSoknGrKomConstants.BIDRAG_18_AAR.equals(soktOm) || KodeSoknGrKomConstants.BIDRAG_18_AAR_INNKREVING.equals(soktOm); - } - - public static int parseSoktFra(SyntetisertBidragsmelding bidragsmelding) { - try { - return Integer.parseInt(bidragsmelding.getSoktFra()); - } catch (NumberFormatException e) { - log.warn(FORMAT_WARNING, bidragsmelding.getSoktFra()); - return (int) Float.parseFloat(bidragsmelding.getSoktFra()); - } - } - -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/utils/DateUtils.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/utils/DateUtils.java deleted file mode 100644 index 777f4153bac..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/service/utils/DateUtils.java +++ /dev/null @@ -1,25 +0,0 @@ -package no.nav.registre.bisys.service.utils; - -import lombok.extern.slf4j.Slf4j; - -import org.springframework.stereotype.Service; - -import java.time.LocalDate; -import java.time.temporal.ChronoUnit; - - -@Slf4j -@Service -public class DateUtils { - - private DateUtils() { - } - - public static int getMonthsBetween(LocalDate firstDate, LocalDate secondDate) { - return (int) ChronoUnit.MONTHS.between(firstDate, secondDate); - } - - public static int getAgeInMonths(LocalDate foedselsdato, LocalDate dateMeasured) { - return getMonthsBetween(foedselsdato.withDayOfMonth(1), dateMeasured.withDayOfMonth(1)); - } -} diff --git a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/util/WebClientFilter.java b/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/util/WebClientFilter.java deleted file mode 100644 index ecda834f11f..00000000000 --- a/apps/testnorge-bisys/src/main/java/no/nav/registre/bisys/util/WebClientFilter.java +++ /dev/null @@ -1,14 +0,0 @@ -package no.nav.registre.bisys.util; - -import lombok.experimental.UtilityClass; -import org.springframework.web.reactive.function.client.WebClientResponseException; - -@UtilityClass -public class WebClientFilter { - - public static boolean is5xxException(Throwable throwable) { - - return throwable instanceof WebClientResponseException wce && - wce.getStatusCode().is5xxServerError(); - } -} diff --git a/apps/testnorge-bisys/src/main/resources/application-dev.yml b/apps/testnorge-bisys/src/main/resources/application-dev.yml deleted file mode 100644 index 28c960aba5c..00000000000 --- a/apps/testnorge-bisys/src/main/resources/application-dev.yml +++ /dev/null @@ -1,12 +0,0 @@ -azure: - app: - client: - id: ${client_id} - secret: ${client_secret} - -elasticsearch: - client: - username: - password: - host: localhost - port: 9200 \ No newline at end of file diff --git a/apps/testnorge-bisys/src/main/resources/application-prod.yml b/apps/testnorge-bisys/src/main/resources/application-prod.yml deleted file mode 100644 index 37cb46db4bf..00000000000 --- a/apps/testnorge-bisys/src/main/resources/application-prod.yml +++ /dev/null @@ -1,6 +0,0 @@ -elasticsearch: - client: - username: ${ELASTIC_USERNAME} - password: ${ELASTIC_PASSWORD} - host: ${ELASTIC_HOST} - port: ${ELASTIC_PORT} \ No newline at end of file diff --git a/apps/testnorge-bisys/src/main/resources/application.yaml b/apps/testnorge-bisys/src/main/resources/application.yaml deleted file mode 100644 index ae89abffc0f..00000000000 --- a/apps/testnorge-bisys/src/main/resources/application.yaml +++ /dev/null @@ -1,42 +0,0 @@ -spring: - application: - name: testnorge-bisys - version: application.version.todo #TODO Finn ut hvordan denne kan settes fra gradle - description: Testnorge-Bisys er adapteren mellom orkestratoren og bisys for opprettelse av syntetiske bistandsmeldinger. - - -springdoc: - swagger-ui: - disable-swagger-default-url: true - url: /v3/api-docs - -consumers: - bidragsmelding: - url: https://dummy.dev.adeo.no - synt-bisys: - url: https://synthdata-bisys.intern.dev.nav.no - cluster: dev-gcp - namespace: dolly - name: synthdata-bisys - -AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b - -USE_HISTORICAL_MOTTATTDATO: 1 - -management: - endpoints: - enabled-by-default: true - web: - base-path: /internal - exposure.include: prometheus,heapdump,health - path-mapping: - prometheus: metrics - endpoint: - prometheus.enabled: true - heapdump.enabled: true - metrics.export: - prometheus.enabled: true -server: - servlet: - encoding: - charset: UTF-8 diff --git a/apps/testnorge-bisys/src/main/resources/bootstrap.yml b/apps/testnorge-bisys/src/main/resources/bootstrap.yml deleted file mode 100644 index 0451449ca23..00000000000 --- a/apps/testnorge-bisys/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - cloud: - vault: - enabled: false \ No newline at end of file diff --git a/apps/testnorge-bisys/src/main/resources/logback-spring.xml b/apps/testnorge-bisys/src/main/resources/logback-spring.xml deleted file mode 100644 index 1a9ce7a5e5c..00000000000 --- a/apps/testnorge-bisys/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - true - 256 - 10280 - 20 - ^sun\.reflect\..*\.invoke - ^net\.sf\.cglib\.proxy\.MethodProxy\.invoke - java\.util\.concurrent\..* - org\.apache\.catalina\..* - org\.apache\.coyote\..* - org\.apache\.tomcat\..* - - - - - - - - - - - - - %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n - - utf8 - - - - - - - - - \ No newline at end of file diff --git a/apps/testnorge-bisys/src/test/java/no/nav/registre/bisys/ApplicationContextTest.java b/apps/testnorge-bisys/src/test/java/no/nav/registre/bisys/ApplicationContextTest.java deleted file mode 100644 index ceed1aad28c..00000000000 --- a/apps/testnorge-bisys/src/test/java/no/nav/registre/bisys/ApplicationContextTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package no.nav.registre.bisys; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.test.context.ActiveProfiles; - -@SpringBootTest -@ActiveProfiles("test") -class ApplicationContextTest { - - @MockBean - public JwtDecoder jwtDecoder; - - @Test - @SuppressWarnings("java:S2699") - void load_app_context() { - } -} - diff --git a/apps/testnorge-bisys/src/test/java/no/nav/registre/bisys/service/utils/DateUtilsTest.java b/apps/testnorge-bisys/src/test/java/no/nav/registre/bisys/service/utils/DateUtilsTest.java deleted file mode 100644 index 379b58d332d..00000000000 --- a/apps/testnorge-bisys/src/test/java/no/nav/registre/bisys/service/utils/DateUtilsTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package no.nav.registre.bisys.service.utils; - - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; - -import java.time.LocalDate; - -import static no.nav.registre.bisys.service.utils.DateUtils.getMonthsBetween; -import static no.nav.registre.bisys.service.utils.DateUtils.getAgeInMonths; -import static org.assertj.core.api.Assertions.assertThat; - -@RunWith(MockitoJUnitRunner.class) -public class DateUtilsTest { - - private static final LocalDate BIRTHDAY_1 = LocalDate.of(2001, 1, 1); - - @Test - public void shouldGetNumberOfMonthsBetweenDates(){ - var firstDate = LocalDate.of(2020, 1,1); - var secondDate = LocalDate.of(2021, 1, 1); - - assertThat(getMonthsBetween(firstDate, secondDate)).isEqualTo(12); - assertThat(getMonthsBetween(firstDate, firstDate)).isZero(); - assertThat(getMonthsBetween(firstDate.minusYears(2).plusDays(2), secondDate)).isEqualTo(35); - } - - @Test - public void shouldGetAgeInMonths(){ - assertThat(getAgeInMonths(BIRTHDAY_1, LocalDate.of(2004, 1, 1))).isEqualTo(36); - assertThat(getAgeInMonths(BIRTHDAY_1, LocalDate.of(2001, 1, 20))).isZero(); - assertThat(getAgeInMonths(BIRTHDAY_1, LocalDate.of(2001, 7, 20))).isEqualTo(6); - assertThat(getAgeInMonths(BIRTHDAY_1, LocalDate.of(2000, 11, 20))).isEqualTo(-2); - } - -} diff --git a/apps/testnorge-bisys/src/test/resources/application-test.yml b/apps/testnorge-bisys/src/test/resources/application-test.yml deleted file mode 100644 index faa4fe12809..00000000000 --- a/apps/testnorge-bisys/src/test/resources/application-test.yml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - cloud: - vault: - enabled: false - -azure: - app: - client: - id: dummy - secret: dummy - - -consumers: - bidragsmelding: - url: dummy - synt-bisys: - url: http://localhost:${wiremock.server.port:0}/synt-bisys - cluster: dummt - namespace: dummy - name: synthdata-bisys - -AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/token \ No newline at end of file diff --git a/apps/testnorge-bisys/src/test/resources/files/bidragsmelding.json b/apps/testnorge-bisys/src/test/resources/files/bidragsmelding.json deleted file mode 100644 index 1fd6c75f679..00000000000 --- a/apps/testnorge-bisys/src/test/resources/files/bidragsmelding.json +++ /dev/null @@ -1,36 +0,0 @@ -[ - { - "BA": "27119626051", - "BA_ALDER": 182, - "BM": "28016226094", - "BP": "26124826941", - "FASTSATT_I": "", - "GEBYRFRITAK_BM": null, - "GEBYRFRITAK_BP": null, - "GODKJENT_BELOP": 0, - "INNBETALT": "", - "KRAVBELOP": 0, - "MOTTATT_DATO": "2018-01-27", - "SOKNADSTYPE": "FA", - "SOKNAD_FRA": "MO", - "SOKT_FRA": 6, - "SOKT_OM": "FO" - }, - { - "BA": "27111726051", - "BA_ALDER": 182, - "BM": "24028226094", - "BP": "13128826941", - "FASTSATT_I": "", - "GEBYRFRITAK_BM": null, - "GEBYRFRITAK_BP": null, - "GODKJENT_BELOP": 0, - "INNBETALT": "", - "KRAVBELOP": 0, - "MOTTATT_DATO": "2019-01-27", - "SOKNADSTYPE": "FA", - "SOKNAD_FRA": "MO", - "SOKT_FRA": 6, - "SOKT_OM": "BI" - } -] \ No newline at end of file diff --git a/apps/testnorge-bisys/src/test/resources/files/bidragsmeldingEttBarn.json b/apps/testnorge-bisys/src/test/resources/files/bidragsmeldingEttBarn.json deleted file mode 100644 index 911552c8380..00000000000 --- a/apps/testnorge-bisys/src/test/resources/files/bidragsmeldingEttBarn.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "BA": "04091079629", - "BM": "28078241634", - "BP": "02018142743", - "FASTSATT_I": "", - "GEBYRFRITAK_BM": "", - "GEBYRFRITAK_BP": "", - "INNBETALT": "", - "MOTTATT_DATO": "2018-10-04", - "SOKNADSTYPE": "FA", - "SOKNAD_FRA": "MO", - "SOKT_FRA": "2017-01-01", - "SOKT_OM": "BI" - } -] \ No newline at end of file diff --git a/apps/testnorge-bisys/src/test/resources/files/bidragsmeldingForQ6.json b/apps/testnorge-bisys/src/test/resources/files/bidragsmeldingForQ6.json deleted file mode 100644 index 7b493c6f8b8..00000000000 --- a/apps/testnorge-bisys/src/test/resources/files/bidragsmeldingForQ6.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "BA": "22075200001", - "BM": "15098942294", - "BP": "16078031186", - "FASTSATT_I": "", - "GEBYRFRITAK_BM": "", - "GEBYRFRITAK_BP": "", - "INNBETALT": "", - "MOTTATT_DATO": "2018-05-02", - "SOKNADSTYPE": "FA", - "SOKNAD_FRA": "MO", - "SOKT_FRA": "2018-07-01", - "SOKT_OM": "BI" - } -] \ No newline at end of file diff --git a/apps/testnorge-bisys/src/test/resources/files/bidragsmeldingForQ6BarnTilEksisterendeSak.json b/apps/testnorge-bisys/src/test/resources/files/bidragsmeldingForQ6BarnTilEksisterendeSak.json deleted file mode 100644 index 60010f2e1d0..00000000000 --- a/apps/testnorge-bisys/src/test/resources/files/bidragsmeldingForQ6BarnTilEksisterendeSak.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "BA": "03011597083", - "BM": "15098942294", - "BP": "16078031186", - "FASTSATT_I": "", - "GEBYRFRITAK_BM": "", - "GEBYRFRITAK_BP": "", - "INNBETALT": "", - "MOTTATT_DATO": "2018-05-04", - "SOKNADSTYPE": "FA", - "SOKNAD_FRA": "MO", - "SOKT_FRA": "2018-07-01", - "SOKT_OM": "BI" - } -] \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 64528d8312e..4bd87bd6328 100644 --- a/settings.gradle +++ b/settings.gradle @@ -98,7 +98,6 @@ includeBuild './apps/person-organisasjon-tilgang-service' includeBuild './apps/bruker-service' includeBuild './apps/testnorge-tp' includeBuild './apps/testnorge-statisk-data-forvalter' -includeBuild './apps/testnorge-bisys' includeBuild './apps/generer-arbeidsforhold-populasjon-service' includeBuild './apps/mn-synt-arbeidsforhold-service' includeBuild './apps/brreg-stub' From 5ad99007acf0899b9bb63b9fec20dd1e1f8d0449 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 19 Oct 2023 17:07:29 +0200 Subject: [PATCH 10/49] =?UTF-8?q?Oppdatert=20og=20fikset=20kj=C3=B8ring=20?= =?UTF-8?q?av=20feilende=20tester,=20refaktorert=20etter=20Java=2021,=20Gr?= =?UTF-8?q?adle=208.4=20og=20Spring=203.1.4=20migrering,=20mye=20oppdateri?= =?UTF-8?q?ng=20av=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/adresse-service/build.gradle | 16 +++-- apps/amelding-service/build.gradle | 14 +++-- .../config/SecurityConfig.java | 27 ++++---- .../ApplicationContextTest.java | 4 +- apps/app-tilgang-analyse-service/build.gradle | 14 +++-- apps/arbeidsforhold-export-api/build.gradle | 14 +++-- apps/arbeidsforhold-service/build.gradle | 16 +++-- apps/batch-bestilling-service/build.gradle | 14 +++-- apps/brreg-stub/build.gradle | 63 ++++++++++--------- apps/bruker-service/build.gradle | 14 +++-- apps/dolly-frontend/build.gradle | 10 ++- apps/dollystatus/build.gradle | 10 ++- apps/endringsmelding-frontend/build.gradle | 10 ++- apps/endringsmelding-service/build.gradle | 14 +++-- .../config/SecurityConfig.java | 30 +++++---- .../ApplicationContextTest.java | 4 +- apps/ereg-batch-status-service/build.gradle | 14 +++-- apps/faste-data-frontend/build.gradle | 10 ++- .../build.gradle | 14 +++-- apps/generer-navn-service/build.gradle | 14 +++-- .../build.gradle | 14 +++-- .../build.gradle | 14 +++-- .../geografiske-kodeverk-service/build.gradle | 14 +++-- apps/helsepersonell-service/build.gradle | 14 +++-- apps/hodejegeren/build.gradle | 16 +++-- apps/import-person-service/build.gradle | 14 +++-- .../config/SecurityConfig.java | 27 ++++---- .../ApplicationContextTest.java | 4 +- .../build.gradle | 16 +++-- apps/inntektsmelding-service/build.gradle | 14 +++-- .../jenkins-batch-status-service/build.gradle | 14 +++-- apps/joark-dokument-service/build.gradle | 14 +++-- apps/miljoer-service/build.gradle | 14 +++-- .../build.gradle | 14 +++-- .../build.gradle | 14 +++-- .../build.gradle | 14 +++-- .../build.gradle | 14 +++-- apps/organisasjon-forvalter/build.gradle | 12 ++-- apps/organisasjon-mottak-service/build.gradle | 12 ++-- apps/organisasjon-service/build.gradle | 8 ++- .../build.gradle | 10 ++- .../organisasjon-tilgang-service/build.gradle | 14 +++-- .../ApplicationContextTest.java | 4 +- apps/orgnummer-service/build.gradle | 14 +++-- apps/oversikt-frontend/build.gradle | 12 ++-- apps/pdl-forvalter/build.gradle | 8 ++- apps/person-export-api/build.gradle | 14 +++-- apps/person-faste-data-service/build.gradle | 14 +++-- .../config/SecurityConfig.java | 27 ++++---- .../ApplicationContextTest.java | 4 +- .../build.gradle | 12 ++-- .../config/SecurityConfig.java | 32 +++++----- .../ApplicationContextTest.java | 6 ++ apps/person-search-service/build.gradle | 14 +++-- apps/person-service/build.gradle | 12 ++-- apps/profil-api/build.gradle | 12 ++-- apps/sykemelding-api/build.gradle | 16 +++-- apps/synt-sykemelding-api/build.gradle | 12 ++-- .../build.gradle | 12 ++-- apps/testnav-ident-pool/build.gradle | 12 ++-- .../build.gradle | 14 +++-- apps/testnorge-tp/build.gradle | 12 ++-- apps/tilbakemelding-api/build.gradle | 14 +++-- apps/tps-messaging-service/build.gradle | 24 ++++--- apps/udi-stub/build.gradle | 14 +++-- apps/varslinger-service/build.gradle | 12 ++-- examples/reactive-rest-example/build.gradle | 12 ++-- .../config/SecurityConfig.java | 28 ++++----- mocks/maskinporten-mock/build.gradle | 12 ++-- mocks/tokendings-mock/build.gradle | 12 ++-- proxies/aareg-proxy/build.gradle | 5 +- .../proxies/aareg/ApplicationContextTest.java | 2 +- .../aareg-synt-services-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- proxies/arbeidsplassencv-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- proxies/arena-forvalteren-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- .../src/test/resources/application-test.yml | 7 +++ proxies/batch-adeo-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- proxies/brregstub-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- .../dokarkivproxy/ApplicationContextTest.java | 4 +- .../resources/application-test.properties | 3 - .../src/test/resources/application-test.yml | 10 +++ proxies/ereg-proxy/build.gradle | 10 ++- .../eregproxy/ApplicationContextTest.java | 4 +- proxies/histark-proxy/build.gradle | 10 ++- .../histarkproxy/ApplicationContextTest.java | 4 +- proxies/hodejegeren-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- proxies/inntektstub-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- proxies/inst-proxy/build.gradle | 10 ++- proxies/kodeverk-proxy/build.gradle | 10 ++- .../kodeverkproxy/ApplicationContextTest.java | 4 +- .../kontoregister-person-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- proxies/krrstub-proxy/build.gradle | 10 ++- .../krrstubproxy/ApplicationContextTest.java | 4 +- proxies/medl-proxy/build.gradle | 10 ++- .../medlproxy/ApplicationContextTest.java | 4 +- proxies/norg2-proxy/build.gradle | 10 ++- .../norg2proxy/ApplicationContextTest.java | 4 +- proxies/pdl-proxy/build.gradle | 10 ++- .../pdlproxy/ApplicationContextTest.java | 4 +- .../build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- .../src/test/resources/application-test.yml | 12 +++- proxies/saf-proxy/build.gradle | 10 ++- .../safproxy/ApplicationContextTest.java | 4 +- .../resources/application-test.properties | 3 - .../src/test/resources/application-test.yml | 12 ++++ proxies/sigrunstub-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- proxies/skjermingsregister-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- .../statisk-data-forvalter-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- .../synthdata-meldekort-proxy/build.gradle | 10 ++- .../ApplicationContextTest.java | 4 +- proxies/tps-forvalteren-proxy/build.gradle | 18 +++--- .../ApplicationContextTest.java | 5 ++ proxies/udistub-proxy/build.gradle | 10 ++- .../udistubproxy/ApplicationContextTest.java | 4 +- 126 files changed, 893 insertions(+), 524 deletions(-) create mode 100644 proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml delete mode 100644 proxies/dokarkiv-proxy/src/test/resources/application-test.properties create mode 100644 proxies/dokarkiv-proxy/src/test/resources/application-test.yml delete mode 100644 proxies/saf-proxy/src/test/resources/application-test.properties create mode 100644 proxies/saf-proxy/src/test/resources/application-test.yml diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index 9cca0f9ea83..e3bb51bc8f7 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -61,15 +61,15 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - + implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.aspectj:aspectjweaver:1.9.7' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -77,4 +77,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index cfafded651c..7b56e28fc31 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -71,9 +71,9 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' @@ -82,4 +82,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java b/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java index 06a2f9341cc..0cfa4bbf1a6 100644 --- a/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java +++ b/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java @@ -20,21 +20,20 @@ public class SecurityConfig { private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager; @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.csrf().disable() - .authorizeExchange() - .pathMatchers( - "/swagger**", + public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) { + return httpSecurity + .csrf(csrfSpec -> csrfSpec.disable()) + .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers( + "/internal/**", "/webjars/**", "/v3/api-docs/**", - "/internal/isReady", - "/internal/isAlive", - "/internal/metrics" - ).permitAll() - .anyExchange().authenticated() - .and() - .oauth2ResourceServer() - .jwt(spec -> spec.authenticationManager(jwtReactiveAuthenticationManager)) - .and().build(); + "/swagger-ui/**", + "/swagger", + "/error", + "/swagger-ui.html" + ).permitAll().anyExchange().authenticated()) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { + })) + .build(); } } diff --git a/apps/amelding-service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java b/apps/amelding-service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java index 3d3ca8474e7..e4adc58ffa0 100644 --- a/apps/amelding-service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java +++ b/apps/amelding-service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index aec4a61e37b..6f4c6ea8d32 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -68,9 +68,9 @@ dependencies { implementation 'org.flywaydb:flyway-core' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' @@ -79,4 +79,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/arbeidsforhold-export-api/build.gradle b/apps/arbeidsforhold-export-api/build.gradle index 13c4589931e..67cc0c78714 100644 --- a/apps/arbeidsforhold-export-api/build.gradle +++ b/apps/arbeidsforhold-export-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -70,12 +70,12 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.apache.commons:commons-csv:1.10.0' implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.4' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' runtimeOnly 'com.oracle.database.jdbc:ojdbc8' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -85,4 +85,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index fde23761709..88d5afaa511 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -58,7 +58,7 @@ dependencies { } implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' - implementation 'javax.activation:activation:1.1' + implementation 'javax.activation:activation:1.1.1' implementation 'org.glassfish.jaxb:jaxb-runtime' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' @@ -80,10 +80,10 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'javax.annotation:javax.annotation-api:1.3.2' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' @@ -94,4 +94,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index d07a8b9c172..263a06d8ce3 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -67,10 +67,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -80,4 +80,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index fffa148cc6f..0f0111cc9f7 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -1,10 +1,9 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id "uk.co.boothen.gradle.wsimport" version "0.17" - id 'com.ewerk.gradle.plugins.jaxb2' version '1.0.10' + id "uk.co.boothen.gradle.wsimport" version "0.21" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -56,26 +55,17 @@ wsimport { repositories { mavenCentral() + maven { url "https://github-package-registry-mirror.gc.nav.no/cached/maven-release" } + maven { url "https://build.shibboleth.net/maven/releases/" } mavenLocal() } -jaxb2 { - xjc { - 'hentroller' { - basePackage = 'no.nav.brregstub.tjenestekontrakter.hentroller' - schema = 'src/main/xsd/HentRoller.xsd' - } - } - xjc { - 'rolleutskrift' { - basePackage = 'no.nav.brregstub.tjenestekontrakter.rolleutskrift' - schema = 'src/main/xsd/Rolleutskrift.xsd' - } - } -} - dependencies { + implementation("io.dropwizard:dropwizard-jackson:4.0.2") { + exclude group: "com.google.code.findbugs" + } + implementation 'no.nav.testnav.libs:database' implementation 'no.nav.testnav.libs:servlet-core' @@ -91,13 +81,19 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'io.micrometer:micrometer-registry-prometheus' - jaxb2 'org.jvnet.jaxb2_commons:jaxb2-basics-runtime:1.11.1' - jaxb2 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:1.11.1' - jaxb2 'org.jvnet.jaxb2_commons:jaxb2-basics:1.11.1' - jaxb2 'com.sun.xml.bind:jaxb-core:2.2.11' - jaxb2 'com.sun.xml.bind:jaxb-xjc:2.2.11' - jaxb2 'com.sun.xml.bind:jaxb-impl:2.2.11' - jaxb2 'javax.xml.bind:jaxb-api:2.3.1' + + + implementation 'org.apache.cxf:cxf-rt-bindings-soap' + implementation 'org.apache.cxf:cxf-rt-ws-policy' + implementation 'org.apache.cxf:cxf-core' + implementation 'org.apache.cxf:cxf-rt-frontend-jaxws' + implementation 'org.apache.cxf:cxf-rt-transports-http' + implementation 'org.apache.cxf:cxf-rt-ws-security' + implementation 'jakarta.servlet:jakarta.servlet-api' + +// implementation 'javax.xml.ws:jaxws-api:2.3.1' +// implementation 'javax:javaee-api:8.0.1' +// implementation 'javax.jws:javax.jws-api:1.1' implementation 'org.postgresql:postgresql' implementation 'com.zaxxer:HikariCP' @@ -105,11 +101,14 @@ dependencies { implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' - implementation 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.5' implementation 'wsdl4j:wsdl4j:1.6.3' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-ui:1.6.9' - implementation 'no.nav.common:cxf:2.2021.11.10_07.34-c6f02734d4ab' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-ui:1.6.15' + + implementation 'no.nav.common:auth' + implementation 'no.nav.common:util' + implementation 'no.nav.common:cxf:3.2023.10.17_06.55-4e30d96bba05' + implementation 'com.h2database:h2' implementation 'jakarta.jws:jakarta.jws-api:3.0.0' @@ -121,4 +120,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index e862120cbc0..4bd5369ea5c 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -75,9 +75,9 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' implementation 'io.r2dbc:r2dbc-h2' @@ -100,4 +100,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle index 60b15712d42..ab2eb4e57e1 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java' id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -56,7 +56,11 @@ configurations { } } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} dependencies { implementation 'no.nav.testnav.libs:security-core' @@ -81,7 +85,7 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle index 145579b4f03..a143f42624f 100644 --- a/apps/dollystatus/build.gradle +++ b/apps/dollystatus/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -43,7 +43,11 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle index d39aa187344..49b19b632eb 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -78,7 +78,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -88,4 +88,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index 59719f97ae4..2cc022dd5a3 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -57,9 +57,9 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' @@ -68,4 +68,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/SecurityConfig.java b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/SecurityConfig.java index 0d70e58fd87..94a7c497213 100644 --- a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/SecurityConfig.java +++ b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/SecurityConfig.java @@ -2,6 +2,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; @@ -9,8 +10,6 @@ import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.web.server.SecurityWebFilterChain; -import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; - @Slf4j @Configuration @EnableWebFluxSecurity @@ -21,21 +20,20 @@ public class SecurityConfig { private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager; @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.csrf().disable() - .authorizeExchange() - .pathMatchers( - "/swagger-ui.html", + public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) { + return httpSecurity + .csrf(csrfSpec -> csrfSpec.disable()) + .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers( + "/internal/**", "/webjars/**", "/v3/api-docs/**", - "/internal/isReady", - "/internal/isAlive", - "/internal/metrics" - ).permitAll() - .anyExchange().authenticated() - .and() - .oauth2ResourceServer() - .jwt(spec -> spec.authenticationManager(jwtReactiveAuthenticationManager)) - .and().build(); + "/swagger-ui/**", + "/swagger", + "/error", + "/swagger-ui.html" + ).permitAll().anyExchange().authenticated()) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { + })) + .build(); } } diff --git a/apps/endringsmelding-service/src/test/java/no/nav/testnav/endringsmeldingservice/ApplicationContextTest.java b/apps/endringsmelding-service/src/test/java/no/nav/testnav/endringsmeldingservice/ApplicationContextTest.java index 9eb6744b5b4..6758326889b 100644 --- a/apps/endringsmelding-service/src/test/java/no/nav/testnav/endringsmeldingservice/ApplicationContextTest.java +++ b/apps/endringsmelding-service/src/test/java/no/nav/testnav/endringsmeldingservice/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder jwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index b25cf49b07c..3a1be419c17 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -65,10 +65,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -79,4 +79,8 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index f978721690f..4e01c3b67bf 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -78,7 +78,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -88,4 +88,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index dd282fee1e1..cd7af023009 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -65,9 +65,9 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -77,4 +77,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index b6cd49d463c..b7f284be411 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -63,10 +63,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -76,4 +76,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index 80f27eea971..031b4f63a63 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -83,9 +83,9 @@ dependencies { implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.postgresql:postgresql' @@ -97,4 +97,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index 2fa6a936ab4..b790e8ddd0e 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -59,10 +59,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -72,4 +72,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/geografiske-kodeverk-service/build.gradle b/apps/geografiske-kodeverk-service/build.gradle index dc8a0a1e7d3..73b7e394fc1 100644 --- a/apps/geografiske-kodeverk-service/build.gradle +++ b/apps/geografiske-kodeverk-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -64,10 +64,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.projectlombok:lombok' @@ -80,4 +80,8 @@ dependencies { } description = 'geografiske-kodeverk-service' -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index de133453614..c0d63451a3d 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -63,10 +63,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -76,4 +76,8 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 \ No newline at end of file +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} \ No newline at end of file diff --git a/apps/hodejegeren/build.gradle b/apps/hodejegeren/build.gradle index 29923cef07c..d705d72454e 100644 --- a/apps/hodejegeren/build.gradle +++ b/apps/hodejegeren/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -68,14 +68,14 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'com.jayway.jsonpath:json-path:2.6.0' + implementation 'com.jayway.jsonpath:json-path:2.7.0' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' implementation 'org.aspectj:aspectjweaver:1.9.7' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'no.nav.registre:testnorge-consumers:1.12.0-RELEASE' implementation 'com.google.guava:guava:31.0.1-jre' @@ -90,4 +90,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/import-person-service/build.gradle b/apps/import-person-service/build.gradle index 59b1aa10785..5c5c42ef204 100644 --- a/apps/import-person-service/build.gradle +++ b/apps/import-person-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -71,9 +71,9 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' @@ -82,4 +82,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/SecurityConfig.java b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/SecurityConfig.java index 59f412251f0..f6242ce5f61 100644 --- a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/SecurityConfig.java +++ b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/SecurityConfig.java @@ -22,21 +22,22 @@ public class SecurityConfig { private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager; @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.csrf().disable() - .authorizeExchange() - .pathMatchers( - "/swagger-ui.html", + public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) { + return httpSecurity + .csrf(csrfSpec -> csrfSpec.disable()) + .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers( + "/internal/**", "/webjars/**", + "/swagger-resources/**", "/v3/api-docs/**", - "/internal/isReady", - "/internal/isAlive" - ).permitAll() - .anyExchange().authenticated() - .and() - .oauth2ResourceServer() - .jwt(spec -> spec.authenticationManager(jwtReactiveAuthenticationManager)) - .and().build(); + "/swagger-ui/**", + "/swagger", + "/error", + "/swagger-ui.html" + ).permitAll().anyExchange().authenticated()) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { + })) + .build(); } } diff --git a/apps/import-person-service/src/test/java/no/nav/testnav/apps/importpersonservice/ApplicationContextTest.java b/apps/import-person-service/src/test/java/no/nav/testnav/apps/importpersonservice/ApplicationContextTest.java index 71418c84b71..72bd24c2a7b 100644 --- a/apps/import-person-service/src/test/java/no/nav/testnav/apps/importpersonservice/ApplicationContextTest.java +++ b/apps/import-person-service/src/test/java/no/nav/testnav/apps/importpersonservice/ApplicationContextTest.java @@ -3,13 +3,13 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; @SpringBootTest public class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder jwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index b23621f89ee..5467e18022e 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -59,21 +59,21 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' implementation 'org.aspectj:aspectjweaver:1.9.7' implementation 'javax.xml.bind:jaxb-api:2.3.1' implementation 'javax.json.bind:javax.json.bind-api:1.0' - implementation 'javax.activation:activation:1.1' + implementation 'javax.activation:activation:1.1.1' implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.8' implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' implementation 'org.apache.commons:commons-text:1.10.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.08.16-13.46-35cbdfd492d4' @@ -84,4 +84,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index b7091a02eea..800a23e507d 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -64,8 +64,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.aspectj:aspectjweaver:1.9.7' @@ -74,7 +74,7 @@ dependencies { implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.08.16-13.46-35cbdfd492d4' implementation 'org.apache.commons:commons-io:1.3.2' @@ -94,4 +94,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index ed5ace02693..3492add236c 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -67,10 +67,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -80,4 +80,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index 4e4635f0134..48a30b6d2b6 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -64,10 +64,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -77,4 +77,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index a2c98325fe5..6fe3cff5003 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -65,10 +65,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -78,4 +78,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/mn-synt-arbeidsforhold-service/build.gradle b/apps/mn-synt-arbeidsforhold-service/build.gradle index bb47e9f57c5..1e44dcfcb22 100644 --- a/apps/mn-synt-arbeidsforhold-service/build.gradle +++ b/apps/mn-synt-arbeidsforhold-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -75,9 +75,9 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' @@ -88,4 +88,8 @@ dependencies { } description = 'mn-synt-arbeidsforhold-service' -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 92cc79defb2..b2084bedec4 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -88,13 +88,13 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springframework.kafka:spring-kafka' implementation 'org.apache.kafka:kafka-clients:7.0.0-ce' implementation 'io.confluent:kafka-avro-serializer:7.3.2' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.4' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' implementation 'org.hibernate.validator:hibernate-validator' implementation 'no.nav.freg:freg-security-oidc:2c24d35d' @@ -106,4 +106,8 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index 5b27c04a78b..e99d498f3c3 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -75,9 +75,9 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' @@ -87,4 +87,8 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index 06727b6d1b5..e240141cb3e 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -82,9 +82,9 @@ dependencies { implementation 'com.h2database:h2' implementation 'org.postgresql:postgresql' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' implementation 'org.hibernate.validator:hibernate-validator' @@ -95,4 +95,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index 377a175af7a..3fd67aed5d1 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -56,7 +56,11 @@ repositories { } } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} dependencies { @@ -86,8 +90,8 @@ dependencies { implementation 'org.postgresql:postgresql' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'ma.glasnost.orika:orika-core:1.5.4' diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index 29bc489013c..4721739e7b6 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -79,8 +79,8 @@ dependencies { implementation 'org.apache.kafka:kafka-clients:3.4.0' implementation 'io.confluent:kafka-avro-serializer:7.3.2' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' @@ -89,4 +89,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index 604fe0d0d3c..9aab3c26cc7 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -80,4 +80,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index 5d447d47f12..16cf949b27a 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -73,7 +73,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'net.logstash.logback:logstash-logback-encoder:6.6' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -83,4 +83,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index 6d1310cd669..a24115e95ec 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -32,7 +32,11 @@ sonarqube { } } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} bootJar { archiveFileName = "app.jar" @@ -68,9 +72,9 @@ dependencies { implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/organisasjontilgangservice/ApplicationContextTest.java b/apps/organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/organisasjontilgangservice/ApplicationContextTest.java index 39fb48d354b..83743843260 100644 --- a/apps/organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/organisasjontilgangservice/ApplicationContextTest.java +++ b/apps/organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/organisasjontilgangservice/ApplicationContextTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -13,7 +13,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder jwtDecoder; @MockBean public MapperFacade mapperFacade; diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index 20aaafe4cb7..5c5d9999502 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -75,9 +75,9 @@ dependencies { implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.4' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.10' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.postgresql:postgresql' @@ -88,4 +88,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index 797cf90c4f3..de827f2c32b 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -70,8 +70,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -81,4 +81,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index 5fe336d564b..7c80558360b 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -55,7 +55,11 @@ repositories { } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} dependencies { diff --git a/apps/person-export-api/build.gradle b/apps/person-export-api/build.gradle index 415a51d2d3f..16aba6a935e 100644 --- a/apps/person-export-api/build.gradle +++ b/apps/person-export-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -69,9 +69,9 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -81,4 +81,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index e0b5a269fbe..79e39ba95d7 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -69,10 +69,10 @@ dependencies { implementation 'com.zaxxer:HikariCP' implementation 'org.postgresql:postgresql' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -82,4 +82,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/SecurityConfig.java b/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/SecurityConfig.java index d08079c1caa..e97acf87827 100644 --- a/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/SecurityConfig.java +++ b/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/SecurityConfig.java @@ -19,21 +19,20 @@ public class SecurityConfig { private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager; @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.csrf().disable() - .authorizeExchange() - .pathMatchers( - "/swagger**", + public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) { + return httpSecurity + .csrf(csrfSpec -> csrfSpec.disable()) + .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers( + "/internal/**", "/webjars/**", "/v3/api-docs/**", - "/internal/isReady", - "/internal/isAlive", - "/internal/metrics" - ).permitAll() - .anyExchange().authenticated() - .and() - .oauth2ResourceServer() - .jwt(spec -> spec.authenticationManager(jwtReactiveAuthenticationManager)) - .and().build(); + "/swagger-ui/**", + "/swagger", + "/error", + "/swagger-ui.html" + ).permitAll().anyExchange().authenticated()) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { + })) + .build(); } } diff --git a/apps/person-faste-data-service/src/test/java/no/nav/testnav/personfastedataservice/ApplicationContextTest.java b/apps/person-faste-data-service/src/test/java/no/nav/testnav/personfastedataservice/ApplicationContextTest.java index efea637079a..cb9ba64e65d 100644 --- a/apps/person-faste-data-service/src/test/java/no/nav/testnav/personfastedataservice/ApplicationContextTest.java +++ b/apps/person-faste-data-service/src/test/java/no/nav/testnav/personfastedataservice/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder jwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index 9d4eb5f5671..e73436cf41f 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -43,7 +43,11 @@ sonarqube { } } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} bootJar { archiveFileName = "app.jar" @@ -73,8 +77,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2' diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java index 4fda16a095d..f08c361c85a 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java +++ b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java @@ -2,6 +2,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; @@ -9,8 +10,6 @@ import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.web.server.SecurityWebFilterChain; -import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; - @Slf4j @Configuration @@ -22,22 +21,21 @@ public class SecurityConfig { private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager; @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.csrf().disable() - .authorizeExchange() - .pathMatchers( - "/swagger-ui.html", + public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) { + return httpSecurity + .csrf(csrfSpec -> csrfSpec.disable()) + .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers( + "/internal/**", "/webjars/**", + "/swagger-resources/**", "/v3/api-docs/**", - "/internal/metrics", - "/internal/isReady", - "/internal/isAlive" - ).permitAll() - .anyExchange().authenticated() - .and() - .oauth2ResourceServer() - .jwt(spec -> spec.authenticationManager(jwtReactiveAuthenticationManager)) - .and().build(); + "/swagger-ui/**", + "/swagger", + "/error", + "/swagger-ui.html" + ).permitAll().anyExchange().authenticated()) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { + })) + .build(); } - } diff --git a/apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/ApplicationContextTest.java b/apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/ApplicationContextTest.java index b797210dece..384f37ebae5 100644 --- a/apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/ApplicationContextTest.java +++ b/apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/ApplicationContextTest.java @@ -2,11 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { + + @MockBean + public ReactiveJwtDecoder jwtDecoder; + @Test @SuppressWarnings("java:S2699") void load_app_context() { diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index 8365ae63b3f..dcc3c354aca 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -44,7 +44,11 @@ dependencyManagement { } } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} repositories { mavenCentral() @@ -60,7 +64,7 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' - implementation 'org.elasticsearch:elasticsearch:7.17.9' + implementation 'org.elasticsearch:elasticsearch:8.6.2' implementation 'org.springframework.boot:spring-boot-starter-security' @@ -78,8 +82,8 @@ dependencies { implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index f374757e2be..ed874b4c1b4 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -42,7 +42,11 @@ dependencyManagement { } } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} repositories { mavenCentral() @@ -71,10 +75,10 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index 1aca8db3727..34ca325cef8 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -68,8 +68,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.projectlombok:lombok' @@ -81,4 +81,8 @@ dependencies { } description = 'profil-api' -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index c4312b59fda..31deb5ce600 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -75,14 +75,14 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.0.3' implementation 'org.springframework.kafka:spring-kafka' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' - implementation 'jakarta.activation:jakarta.activation-api:2.1.1' + implementation 'jakarta.activation:jakarta.activation-api:2.1.2' implementation 'org.glassfish.jaxb:jaxb-runtime' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' @@ -98,4 +98,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index bcb237ff01f..f73cd9fc465 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -68,8 +68,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'no.nav.testnav.libs:testing' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -81,4 +81,8 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 0e69a00b0fe..c09ea723944 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -47,7 +47,11 @@ repositories { mavenLocal() } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} dependencies { implementation 'no.nav.testnav.libs:servlet-core' @@ -67,8 +71,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' implementation 'com.google.guava:guava:31.0.1-jre' diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index fcacd42ef8a..30ddcbdda9b 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -65,7 +65,11 @@ repositories { } } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} dependencies { implementation 'no.nav.testnav.libs:security-core' @@ -97,8 +101,8 @@ dependencies { implementation 'org.postgresql:postgresql' implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index 7c253531428..5d8dcc6efd9 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -81,7 +81,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.aspectj:aspectjweaver:1.9.19' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.postgresql:postgresql' implementation 'com.zaxxer:HikariCP' @@ -91,8 +91,8 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' implementation 'com.squareup.okhttp3:okhttp:4.9.3' implementation 'org.projectlombok:lombok' @@ -107,4 +107,8 @@ dependencies { } description = 'testnorge-statisk-data-forvalter' -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/testnorge-tp/build.gradle b/apps/testnorge-tp/build.gradle index 0abfd6e48fb..362799e7848 100644 --- a/apps/testnorge-tp/build.gradle +++ b/apps/testnorge-tp/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -63,9 +63,9 @@ dependencies { implementation 'jakarta.validation:jakarta.validation-api:3.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' @@ -77,4 +77,8 @@ dependencies { } description = 'testnorge-tp' -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index 07d4ad79aaa..4a2e5d87e65 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -61,10 +61,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' @@ -72,7 +72,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.reactivestreams:reactive-streams:1.0.3' + implementation 'org.reactivestreams:reactive-streams:1.0.4' implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' @@ -83,4 +83,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index 8decc9587e8..0c5ae6b0bc0 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -44,7 +44,11 @@ dependencyManagement { } } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} repositories { mavenLocal() @@ -79,12 +83,12 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-databind' - implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.0.2' - implementation 'com.ibm.icu:icu4j:70.1' + implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.0.3' + implementation 'com.ibm.icu:icu4j:72.1' implementation 'javax.xml.bind:jaxb-api:2.3.1' implementation 'javax.json.bind:javax.json.bind-api:1.0' - implementation 'javax.activation:activation:1.1' + implementation 'javax.activation:activation:1.1.1' implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.0' implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1' implementation 'org.glassfish.jaxb:jaxb-runtime' @@ -100,12 +104,12 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.aspectj:aspectjweaver:1.9.7' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' testImplementation 'org.springframework.boot:spring-boot-starter-test' - implementation 'org.projectlombok:lombok:1.18.22' - annotationProcessor 'org.projectlombok:lombok:1.18.22' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' + implementation 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index 5b6bdc4c50f..e8574181e22 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -3,7 +3,7 @@ plugins { id 'java' id "uk.co.boothen.gradle.wsimport" version "0.18" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -54,7 +54,11 @@ bootJar { archiveFileName = "app.jar" } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} repositories { mavenCentral() @@ -70,7 +74,7 @@ repositories { } dependencies { - implementation platform('org.testcontainers:testcontainers-bom:1.17.6') + implementation platform('org.testcontainers:testcontainers-bom:1.19.1') implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' @@ -96,8 +100,8 @@ dependencies { implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'com.h2database:h2' diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index ab9bc910164..cafa62cf711 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -78,8 +78,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' @@ -97,4 +97,8 @@ dependencies { } description = 'varslinger-service' -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index 4ed58a239ad..d1eee8636ef 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -66,12 +66,16 @@ dependencies { runtimeOnly 'org.postgresql:postgresql' runtimeOnly 'com.h2database:h2' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/SecurityConfig.java b/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/SecurityConfig.java index 6e42c3e522f..d0b8bd90815 100644 --- a/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/SecurityConfig.java +++ b/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/SecurityConfig.java @@ -22,21 +22,21 @@ public class SecurityConfig { private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager; @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.csrf().disable() - .authorizeExchange() - .pathMatchers( - "/swagger-ui.html", + public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) { + return httpSecurity + .csrf(csrfSpec -> csrfSpec.disable()) + .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers( + "/internal/**", "/webjars/**", + "/swagger-resources/**", "/v3/api-docs/**", - "/internal/isReady", - "/internal/isAlive" - ).permitAll() - .anyExchange().authenticated() - .and() - .oauth2ResourceServer() - .jwt(spec -> spec.authenticationManager(jwtReactiveAuthenticationManager)) - .and().build(); + "/swagger-ui/**", + "/swagger", + "/error", + "/swagger-ui.html" + ).permitAll().anyExchange().authenticated()) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { + })) + .build(); } - } diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index 9263548a684..59b4e7ffcd9 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" } bootJar { @@ -25,7 +25,7 @@ repositories { } dependencies { - implementation 'com.auth0:java-jwt:3.18.2' + implementation 'com.auth0:java-jwt:4.3.0' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' @@ -33,7 +33,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' @@ -41,4 +41,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index ba03c2446f4..2cc6860008a 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" } bootJar { @@ -25,7 +25,7 @@ repositories { } dependencies { - implementation 'com.auth0:java-jwt:3.18.2' + implementation 'com.auth0:java-jwt:4.3.0' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' @@ -34,11 +34,15 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.2' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index b2c4ecf0f20..803112cbebf 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -1,5 +1,4 @@ plugins { - id "io.freefair.lombok" version "6.6.2" id 'io.spring.dependency-management' version "1.1.3" id 'java' id "org.sonarqube" version "4.0.0.2929" @@ -68,6 +67,10 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' + + implementation 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' } java { diff --git a/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java b/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java index 1d1d3cee347..5176a12c1cc 100644 --- a/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java +++ b/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index 18f35d0f551..5901ec36a18 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -57,10 +57,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/aareg-synt-services-proxy/src/test/java/no/nav/testnav/proxies/aaregsyntservicesproxy/ApplicationContextTest.java b/proxies/aareg-synt-services-proxy/src/test/java/no/nav/testnav/proxies/aaregsyntservicesproxy/ApplicationContextTest.java index 0939947acd0..0d60d68e6a1 100644 --- a/proxies/aareg-synt-services-proxy/src/test/java/no/nav/testnav/proxies/aaregsyntservicesproxy/ApplicationContextTest.java +++ b/proxies/aareg-synt-services-proxy/src/test/java/no/nav/testnav/proxies/aaregsyntservicesproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index b94523dbcc6..4216c45427b 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -60,7 +60,7 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -70,4 +70,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/arbeidsplassencv-proxy/src/test/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ApplicationContextTest.java b/proxies/arbeidsplassencv-proxy/src/test/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ApplicationContextTest.java index ee47499d089..e298bf9d286 100644 --- a/proxies/arbeidsplassencv-proxy/src/test/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ApplicationContextTest.java +++ b/proxies/arbeidsplassencv-proxy/src/test/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 4a9ff2d6f82..037ee378ff2 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -3,7 +3,7 @@ plugins { id "io.freefair.lombok" version "6.6.2" id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -62,10 +62,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/arena-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/arenaforvalterenproxy/ApplicationContextTest.java b/proxies/arena-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/arenaforvalterenproxy/ApplicationContextTest.java index 84534c02f55..d0be63d3175 100644 --- a/proxies/arena-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/arenaforvalterenproxy/ApplicationContextTest.java +++ b/proxies/arena-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/arenaforvalterenproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml b/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml new file mode 100644 index 00000000000..8f6f189803a --- /dev/null +++ b/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +app: + arena: + services: + name: arena-dummy + namespace: teamarenanais + url: http://arena-dummy.dummy.no + cluster: dev-fss \ No newline at end of file diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index 6541d7010c4..280a6725cc7 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -58,10 +58,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/batch-adeo-proxy/src/test/java/no/nav/testnav/proxies/batchadeoproxy/ApplicationContextTest.java b/proxies/batch-adeo-proxy/src/test/java/no/nav/testnav/proxies/batchadeoproxy/ApplicationContextTest.java index 06c97772f25..f97a1fa72b0 100644 --- a/proxies/batch-adeo-proxy/src/test/java/no/nav/testnav/proxies/batchadeoproxy/ApplicationContextTest.java +++ b/proxies/batch-adeo-proxy/src/test/java/no/nav/testnav/proxies/batchadeoproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index 07708f1e5bd..7a1f8d002c3 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -60,10 +60,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/brregstub-proxy/src/test/java/no/nav/testnav/proxies/brregstubproxy/ApplicationContextTest.java b/proxies/brregstub-proxy/src/test/java/no/nav/testnav/proxies/brregstubproxy/ApplicationContextTest.java index c73c2d4cc33..31522587432 100644 --- a/proxies/brregstub-proxy/src/test/java/no/nav/testnav/proxies/brregstubproxy/ApplicationContextTest.java +++ b/proxies/brregstub-proxy/src/test/java/no/nav/testnav/proxies/brregstubproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/dokarkiv-proxy/src/test/java/no/nav/testnav/proxies/dokarkivproxy/ApplicationContextTest.java b/proxies/dokarkiv-proxy/src/test/java/no/nav/testnav/proxies/dokarkivproxy/ApplicationContextTest.java index c435c161911..ce2d7e64245 100644 --- a/proxies/dokarkiv-proxy/src/test/java/no/nav/testnav/proxies/dokarkivproxy/ApplicationContextTest.java +++ b/proxies/dokarkiv-proxy/src/test/java/no/nav/testnav/proxies/dokarkivproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/dokarkiv-proxy/src/test/resources/application-test.properties b/proxies/dokarkiv-proxy/src/test/resources/application-test.properties deleted file mode 100644 index f44e7773252..00000000000 --- a/proxies/dokarkiv-proxy/src/test/resources/application-test.properties +++ /dev/null @@ -1,3 +0,0 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file diff --git a/proxies/dokarkiv-proxy/src/test/resources/application-test.yml b/proxies/dokarkiv-proxy/src/test/resources/application-test.yml new file mode 100644 index 00000000000..fb5da8c5127 --- /dev/null +++ b/proxies/dokarkiv-proxy/src/test/resources/application-test.yml @@ -0,0 +1,10 @@ +spring.cloud.vault.token: dummy +azure.app.client.id: dummy +azure.app.client.secret: dummy + +consumers: + dokarkiv: + url: http://dokarkiv-dummy.dummy.no + cluster: dev-fss + name: dokarkiv-dummy + namespace: dummy diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index b7885b6af90..72b1b082259 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -60,10 +60,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/ereg-proxy/src/test/java/no/nav/testnav/proxies/eregproxy/ApplicationContextTest.java b/proxies/ereg-proxy/src/test/java/no/nav/testnav/proxies/eregproxy/ApplicationContextTest.java index 718e5a44a75..81d83bf9188 100644 --- a/proxies/ereg-proxy/src/test/java/no/nav/testnav/proxies/eregproxy/ApplicationContextTest.java +++ b/proxies/ereg-proxy/src/test/java/no/nav/testnav/proxies/eregproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index 90fb897e377..1d5af9ca7f7 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -60,10 +60,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/histark-proxy/src/test/java/no/nav/testnav/proxies/histarkproxy/ApplicationContextTest.java b/proxies/histark-proxy/src/test/java/no/nav/testnav/proxies/histarkproxy/ApplicationContextTest.java index 1c7fa9c6f7e..28f402e674a 100644 --- a/proxies/histark-proxy/src/test/java/no/nav/testnav/proxies/histarkproxy/ApplicationContextTest.java +++ b/proxies/histark-proxy/src/test/java/no/nav/testnav/proxies/histarkproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/hodejegeren-proxy/build.gradle b/proxies/hodejegeren-proxy/build.gradle index 23cd57f51ea..d75e596c6b7 100644 --- a/proxies/hodejegeren-proxy/build.gradle +++ b/proxies/hodejegeren-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -61,10 +61,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/hodejegeren-proxy/src/test/java/no/nav/testnav/proxies/hodejegerenproxy/ApplicationContextTest.java b/proxies/hodejegeren-proxy/src/test/java/no/nav/testnav/proxies/hodejegerenproxy/ApplicationContextTest.java index c0aad6a2fb6..140c6860183 100644 --- a/proxies/hodejegeren-proxy/src/test/java/no/nav/testnav/proxies/hodejegerenproxy/ApplicationContextTest.java +++ b/proxies/hodejegeren-proxy/src/test/java/no/nav/testnav/proxies/hodejegerenproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index 4d9eac714aa..6662fd56e8b 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -60,10 +60,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/inntektstub-proxy/src/test/java/no/nav/testnav/proxies/inntektstubproxy/ApplicationContextTest.java b/proxies/inntektstub-proxy/src/test/java/no/nav/testnav/proxies/inntektstubproxy/ApplicationContextTest.java index 20068083256..e4dfcea39ef 100644 --- a/proxies/inntektstub-proxy/src/test/java/no/nav/testnav/proxies/inntektstubproxy/ApplicationContextTest.java +++ b/proxies/inntektstub-proxy/src/test/java/no/nav/testnav/proxies/inntektstubproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index bb3d01a57ed..66876700c2a 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -60,11 +60,15 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 \ No newline at end of file +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} \ No newline at end of file diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle index a45ccba211d..b4a5df2219d 100644 --- a/proxies/kodeverk-proxy/build.gradle +++ b/proxies/kodeverk-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -61,10 +61,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/kodeverk-proxy/src/test/java/no/nav/testnav/proxies/kodeverkproxy/ApplicationContextTest.java b/proxies/kodeverk-proxy/src/test/java/no/nav/testnav/proxies/kodeverkproxy/ApplicationContextTest.java index 9fd3c6090b2..9697893ce69 100644 --- a/proxies/kodeverk-proxy/src/test/java/no/nav/testnav/proxies/kodeverkproxy/ApplicationContextTest.java +++ b/proxies/kodeverk-proxy/src/test/java/no/nav/testnav/proxies/kodeverkproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index e53818c2614..ae109ad3f9b 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -62,10 +62,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/kontoregister-person-proxy/src/test/java/no/nav/testnav/proxies/kontoregisterperson/ApplicationContextTest.java b/proxies/kontoregister-person-proxy/src/test/java/no/nav/testnav/proxies/kontoregisterperson/ApplicationContextTest.java index eb7bff1a954..11008df6b6b 100644 --- a/proxies/kontoregister-person-proxy/src/test/java/no/nav/testnav/proxies/kontoregisterperson/ApplicationContextTest.java +++ b/proxies/kontoregister-person-proxy/src/test/java/no/nav/testnav/proxies/kontoregisterperson/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index 427b17ca70a..49b0120b22d 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -61,10 +61,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/krrstub-proxy/src/test/java/no/nav/testnav/proxies/krrstubproxy/ApplicationContextTest.java b/proxies/krrstub-proxy/src/test/java/no/nav/testnav/proxies/krrstubproxy/ApplicationContextTest.java index aa2064dcc2a..0a432023ceb 100644 --- a/proxies/krrstub-proxy/src/test/java/no/nav/testnav/proxies/krrstubproxy/ApplicationContextTest.java +++ b/proxies/krrstub-proxy/src/test/java/no/nav/testnav/proxies/krrstubproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 2d623139d1f..3f2830e4e64 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -61,10 +61,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/medl-proxy/src/test/java/no/nav/testnav/proxies/medlproxy/ApplicationContextTest.java b/proxies/medl-proxy/src/test/java/no/nav/testnav/proxies/medlproxy/ApplicationContextTest.java index cecbfb05b57..5b5208ebcd7 100644 --- a/proxies/medl-proxy/src/test/java/no/nav/testnav/proxies/medlproxy/ApplicationContextTest.java +++ b/proxies/medl-proxy/src/test/java/no/nav/testnav/proxies/medlproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index 7189ffd0a8e..68b9fac5db6 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -54,10 +54,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/norg2-proxy/src/test/java/no/nav/testnav/proxies/norg2proxy/ApplicationContextTest.java b/proxies/norg2-proxy/src/test/java/no/nav/testnav/proxies/norg2proxy/ApplicationContextTest.java index a240c926296..ad2d5ff7389 100644 --- a/proxies/norg2-proxy/src/test/java/no/nav/testnav/proxies/norg2proxy/ApplicationContextTest.java +++ b/proxies/norg2-proxy/src/test/java/no/nav/testnav/proxies/norg2proxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index 52a41fa6eaf..a6f748658c8 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -62,10 +62,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/pdl-proxy/src/test/java/no/nav/testnav/proxies/pdlproxy/ApplicationContextTest.java b/proxies/pdl-proxy/src/test/java/no/nav/testnav/proxies/pdlproxy/ApplicationContextTest.java index 8d9cee3f943..e7c3a307cba 100644 --- a/proxies/pdl-proxy/src/test/java/no/nav/testnav/proxies/pdlproxy/ApplicationContextTest.java +++ b/proxies/pdl-proxy/src/test/java/no/nav/testnav/proxies/pdlproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - private JwtDecoder jwtDecoder; + private ReactiveJwtDecoder jwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index 67bb1dc0f3f..cad2b347def 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -3,7 +3,7 @@ plugins { id "io.freefair.lombok" version "6.6.2" id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -63,10 +63,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/pensjon-testdata-facade-proxy/src/test/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/ApplicationContextTest.java b/proxies/pensjon-testdata-facade-proxy/src/test/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/ApplicationContextTest.java index ee0cec23b4e..ec19c494775 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/test/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/ApplicationContextTest.java +++ b/proxies/pensjon-testdata-facade-proxy/src/test/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml b/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml index 45a7f438eb7..adff1d7e5c1 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml +++ b/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml @@ -1 +1,11 @@ -azure.app.client.id: dummy \ No newline at end of file +azure.app.client.id: dummy + +consumers: + popp-testdata: + name: popp-dummy + namespace: dummy + url: https://popp-dummy.dummy.no + samboer-testdata: + name: pensjon-dummy + namespace: dummy + url: https://pensjon-dummy.dummy.no diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index 9571e855891..8710643120b 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -62,10 +62,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/saf-proxy/src/test/java/no/nav/testnav/proxies/safproxy/ApplicationContextTest.java b/proxies/saf-proxy/src/test/java/no/nav/testnav/proxies/safproxy/ApplicationContextTest.java index 719a09b81de..b589621f621 100644 --- a/proxies/saf-proxy/src/test/java/no/nav/testnav/proxies/safproxy/ApplicationContextTest.java +++ b/proxies/saf-proxy/src/test/java/no/nav/testnav/proxies/safproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/saf-proxy/src/test/resources/application-test.properties b/proxies/saf-proxy/src/test/resources/application-test.properties deleted file mode 100644 index d5e2f0d4b4d..00000000000 --- a/proxies/saf-proxy/src/test/resources/application-test.properties +++ /dev/null @@ -1,3 +0,0 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy diff --git a/proxies/saf-proxy/src/test/resources/application-test.yml b/proxies/saf-proxy/src/test/resources/application-test.yml new file mode 100644 index 00000000000..a5f9b6a19d2 --- /dev/null +++ b/proxies/saf-proxy/src/test/resources/application-test.yml @@ -0,0 +1,12 @@ +azure.app.client.id: dummy +azure.app.client.secret: dummy +consumers: + saf: + url: http://saf-dummy.dummy.no + cluster: dev-fss + name: saf-dummy + namespace: dummy +spring: + cloud: + vault: + enabled: false diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index 8559cb48b63..8961bf348d4 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -59,10 +59,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/sigrunstub-proxy/src/test/java/no/nav/testnav/proxies/sigrunstubproxy/ApplicationContextTest.java b/proxies/sigrunstub-proxy/src/test/java/no/nav/testnav/proxies/sigrunstubproxy/ApplicationContextTest.java index c7e7bcebaaf..2199cc1f682 100644 --- a/proxies/sigrunstub-proxy/src/test/java/no/nav/testnav/proxies/sigrunstubproxy/ApplicationContextTest.java +++ b/proxies/sigrunstub-proxy/src/test/java/no/nav/testnav/proxies/sigrunstubproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index a739f303a24..b4e2d4f8539 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -63,10 +63,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/ApplicationContextTest.java b/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/ApplicationContextTest.java index 9db0e294d49..9c83fa6454c 100644 --- a/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/ApplicationContextTest.java +++ b/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/statisk-data-forvalter-proxy/build.gradle b/proxies/statisk-data-forvalter-proxy/build.gradle index cfa4463b29f..aed1fd224a4 100644 --- a/proxies/statisk-data-forvalter-proxy/build.gradle +++ b/proxies/statisk-data-forvalter-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -63,10 +63,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/statisk-data-forvalter-proxy/src/test/java/no/nav/testnav/proxies/statiskdataforvalterproxy/ApplicationContextTest.java b/proxies/statisk-data-forvalter-proxy/src/test/java/no/nav/testnav/proxies/statiskdataforvalterproxy/ApplicationContextTest.java index 310ec019962..a5a3818f74a 100644 --- a/proxies/statisk-data-forvalter-proxy/src/test/java/no/nav/testnav/proxies/statiskdataforvalterproxy/ApplicationContextTest.java +++ b/proxies/statisk-data-forvalter-proxy/src/test/java/no/nav/testnav/proxies/statiskdataforvalterproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index ed68cba3329..6e6c5603b08 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -67,10 +67,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 \ No newline at end of file +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} \ No newline at end of file diff --git a/proxies/synthdata-meldekort-proxy/src/test/java/no/nav/testnav/proxies/synthdatameldekortproxy/ApplicationContextTest.java b/proxies/synthdata-meldekort-proxy/src/test/java/no/nav/testnav/proxies/synthdatameldekortproxy/ApplicationContextTest.java index b586f1abf1d..02588100eb7 100644 --- a/proxies/synthdata-meldekort-proxy/src/test/java/no/nav/testnav/proxies/synthdatameldekortproxy/ApplicationContextTest.java +++ b/proxies/synthdata-meldekort-proxy/src/test/java/no/nav/testnav/proxies/synthdatameldekortproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") diff --git a/proxies/tps-forvalteren-proxy/build.gradle b/proxies/tps-forvalteren-proxy/build.gradle index 4152475dc49..aea79ee5f51 100644 --- a/proxies/tps-forvalteren-proxy/build.gradle +++ b/proxies/tps-forvalteren-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -48,7 +48,11 @@ repositories { mavenLocal() } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} dependencies { @@ -61,15 +65,15 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - implementation 'org.projectlombok:lombok:1.18.22' - annotationProcessor 'org.projectlombok:lombok:1.18.22' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' + implementation 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/proxies/tps-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/tpsforvalterenproxy/ApplicationContextTest.java b/proxies/tps-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/tpsforvalterenproxy/ApplicationContextTest.java index 8f90f670ece..c2851465342 100644 --- a/proxies/tps-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/tpsforvalterenproxy/ApplicationContextTest.java +++ b/proxies/tps-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/tpsforvalterenproxy/ApplicationContextTest.java @@ -2,12 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { + @MockBean + public ReactiveJwtDecoder jwtDecoder; + @Test @SuppressWarnings("java:S2699") void load_app_context() { diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index 22c3c6ecce0..941365c9eac 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.0" + id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -63,10 +63,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } -java.sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/proxies/udistub-proxy/src/test/java/no/nav/testnav/proxies/udistubproxy/ApplicationContextTest.java b/proxies/udistub-proxy/src/test/java/no/nav/testnav/proxies/udistubproxy/ApplicationContextTest.java index 3d8836da464..312111e0f7a 100644 --- a/proxies/udistub-proxy/src/test/java/no/nav/testnav/proxies/udistubproxy/ApplicationContextTest.java +++ b/proxies/udistub-proxy/src/test/java/no/nav/testnav/proxies/udistubproxy/ApplicationContextTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; @SpringBootTest @@ -11,7 +11,7 @@ class ApplicationContextTest { @MockBean - public JwtDecoder jwtDecoder; + public ReactiveJwtDecoder reactiveJwtDecoder; @Test @SuppressWarnings("java:S2699") From 128f5f51076fbd05086764203d25cb090fef4b77 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 19 Oct 2023 17:09:30 +0200 Subject: [PATCH 11/49] =?UTF-8?q?Refaktorert=20og=20migrert=20Brreg-stub?= =?UTF-8?q?=20inn=20i=2021.=20=C3=A5rhundre=20Fjernet=20Jaxb2=20plugin=20o?= =?UTF-8?q?g=20manuelt=20generet=20java=20filene=20gjennom=20intellij=20Fi?= =?UTF-8?q?kset=20p=C3=A5=20imports,=20lagt=20til=20st=C3=B8tte=20for=20de?= =?UTF-8?q?=20nye=20nav.common.no=20pakkene=20og=20refaktorert=20bort=20fr?= =?UTF-8?q?a=20gammel=20implementasjon=20#deploy-brreg-stub?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nav/brregstub/generated/AdresseType1.java | 348 ++ .../nav/brregstub/generated/AdresseType2.java | 518 ++ .../no/nav/brregstub/generated/Grunndata.java | 4150 +++++++++++++++++ .../generated/GrunndataUtskrift.java | 1815 +++++++ .../no/nav/brregstub/generated/NavnType.java | 233 + .../brregstub/generated/ObjectFactory.java | 192 + .../nav/brregstub/mapper/HentRolleMapper.java | 54 +- .../brregstub/mapper/RolleoversiktMapper.java | 154 +- .../nav/brregstub/service/BrregService.java | 5 +- .../no/nav/brregstub/ws/BrregEndpoint.java | 4 +- .../endpoint/ws/BrregEndpointTest.java | 6 +- .../brregstub/service/BrregServiceTest.java | 2 +- 12 files changed, 7362 insertions(+), 119 deletions(-) create mode 100644 apps/brreg-stub/src/main/java/no/nav/brregstub/generated/AdresseType1.java create mode 100644 apps/brreg-stub/src/main/java/no/nav/brregstub/generated/AdresseType2.java create mode 100644 apps/brreg-stub/src/main/java/no/nav/brregstub/generated/Grunndata.java create mode 100644 apps/brreg-stub/src/main/java/no/nav/brregstub/generated/GrunndataUtskrift.java create mode 100644 apps/brreg-stub/src/main/java/no/nav/brregstub/generated/NavnType.java create mode 100644 apps/brreg-stub/src/main/java/no/nav/brregstub/generated/ObjectFactory.java diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/AdresseType1.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/AdresseType1.java new file mode 100644 index 00000000000..c8891dd4da4 --- /dev/null +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/AdresseType1.java @@ -0,0 +1,348 @@ + +package no.nav.brregstub.generated; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; + + +/** + *

Java class for adresseType1 complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="adresseType1">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="adresse1" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="35"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="adresse2" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="35"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="adresse3" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="35"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="postnr" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="4"/>
+ *               <maxLength value="9"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="poststed" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="35"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="land">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                 <attribute name="landkode1" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "adresseType1", propOrder = { + "adresse1", + "adresse2", + "adresse3", + "postnr", + "poststed", + "land" +}) +public class AdresseType1 { + + protected String adresse1; + protected String adresse2; + protected String adresse3; + protected String postnr; + protected String poststed; + @XmlElement(required = true) + protected AdresseType1 .Land land; + @XmlAttribute(name = "ledetekst") + protected String ledetekst; + + /** + * Gets the value of the adresse1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse1() { + return adresse1; + } + + /** + * Sets the value of the adresse1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse1(String value) { + this.adresse1 = value; + } + + /** + * Gets the value of the adresse2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse2() { + return adresse2; + } + + /** + * Sets the value of the adresse2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse2(String value) { + this.adresse2 = value; + } + + /** + * Gets the value of the adresse3 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse3() { + return adresse3; + } + + /** + * Sets the value of the adresse3 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse3(String value) { + this.adresse3 = value; + } + + /** + * Gets the value of the postnr property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPostnr() { + return postnr; + } + + /** + * Sets the value of the postnr property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPostnr(String value) { + this.postnr = value; + } + + /** + * Gets the value of the poststed property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPoststed() { + return poststed; + } + + /** + * Sets the value of the poststed property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPoststed(String value) { + this.poststed = value; + } + + /** + * Gets the value of the land property. + * + * @return + * possible object is + * {@link AdresseType1 .Land } + * + */ + public AdresseType1 .Land getLand() { + return land; + } + + /** + * Sets the value of the land property. + * + * @param value + * allowed object is + * {@link AdresseType1 .Land } + * + */ + public void setLand(AdresseType1 .Land value) { + this.land = value; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *       <attribute name="landkode1" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
+     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Land { + + @XmlValue + protected String value; + @XmlAttribute(name = "landkode1", required = true) + protected String landkode1; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the landkode1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLandkode1() { + return landkode1; + } + + /** + * Sets the value of the landkode1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLandkode1(String value) { + this.landkode1 = value; + } + + } + +} diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/AdresseType2.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/AdresseType2.java new file mode 100644 index 00000000000..45da1b33962 --- /dev/null +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/AdresseType2.java @@ -0,0 +1,518 @@ + +package no.nav.brregstub.generated; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; + + +/** + *

Java class for adresseType2 complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="adresseType2">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="adresse1" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="35"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="adresse2" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="35"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="adresse3" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="35"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="postnr" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="4"/>
+ *               <maxLength value="9"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="poststed" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="35"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="kommune" minOccurs="0">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                 <attribute name="kommnr" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="land">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                 <attribute name="landkode1" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "adresseType2", propOrder = { + "adresse1", + "adresse2", + "adresse3", + "postnr", + "poststed", + "kommune", + "land" +}) +public class AdresseType2 { + + protected String adresse1; + protected String adresse2; + protected String adresse3; + protected String postnr; + protected String poststed; + protected AdresseType2 .Kommune kommune; + @XmlElement(required = true) + protected AdresseType2 .Land land; + @XmlAttribute(name = "ledetekst") + protected String ledetekst; + + /** + * Gets the value of the adresse1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse1() { + return adresse1; + } + + /** + * Sets the value of the adresse1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse1(String value) { + this.adresse1 = value; + } + + /** + * Gets the value of the adresse2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse2() { + return adresse2; + } + + /** + * Sets the value of the adresse2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse2(String value) { + this.adresse2 = value; + } + + /** + * Gets the value of the adresse3 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse3() { + return adresse3; + } + + /** + * Sets the value of the adresse3 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse3(String value) { + this.adresse3 = value; + } + + /** + * Gets the value of the postnr property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPostnr() { + return postnr; + } + + /** + * Sets the value of the postnr property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPostnr(String value) { + this.postnr = value; + } + + /** + * Gets the value of the poststed property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPoststed() { + return poststed; + } + + /** + * Sets the value of the poststed property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPoststed(String value) { + this.poststed = value; + } + + /** + * Gets the value of the kommune property. + * + * @return + * possible object is + * {@link AdresseType2 .Kommune } + * + */ + public AdresseType2 .Kommune getKommune() { + return kommune; + } + + /** + * Sets the value of the kommune property. + * + * @param value + * allowed object is + * {@link AdresseType2 .Kommune } + * + */ + public void setKommune(AdresseType2 .Kommune value) { + this.kommune = value; + } + + /** + * Gets the value of the land property. + * + * @return + * possible object is + * {@link AdresseType2 .Land } + * + */ + public AdresseType2 .Land getLand() { + return land; + } + + /** + * Sets the value of the land property. + * + * @param value + * allowed object is + * {@link AdresseType2 .Land } + * + */ + public void setLand(AdresseType2 .Land value) { + this.land = value; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *       <attribute name="kommnr" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
+     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Kommune { + + @XmlValue + protected String value; + @XmlAttribute(name = "kommnr", required = true) + protected String kommnr; + @XmlAttribute(name = "ledetekst") + protected String ledetekst; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the kommnr property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKommnr() { + return kommnr; + } + + /** + * Sets the value of the kommnr property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKommnr(String value) { + this.kommnr = value; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *       <attribute name="landkode1" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
+     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Land { + + @XmlValue + protected String value; + @XmlAttribute(name = "landkode1", required = true) + protected String landkode1; + @XmlAttribute(name = "ledetekst") + protected String ledetekst; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the landkode1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLandkode1() { + return landkode1; + } + + /** + * Sets the value of the landkode1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLandkode1(String value) { + this.landkode1 = value; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + + } + +} diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/Grunndata.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/Grunndata.java new file mode 100644 index 00000000000..ec0ab06922b --- /dev/null +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/Grunndata.java @@ -0,0 +1,4150 @@ + +package no.nav.brregstub.generated; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; + +import javax.xml.datatype.XMLGregorianCalendar; +import java.util.ArrayList; +import java.util.List; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="responseHeader">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="orgnr" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                   <element name="hovedStatus" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                   <element name="underStatus">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="underStatusMelding" maxOccurs="unbounded">
+ *                               <complexType>
+ *                                 <simpleContent>
+ *                                   <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                                     <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                   </extension>
+ *                                 </simpleContent>
+ *                               </complexType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="prossessDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+ *                 <attribute name="tjeneste" use="required">
+ *                   <simpleType>
+ *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                       <minLength value="1"/>
+ *                       <maxLength value="40"/>
+ *                     </restriction>
+ *                   </simpleType>
+ *                 </attribute>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="melding" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="organisasjonsnummer">
+ *                     <complexType>
+ *                       <simpleContent>
+ *                         <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                           <attribute name="registreringsDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+ *                         </extension>
+ *                       </simpleContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="kontaktperson" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <group ref="{}samendring"/>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="deltakere" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <group ref="{}samendring"/>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="komplementar" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <group ref="{}samendring"/>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="sameiere" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <group ref="{}samendring"/>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="styre" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <group ref="{}samendring"/>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="revisor" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <group ref="{}samendring"/>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="regnskapsfoerer" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <group ref="{}samendring"/>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="eierkommune" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <group ref="{}samendring"/>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="tjeneste" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "responseHeader", + "melding" +}) +@XmlRootElement(name = "grunndata") +public class Grunndata { + + @XmlElement(required = true) + protected Grunndata.ResponseHeader responseHeader; + protected Grunndata.Melding melding; + + /** + * Gets the value of the responseHeader property. + * + * @return + * possible object is + * {@link Grunndata.ResponseHeader } + * + */ + public Grunndata.ResponseHeader getResponseHeader() { + return responseHeader; + } + + /** + * Sets the value of the responseHeader property. + * + * @param value + * allowed object is + * {@link Grunndata.ResponseHeader } + * + */ + public void setResponseHeader(Grunndata.ResponseHeader value) { + this.responseHeader = value; + } + + /** + * Gets the value of the melding property. + * + * @return + * possible object is + * {@link Grunndata.Melding } + * + */ + public Grunndata.Melding getMelding() { + return melding; + } + + /** + * Sets the value of the melding property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding } + * + */ + public void setMelding(Grunndata.Melding value) { + this.melding = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="organisasjonsnummer">
+     *           <complexType>
+     *             <simpleContent>
+     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                 <attribute name="registreringsDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+     *               </extension>
+     *             </simpleContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="kontaktperson" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <group ref="{}samendring"/>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="deltakere" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <group ref="{}samendring"/>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="komplementar" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <group ref="{}samendring"/>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="sameiere" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <group ref="{}samendring"/>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="styre" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <group ref="{}samendring"/>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="revisor" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <group ref="{}samendring"/>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="regnskapsfoerer" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <group ref="{}samendring"/>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="eierkommune" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <group ref="{}samendring"/>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="tjeneste" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "organisasjonsnummer", + "kontaktperson", + "deltakere", + "komplementar", + "sameiere", + "styre", + "revisor", + "regnskapsfoerer", + "eierkommune" + }) + public static class Melding { + + @XmlElement(required = true) + protected Grunndata.Melding.Organisasjonsnummer organisasjonsnummer; + protected Grunndata.Melding.Kontaktperson kontaktperson; + protected Grunndata.Melding.Deltakere deltakere; + protected Grunndata.Melding.Komplementar komplementar; + protected Grunndata.Melding.Sameiere sameiere; + protected Grunndata.Melding.Styre styre; + protected Grunndata.Melding.Revisor revisor; + protected Grunndata.Melding.Regnskapsfoerer regnskapsfoerer; + protected Grunndata.Melding.Eierkommune eierkommune; + @XmlAttribute(name = "tjeneste", required = true) + protected String tjeneste; + + /** + * Gets the value of the organisasjonsnummer property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Organisasjonsnummer } + * + */ + public Grunndata.Melding.Organisasjonsnummer getOrganisasjonsnummer() { + return organisasjonsnummer; + } + + /** + * Sets the value of the organisasjonsnummer property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Organisasjonsnummer } + * + */ + public void setOrganisasjonsnummer(Grunndata.Melding.Organisasjonsnummer value) { + this.organisasjonsnummer = value; + } + + /** + * Gets the value of the kontaktperson property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Kontaktperson } + * + */ + public Grunndata.Melding.Kontaktperson getKontaktperson() { + return kontaktperson; + } + + /** + * Sets the value of the kontaktperson property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Kontaktperson } + * + */ + public void setKontaktperson(Grunndata.Melding.Kontaktperson value) { + this.kontaktperson = value; + } + + /** + * Gets the value of the deltakere property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Deltakere } + * + */ + public Grunndata.Melding.Deltakere getDeltakere() { + return deltakere; + } + + /** + * Sets the value of the deltakere property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Deltakere } + * + */ + public void setDeltakere(Grunndata.Melding.Deltakere value) { + this.deltakere = value; + } + + /** + * Gets the value of the komplementar property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Komplementar } + * + */ + public Grunndata.Melding.Komplementar getKomplementar() { + return komplementar; + } + + /** + * Sets the value of the komplementar property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Komplementar } + * + */ + public void setKomplementar(Grunndata.Melding.Komplementar value) { + this.komplementar = value; + } + + /** + * Gets the value of the sameiere property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Sameiere } + * + */ + public Grunndata.Melding.Sameiere getSameiere() { + return sameiere; + } + + /** + * Sets the value of the sameiere property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Sameiere } + * + */ + public void setSameiere(Grunndata.Melding.Sameiere value) { + this.sameiere = value; + } + + /** + * Gets the value of the styre property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Styre } + * + */ + public Grunndata.Melding.Styre getStyre() { + return styre; + } + + /** + * Sets the value of the styre property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Styre } + * + */ + public void setStyre(Grunndata.Melding.Styre value) { + this.styre = value; + } + + /** + * Gets the value of the revisor property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Revisor } + * + */ + public Grunndata.Melding.Revisor getRevisor() { + return revisor; + } + + /** + * Sets the value of the revisor property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Revisor } + * + */ + public void setRevisor(Grunndata.Melding.Revisor value) { + this.revisor = value; + } + + /** + * Gets the value of the regnskapsfoerer property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Regnskapsfoerer } + * + */ + public Grunndata.Melding.Regnskapsfoerer getRegnskapsfoerer() { + return regnskapsfoerer; + } + + /** + * Sets the value of the regnskapsfoerer property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Regnskapsfoerer } + * + */ + public void setRegnskapsfoerer(Grunndata.Melding.Regnskapsfoerer value) { + this.regnskapsfoerer = value; + } + + /** + * Gets the value of the eierkommune property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Eierkommune } + * + */ + public Grunndata.Melding.Eierkommune getEierkommune() { + return eierkommune; + } + + /** + * Sets the value of the eierkommune property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Eierkommune } + * + */ + public void setEierkommune(Grunndata.Melding.Eierkommune value) { + this.eierkommune = value; + } + + /** + * Gets the value of the tjeneste property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTjeneste() { + return tjeneste; + } + + /** + * Sets the value of the tjeneste property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTjeneste(String value) { + this.tjeneste = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <group ref="{}samendring"/>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "samendring" + }) + public static class Deltakere { + + @XmlElement(required = true) + protected List samendring; + + /** + * Gets the value of the samendring property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the samendring property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getSamendring().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring } + * + * + */ + public List getSamendring() { + if (samendring == null) { + samendring = new ArrayList(); + } + return this.samendring; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <group ref="{}samendring"/>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "samendring" + }) + public static class Eierkommune { + + @XmlElement(required = true) + protected List samendring; + + /** + * Gets the value of the samendring property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the samendring property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getSamendring().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring } + * + * + */ + public List getSamendring() { + if (samendring == null) { + samendring = new ArrayList(); + } + return this.samendring; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="headerTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+             *         <element name="rolle" maxOccurs="unbounded" minOccurs="0">
+             *           <complexType>
+             *             <complexContent>
+             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                 <sequence>
+             *                   <element name="person" maxOccurs="unbounded" minOccurs="0">
+             *                     <complexType>
+             *                       <complexContent>
+             *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                           <sequence>
+             *                             <element name="vergeTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+             *                             <choice>
+             *                               <element name="fodselsnr">
+             *                                 <simpleType>
+             *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                     <length value="11"/>
+             *                                   </restriction>
+             *                                 </simpleType>
+             *                               </element>
+             *                               <element name="fodselsdato">
+             *                                 <simpleType>
+             *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                     <length value="10"/>
+             *                                   </restriction>
+             *                                 </simpleType>
+             *                               </element>
+             *                             </choice>
+             *                             <element name="fornavn">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="50"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="mellomnavn" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="50"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="slektsnavn">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="50"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="adresse1" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="adresse2" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="adresse3" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="postnr" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="4"/>
+             *                                   <maxLength value="9"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="poststed" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="land" minOccurs="0">
+             *                               <complexType>
+             *                                 <simpleContent>
+             *                                   <extension base="<http://www.w3.org/2001/XMLSchema>string">
+             *                                     <attribute name="landkode4" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *                                   </extension>
+             *                                 </simpleContent>
+             *                               </complexType>
+             *                             </element>
+             *                             <element name="valgtAv" minOccurs="0">
+             *                               <complexType>
+             *                                 <simpleContent>
+             *                                   <extension base="<http://www.w3.org/2001/XMLSchema>string">
+             *                                     <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *                                   </extension>
+             *                                 </simpleContent>
+             *                               </complexType>
+             *                             </element>
+             *                             <element name="ansvarsandel" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+             *                             <element name="fratraadt" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <length value="1"/>
+             *                                   <enumeration value="K"/>
+             *                                   <enumeration value="R"/>
+             *                                   <enumeration value="F"/>
+             *                                   <enumeration value="N"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="fratraadtTekst" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <length value="8"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="revisorKategori" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+             *                             <element name="revisorRkode" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+             *                             <element name="reTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+             *                             <element name="rolleFritekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+             *                           </sequence>
+             *                           <attribute name="beskrivelse" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *                           <attribute name="statuskode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *                         </restriction>
+             *                       </complexContent>
+             *                     </complexType>
+             *                   </element>
+             *                   <element name="enhet" maxOccurs="unbounded" minOccurs="0">
+             *                     <complexType>
+             *                       <complexContent>
+             *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                           <sequence>
+             *                             <element name="orgnr">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <length value="9"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="navn1">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="navn2" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="navn3" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="navn4" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="navn5" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="adresse1" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="adresse2" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="adresse3" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="postnr" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="4"/>
+             *                                   <maxLength value="9"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="poststed" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <minLength value="1"/>
+             *                                   <maxLength value="35"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="land" minOccurs="0">
+             *                               <complexType>
+             *                                 <simpleContent>
+             *                                   <extension base="<http://www.w3.org/2001/XMLSchema>string">
+             *                                     <attribute name="landkode4" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *                                   </extension>
+             *                                 </simpleContent>
+             *                               </complexType>
+             *                             </element>
+             *                             <element name="valgtAv" minOccurs="0">
+             *                               <complexType>
+             *                                 <simpleContent>
+             *                                   <extension base="<http://www.w3.org/2001/XMLSchema>string">
+             *                                     <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *                                   </extension>
+             *                                 </simpleContent>
+             *                               </complexType>
+             *                             </element>
+             *                             <element name="ansvarsandel" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+             *                             <element name="fratraadt" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <length value="1"/>
+             *                                   <enumeration value="K"/>
+             *                                   <enumeration value="R"/>
+             *                                   <enumeration value="F"/>
+             *                                   <enumeration value="N"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="fratraadtTekst" minOccurs="0">
+             *                               <simpleType>
+             *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *                                   <length value="8"/>
+             *                                 </restriction>
+             *                               </simpleType>
+             *                             </element>
+             *                             <element name="revisorKategori" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+             *                             <element name="revisorRkode" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+             *                             <element name="reTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+             *                             <element name="rolleFritekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+             *                           </sequence>
+             *                           <attribute name="beskrivelse" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *                           <attribute name="statuskode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *                         </restriction>
+             *                       </complexContent>
+             *                     </complexType>
+             *                   </element>
+             *                 </sequence>
+             *                 <attribute name="beskrivelse" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *                 <attribute name="rolletype" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *               </restriction>
+             *             </complexContent>
+             *           </complexType>
+             *         </element>
+             *         <element name="trailerTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+             *       </sequence>
+             *       <attribute name="registreringsDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+             *       <attribute name="beskrivelse" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *       <attribute name="samendringstype" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *       <attribute name="kjonnsrepresentasjon" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "headerTekst", + "rolle", + "trailerTekst" + }) + public static class Samendring { + + protected String headerTekst; + protected List rolle; + protected String trailerTekst; + @XmlAttribute(name = "registreringsDato", required = true) + @XmlSchemaType(name = "date") + protected XMLGregorianCalendar registreringsDato; + @XmlAttribute(name = "beskrivelse", required = true) + protected String beskrivelse; + @XmlAttribute(name = "samendringstype", required = true) + protected String samendringstype; + @XmlAttribute(name = "kjonnsrepresentasjon") + protected String kjonnsrepresentasjon; + + /** + * Gets the value of the headerTekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHeaderTekst() { + return headerTekst; + } + + /** + * Sets the value of the headerTekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHeaderTekst(String value) { + this.headerTekst = value; + } + + /** + * Gets the value of the rolle property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the rolle property. + * + *

+ * For example, to add a new item, do as follows: + * 

+                 *    getRolle().add(newItem);
+                 *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle } + * + * + */ + public List getRolle() { + if (rolle == null) { + rolle = new ArrayList(); + } + return this.rolle; + } + + /** + * Gets the value of the trailerTekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTrailerTekst() { + return trailerTekst; + } + + /** + * Sets the value of the trailerTekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTrailerTekst(String value) { + this.trailerTekst = value; + } + + /** + * Gets the value of the registreringsDato property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getRegistreringsDato() { + return registreringsDato; + } + + /** + * Sets the value of the registreringsDato property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setRegistreringsDato(XMLGregorianCalendar value) { + this.registreringsDato = value; + } + + /** + * Gets the value of the beskrivelse property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBeskrivelse() { + return beskrivelse; + } + + /** + * Sets the value of the beskrivelse property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBeskrivelse(String value) { + this.beskrivelse = value; + } + + /** + * Gets the value of the samendringstype property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSamendringstype() { + return samendringstype; + } + + /** + * Sets the value of the samendringstype property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSamendringstype(String value) { + this.samendringstype = value; + } + + /** + * Gets the value of the kjonnsrepresentasjon property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKjonnsrepresentasjon() { + return kjonnsrepresentasjon; + } + + /** + * Sets the value of the kjonnsrepresentasjon property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKjonnsrepresentasjon(String value) { + this.kjonnsrepresentasjon = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+                 * <complexType>
+                 *   <complexContent>
+                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *       <sequence>
+                 *         <element name="person" maxOccurs="unbounded" minOccurs="0">
+                 *           <complexType>
+                 *             <complexContent>
+                 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *                 <sequence>
+                 *                   <element name="vergeTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                 *                   <choice>
+                 *                     <element name="fodselsnr">
+                 *                       <simpleType>
+                 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                           <length value="11"/>
+                 *                         </restriction>
+                 *                       </simpleType>
+                 *                     </element>
+                 *                     <element name="fodselsdato">
+                 *                       <simpleType>
+                 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                           <length value="10"/>
+                 *                         </restriction>
+                 *                       </simpleType>
+                 *                     </element>
+                 *                   </choice>
+                 *                   <element name="fornavn">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="50"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="mellomnavn" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="50"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="slektsnavn">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="50"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="adresse1" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="adresse2" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="adresse3" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="postnr" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="4"/>
+                 *                         <maxLength value="9"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="poststed" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="land" minOccurs="0">
+                 *                     <complexType>
+                 *                       <simpleContent>
+                 *                         <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                 *                           <attribute name="landkode4" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *                         </extension>
+                 *                       </simpleContent>
+                 *                     </complexType>
+                 *                   </element>
+                 *                   <element name="valgtAv" minOccurs="0">
+                 *                     <complexType>
+                 *                       <simpleContent>
+                 *                         <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                 *                           <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *                         </extension>
+                 *                       </simpleContent>
+                 *                     </complexType>
+                 *                   </element>
+                 *                   <element name="ansvarsandel" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                 *                   <element name="fratraadt" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <length value="1"/>
+                 *                         <enumeration value="K"/>
+                 *                         <enumeration value="R"/>
+                 *                         <enumeration value="F"/>
+                 *                         <enumeration value="N"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="fratraadtTekst" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <length value="8"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="revisorKategori" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+                 *                   <element name="revisorRkode" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+                 *                   <element name="reTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                 *                   <element name="rolleFritekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                 *                 </sequence>
+                 *                 <attribute name="beskrivelse" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *                 <attribute name="statuskode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *               </restriction>
+                 *             </complexContent>
+                 *           </complexType>
+                 *         </element>
+                 *         <element name="enhet" maxOccurs="unbounded" minOccurs="0">
+                 *           <complexType>
+                 *             <complexContent>
+                 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *                 <sequence>
+                 *                   <element name="orgnr">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <length value="9"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="navn1">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="navn2" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="navn3" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="navn4" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="navn5" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="adresse1" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="adresse2" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="adresse3" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="postnr" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="4"/>
+                 *                         <maxLength value="9"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="poststed" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <minLength value="1"/>
+                 *                         <maxLength value="35"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="land" minOccurs="0">
+                 *                     <complexType>
+                 *                       <simpleContent>
+                 *                         <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                 *                           <attribute name="landkode4" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *                         </extension>
+                 *                       </simpleContent>
+                 *                     </complexType>
+                 *                   </element>
+                 *                   <element name="valgtAv" minOccurs="0">
+                 *                     <complexType>
+                 *                       <simpleContent>
+                 *                         <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                 *                           <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *                         </extension>
+                 *                       </simpleContent>
+                 *                     </complexType>
+                 *                   </element>
+                 *                   <element name="ansvarsandel" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                 *                   <element name="fratraadt" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <length value="1"/>
+                 *                         <enumeration value="K"/>
+                 *                         <enumeration value="R"/>
+                 *                         <enumeration value="F"/>
+                 *                         <enumeration value="N"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="fratraadtTekst" minOccurs="0">
+                 *                     <simpleType>
+                 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                 *                         <length value="8"/>
+                 *                       </restriction>
+                 *                     </simpleType>
+                 *                   </element>
+                 *                   <element name="revisorKategori" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+                 *                   <element name="revisorRkode" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+                 *                   <element name="reTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                 *                   <element name="rolleFritekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                 *                 </sequence>
+                 *                 <attribute name="beskrivelse" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *                 <attribute name="statuskode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *               </restriction>
+                 *             </complexContent>
+                 *           </complexType>
+                 *         </element>
+                 *       </sequence>
+                 *       <attribute name="beskrivelse" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *       <attribute name="rolletype" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *     </restriction>
+                 *   </complexContent>
+                 * </complexType>
+                 *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "person", + "enhet" + }) + public static class Rolle { + + protected List person; + protected List enhet; + @XmlAttribute(name = "beskrivelse", required = true) + protected String beskrivelse; + @XmlAttribute(name = "rolletype", required = true) + protected String rolletype; + + /** + * Gets the value of the person property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the person property. + * + *

+ * For example, to add a new item, do as follows: + * 

+                     *    getPerson().add(newItem);
+                     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle.Person } + * + * + */ + public List getPerson() { + if (person == null) { + person = new ArrayList(); + } + return this.person; + } + + /** + * Gets the value of the enhet property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the enhet property. + * + *

+ * For example, to add a new item, do as follows: + * 

+                     *    getEnhet().add(newItem);
+                     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet } + * + * + */ + public List getEnhet() { + if (enhet == null) { + enhet = new ArrayList(); + } + return this.enhet; + } + + /** + * Gets the value of the beskrivelse property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBeskrivelse() { + return beskrivelse; + } + + /** + * Sets the value of the beskrivelse property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBeskrivelse(String value) { + this.beskrivelse = value; + } + + /** + * Gets the value of the rolletype property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRolletype() { + return rolletype; + } + + /** + * Sets the value of the rolletype property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRolletype(String value) { + this.rolletype = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+                     * <complexType>
+                     *   <complexContent>
+                     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                     *       <sequence>
+                     *         <element name="orgnr">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <length value="9"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="navn1">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="navn2" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="navn3" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="navn4" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="navn5" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="adresse1" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="adresse2" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="adresse3" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="postnr" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="4"/>
+                     *               <maxLength value="9"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="poststed" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="land" minOccurs="0">
+                     *           <complexType>
+                     *             <simpleContent>
+                     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                     *                 <attribute name="landkode4" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                     *               </extension>
+                     *             </simpleContent>
+                     *           </complexType>
+                     *         </element>
+                     *         <element name="valgtAv" minOccurs="0">
+                     *           <complexType>
+                     *             <simpleContent>
+                     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                     *                 <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                     *               </extension>
+                     *             </simpleContent>
+                     *           </complexType>
+                     *         </element>
+                     *         <element name="ansvarsandel" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                     *         <element name="fratraadt" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <length value="1"/>
+                     *               <enumeration value="K"/>
+                     *               <enumeration value="R"/>
+                     *               <enumeration value="F"/>
+                     *               <enumeration value="N"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="fratraadtTekst" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <length value="8"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="revisorKategori" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+                     *         <element name="revisorRkode" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+                     *         <element name="reTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                     *         <element name="rolleFritekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                     *       </sequence>
+                     *       <attribute name="beskrivelse" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                     *       <attribute name="statuskode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                     *     </restriction>
+                     *   </complexContent>
+                     * </complexType>
+                     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "orgnr", + "navn1", + "navn2", + "navn3", + "navn4", + "navn5", + "adresse1", + "adresse2", + "adresse3", + "postnr", + "poststed", + "land", + "valgtAv", + "ansvarsandel", + "fratraadt", + "fratraadtTekst", + "revisorKategori", + "revisorRkode", + "reTekst", + "rolleFritekst" + }) + public static class Enhet { + + @XmlElement(required = true) + protected String orgnr; + @XmlElement(required = true) + protected String navn1; + protected String navn2; + protected String navn3; + protected String navn4; + protected String navn5; + protected String adresse1; + protected String adresse2; + protected String adresse3; + protected String postnr; + protected String poststed; + protected Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet.Land land; + protected Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet.ValgtAv valgtAv; + protected String ansvarsandel; + protected String fratraadt; + protected String fratraadtTekst; + protected Integer revisorKategori; + protected Integer revisorRkode; + protected String reTekst; + protected String rolleFritekst; + @XmlAttribute(name = "beskrivelse", required = true) + protected String beskrivelse; + @XmlAttribute(name = "statuskode", required = true) + protected String statuskode; + + /** + * Gets the value of the orgnr property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOrgnr() { + return orgnr; + } + + /** + * Sets the value of the orgnr property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOrgnr(String value) { + this.orgnr = value; + } + + /** + * Gets the value of the navn1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNavn1() { + return navn1; + } + + /** + * Sets the value of the navn1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNavn1(String value) { + this.navn1 = value; + } + + /** + * Gets the value of the navn2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNavn2() { + return navn2; + } + + /** + * Sets the value of the navn2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNavn2(String value) { + this.navn2 = value; + } + + /** + * Gets the value of the navn3 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNavn3() { + return navn3; + } + + /** + * Sets the value of the navn3 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNavn3(String value) { + this.navn3 = value; + } + + /** + * Gets the value of the navn4 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNavn4() { + return navn4; + } + + /** + * Sets the value of the navn4 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNavn4(String value) { + this.navn4 = value; + } + + /** + * Gets the value of the navn5 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNavn5() { + return navn5; + } + + /** + * Sets the value of the navn5 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNavn5(String value) { + this.navn5 = value; + } + + /** + * Gets the value of the adresse1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse1() { + return adresse1; + } + + /** + * Sets the value of the adresse1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse1(String value) { + this.adresse1 = value; + } + + /** + * Gets the value of the adresse2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse2() { + return adresse2; + } + + /** + * Sets the value of the adresse2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse2(String value) { + this.adresse2 = value; + } + + /** + * Gets the value of the adresse3 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse3() { + return adresse3; + } + + /** + * Sets the value of the adresse3 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse3(String value) { + this.adresse3 = value; + } + + /** + * Gets the value of the postnr property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPostnr() { + return postnr; + } + + /** + * Sets the value of the postnr property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPostnr(String value) { + this.postnr = value; + } + + /** + * Gets the value of the poststed property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPoststed() { + return poststed; + } + + /** + * Sets the value of the poststed property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPoststed(String value) { + this.poststed = value; + } + + /** + * Gets the value of the land property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet.Land } + * + */ + public Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet.Land getLand() { + return land; + } + + /** + * Sets the value of the land property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet.Land } + * + */ + public void setLand(Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet.Land value) { + this.land = value; + } + + /** + * Gets the value of the valgtAv property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet.ValgtAv } + * + */ + public Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet.ValgtAv getValgtAv() { + return valgtAv; + } + + /** + * Sets the value of the valgtAv property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet.ValgtAv } + * + */ + public void setValgtAv(Grunndata.Melding.Eierkommune.Samendring.Rolle.Enhet.ValgtAv value) { + this.valgtAv = value; + } + + /** + * Gets the value of the ansvarsandel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnsvarsandel() { + return ansvarsandel; + } + + /** + * Sets the value of the ansvarsandel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnsvarsandel(String value) { + this.ansvarsandel = value; + } + + /** + * Gets the value of the fratraadt property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFratraadt() { + return fratraadt; + } + + /** + * Sets the value of the fratraadt property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFratraadt(String value) { + this.fratraadt = value; + } + + /** + * Gets the value of the fratraadtTekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFratraadtTekst() { + return fratraadtTekst; + } + + /** + * Sets the value of the fratraadtTekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFratraadtTekst(String value) { + this.fratraadtTekst = value; + } + + /** + * Gets the value of the revisorKategori property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getRevisorKategori() { + return revisorKategori; + } + + /** + * Sets the value of the revisorKategori property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setRevisorKategori(Integer value) { + this.revisorKategori = value; + } + + /** + * Gets the value of the revisorRkode property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getRevisorRkode() { + return revisorRkode; + } + + /** + * Sets the value of the revisorRkode property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setRevisorRkode(Integer value) { + this.revisorRkode = value; + } + + /** + * Gets the value of the reTekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getReTekst() { + return reTekst; + } + + /** + * Sets the value of the reTekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReTekst(String value) { + this.reTekst = value; + } + + /** + * Gets the value of the rolleFritekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRolleFritekst() { + return rolleFritekst; + } + + /** + * Sets the value of the rolleFritekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRolleFritekst(String value) { + this.rolleFritekst = value; + } + + /** + * Gets the value of the beskrivelse property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBeskrivelse() { + return beskrivelse; + } + + /** + * Sets the value of the beskrivelse property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBeskrivelse(String value) { + this.beskrivelse = value; + } + + /** + * Gets the value of the statuskode property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getStatuskode() { + return statuskode; + } + + /** + * Sets the value of the statuskode property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStatuskode(String value) { + this.statuskode = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+                         * <complexType>
+                         *   <simpleContent>
+                         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                         *       <attribute name="landkode4" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                         *     </extension>
+                         *   </simpleContent>
+                         * </complexType>
+                         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Land { + + @XmlValue + protected String value; + @XmlAttribute(name = "landkode4", required = true) + protected String landkode4; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the landkode4 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLandkode4() { + return landkode4; + } + + /** + * Sets the value of the landkode4 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLandkode4(String value) { + this.landkode4 = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+                         * <complexType>
+                         *   <simpleContent>
+                         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                         *       <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                         *     </extension>
+                         *   </simpleContent>
+                         * </complexType>
+                         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class ValgtAv { + + @XmlValue + protected String value; + @XmlAttribute(name = "kode", required = true) + protected String kode; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the kode property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKode() { + return kode; + } + + /** + * Sets the value of the kode property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKode(String value) { + this.kode = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+                     * <complexType>
+                     *   <complexContent>
+                     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                     *       <sequence>
+                     *         <element name="vergeTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                     *         <choice>
+                     *           <element name="fodselsnr">
+                     *             <simpleType>
+                     *               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *                 <length value="11"/>
+                     *               </restriction>
+                     *             </simpleType>
+                     *           </element>
+                     *           <element name="fodselsdato">
+                     *             <simpleType>
+                     *               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *                 <length value="10"/>
+                     *               </restriction>
+                     *             </simpleType>
+                     *           </element>
+                     *         </choice>
+                     *         <element name="fornavn">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="50"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="mellomnavn" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="50"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="slektsnavn">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="50"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="adresse1" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="adresse2" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="adresse3" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="postnr" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="4"/>
+                     *               <maxLength value="9"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="poststed" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <minLength value="1"/>
+                     *               <maxLength value="35"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="land" minOccurs="0">
+                     *           <complexType>
+                     *             <simpleContent>
+                     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                     *                 <attribute name="landkode4" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                     *               </extension>
+                     *             </simpleContent>
+                     *           </complexType>
+                     *         </element>
+                     *         <element name="valgtAv" minOccurs="0">
+                     *           <complexType>
+                     *             <simpleContent>
+                     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                     *                 <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                     *               </extension>
+                     *             </simpleContent>
+                     *           </complexType>
+                     *         </element>
+                     *         <element name="ansvarsandel" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                     *         <element name="fratraadt" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <length value="1"/>
+                     *               <enumeration value="K"/>
+                     *               <enumeration value="R"/>
+                     *               <enumeration value="F"/>
+                     *               <enumeration value="N"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="fratraadtTekst" minOccurs="0">
+                     *           <simpleType>
+                     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+                     *               <length value="8"/>
+                     *             </restriction>
+                     *           </simpleType>
+                     *         </element>
+                     *         <element name="revisorKategori" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+                     *         <element name="revisorRkode" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+                     *         <element name="reTekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                     *         <element name="rolleFritekst" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+                     *       </sequence>
+                     *       <attribute name="beskrivelse" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                     *       <attribute name="statuskode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                     *     </restriction>
+                     *   </complexContent>
+                     * </complexType>
+                     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "vergeTekst", + "fodselsnr", + "fodselsdato", + "fornavn", + "mellomnavn", + "slektsnavn", + "adresse1", + "adresse2", + "adresse3", + "postnr", + "poststed", + "land", + "valgtAv", + "ansvarsandel", + "fratraadt", + "fratraadtTekst", + "revisorKategori", + "revisorRkode", + "reTekst", + "rolleFritekst" + }) + public static class Person { + + protected String vergeTekst; + protected String fodselsnr; + protected String fodselsdato; + @XmlElement(required = true) + protected String fornavn; + protected String mellomnavn; + @XmlElement(required = true) + protected String slektsnavn; + protected String adresse1; + protected String adresse2; + protected String adresse3; + protected String postnr; + protected String poststed; + protected Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.Land land; + protected Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.ValgtAv valgtAv; + protected String ansvarsandel; + protected String fratraadt; + protected String fratraadtTekst; + protected Integer revisorKategori; + protected Integer revisorRkode; + protected String reTekst; + protected String rolleFritekst; + @XmlAttribute(name = "beskrivelse", required = true) + protected String beskrivelse; + @XmlAttribute(name = "statuskode", required = true) + protected String statuskode; + + /** + * Gets the value of the vergeTekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVergeTekst() { + return vergeTekst; + } + + /** + * Sets the value of the vergeTekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVergeTekst(String value) { + this.vergeTekst = value; + } + + /** + * Gets the value of the fodselsnr property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFodselsnr() { + return fodselsnr; + } + + /** + * Sets the value of the fodselsnr property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFodselsnr(String value) { + this.fodselsnr = value; + } + + /** + * Gets the value of the fodselsdato property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFodselsdato() { + return fodselsdato; + } + + /** + * Sets the value of the fodselsdato property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFodselsdato(String value) { + this.fodselsdato = value; + } + + /** + * Gets the value of the fornavn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFornavn() { + return fornavn; + } + + /** + * Sets the value of the fornavn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFornavn(String value) { + this.fornavn = value; + } + + /** + * Gets the value of the mellomnavn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMellomnavn() { + return mellomnavn; + } + + /** + * Sets the value of the mellomnavn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMellomnavn(String value) { + this.mellomnavn = value; + } + + /** + * Gets the value of the slektsnavn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSlektsnavn() { + return slektsnavn; + } + + /** + * Sets the value of the slektsnavn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSlektsnavn(String value) { + this.slektsnavn = value; + } + + /** + * Gets the value of the adresse1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse1() { + return adresse1; + } + + /** + * Sets the value of the adresse1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse1(String value) { + this.adresse1 = value; + } + + /** + * Gets the value of the adresse2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse2() { + return adresse2; + } + + /** + * Sets the value of the adresse2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse2(String value) { + this.adresse2 = value; + } + + /** + * Gets the value of the adresse3 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAdresse3() { + return adresse3; + } + + /** + * Sets the value of the adresse3 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAdresse3(String value) { + this.adresse3 = value; + } + + /** + * Gets the value of the postnr property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPostnr() { + return postnr; + } + + /** + * Sets the value of the postnr property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPostnr(String value) { + this.postnr = value; + } + + /** + * Gets the value of the poststed property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPoststed() { + return poststed; + } + + /** + * Sets the value of the poststed property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPoststed(String value) { + this.poststed = value; + } + + /** + * Gets the value of the land property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.Land } + * + */ + public Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.Land getLand() { + return land; + } + + /** + * Sets the value of the land property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.Land } + * + */ + public void setLand(Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.Land value) { + this.land = value; + } + + /** + * Gets the value of the valgtAv property. + * + * @return + * possible object is + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.ValgtAv } + * + */ + public Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.ValgtAv getValgtAv() { + return valgtAv; + } + + /** + * Sets the value of the valgtAv property. + * + * @param value + * allowed object is + * {@link Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.ValgtAv } + * + */ + public void setValgtAv(Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.ValgtAv value) { + this.valgtAv = value; + } + + /** + * Gets the value of the ansvarsandel property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAnsvarsandel() { + return ansvarsandel; + } + + /** + * Sets the value of the ansvarsandel property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAnsvarsandel(String value) { + this.ansvarsandel = value; + } + + /** + * Gets the value of the fratraadt property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFratraadt() { + return fratraadt; + } + + /** + * Sets the value of the fratraadt property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFratraadt(String value) { + this.fratraadt = value; + } + + /** + * Gets the value of the fratraadtTekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFratraadtTekst() { + return fratraadtTekst; + } + + /** + * Sets the value of the fratraadtTekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFratraadtTekst(String value) { + this.fratraadtTekst = value; + } + + /** + * Gets the value of the revisorKategori property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getRevisorKategori() { + return revisorKategori; + } + + /** + * Sets the value of the revisorKategori property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setRevisorKategori(Integer value) { + this.revisorKategori = value; + } + + /** + * Gets the value of the revisorRkode property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getRevisorRkode() { + return revisorRkode; + } + + /** + * Sets the value of the revisorRkode property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setRevisorRkode(Integer value) { + this.revisorRkode = value; + } + + /** + * Gets the value of the reTekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getReTekst() { + return reTekst; + } + + /** + * Sets the value of the reTekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReTekst(String value) { + this.reTekst = value; + } + + /** + * Gets the value of the rolleFritekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRolleFritekst() { + return rolleFritekst; + } + + /** + * Sets the value of the rolleFritekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRolleFritekst(String value) { + this.rolleFritekst = value; + } + + /** + * Gets the value of the beskrivelse property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBeskrivelse() { + return beskrivelse; + } + + /** + * Sets the value of the beskrivelse property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBeskrivelse(String value) { + this.beskrivelse = value; + } + + /** + * Gets the value of the statuskode property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getStatuskode() { + return statuskode; + } + + /** + * Sets the value of the statuskode property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStatuskode(String value) { + this.statuskode = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+                         * <complexType>
+                         *   <simpleContent>
+                         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                         *       <attribute name="landkode4" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                         *     </extension>
+                         *   </simpleContent>
+                         * </complexType>
+                         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Land { + + @XmlValue + protected String value; + @XmlAttribute(name = "landkode4", required = true) + protected String landkode4; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the landkode4 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLandkode4() { + return landkode4; + } + + /** + * Sets the value of the landkode4 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLandkode4(String value) { + this.landkode4 = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+                         * <complexType>
+                         *   <simpleContent>
+                         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                         *       <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+                         *     </extension>
+                         *   </simpleContent>
+                         * </complexType>
+                         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class ValgtAv { + + @XmlValue + protected String value; + @XmlAttribute(name = "kode", required = true) + protected String kode; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the kode property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getKode() { + return kode; + } + + /** + * Sets the value of the kode property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setKode(String value) { + this.kode = value; + } + + } + + } + + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <group ref="{}samendring"/>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "samendring" + }) + public static class Komplementar { + + @XmlElement(required = true) + protected List samendring; + + /** + * Gets the value of the samendring property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the samendring property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getSamendring().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring } + * + * + */ + public List getSamendring() { + if (samendring == null) { + samendring = new ArrayList(); + } + return this.samendring; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <group ref="{}samendring"/>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "samendring" + }) + public static class Kontaktperson { + + @XmlElement(required = true) + protected List samendring; + + /** + * Gets the value of the samendring property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the samendring property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getSamendring().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring } + * + * + */ + public List getSamendring() { + if (samendring == null) { + samendring = new ArrayList(); + } + return this.samendring; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <simpleContent>
+         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *       <attribute name="registreringsDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+         *     </extension>
+         *   </simpleContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Organisasjonsnummer { + + @XmlValue + protected String value; + @XmlAttribute(name = "registreringsDato", required = true) + @XmlSchemaType(name = "date") + protected XMLGregorianCalendar registreringsDato; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the registreringsDato property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getRegistreringsDato() { + return registreringsDato; + } + + /** + * Sets the value of the registreringsDato property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setRegistreringsDato(XMLGregorianCalendar value) { + this.registreringsDato = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <group ref="{}samendring"/>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "samendring" + }) + public static class Regnskapsfoerer { + + @XmlElement(required = true) + protected List samendring; + + /** + * Gets the value of the samendring property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the samendring property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getSamendring().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring } + * + * + */ + public List getSamendring() { + if (samendring == null) { + samendring = new ArrayList(); + } + return this.samendring; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <group ref="{}samendring"/>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "samendring" + }) + public static class Revisor { + + @XmlElement(required = true) + protected List samendring; + + /** + * Gets the value of the samendring property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the samendring property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getSamendring().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring } + * + * + */ + public List getSamendring() { + if (samendring == null) { + samendring = new ArrayList(); + } + return this.samendring; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <group ref="{}samendring"/>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "samendring" + }) + public static class Sameiere { + + @XmlElement(required = true) + protected List samendring; + + /** + * Gets the value of the samendring property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the samendring property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getSamendring().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring } + * + * + */ + public List getSamendring() { + if (samendring == null) { + samendring = new ArrayList(); + } + return this.samendring; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <group ref="{}samendring"/>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "samendring" + }) + public static class Styre { + + @XmlElement(required = true) + protected List samendring; + + /** + * Gets the value of the samendring property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the samendring property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getSamendring().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.Melding.Eierkommune.Samendring } + * + * + */ + public List getSamendring() { + if (samendring == null) { + samendring = new ArrayList(); + } + return this.samendring; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="orgnr" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *         <element name="hovedStatus" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *         <element name="underStatus">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="underStatusMelding" maxOccurs="unbounded">
+     *                     <complexType>
+     *                       <simpleContent>
+     *                         <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                           <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                         </extension>
+     *                       </simpleContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="prossessDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+     *       <attribute name="tjeneste" use="required">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *             <minLength value="1"/>
+     *             <maxLength value="40"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "orgnr", + "hovedStatus", + "underStatus" + }) + public static class ResponseHeader { + + protected int orgnr; + protected int hovedStatus; + @XmlElement(required = true) + protected Grunndata.ResponseHeader.UnderStatus underStatus; + @XmlAttribute(name = "prossessDato", required = true) + @XmlSchemaType(name = "date") + protected XMLGregorianCalendar prossessDato; + @XmlAttribute(name = "tjeneste", required = true) + protected String tjeneste; + + /** + * Gets the value of the orgnr property. + * + */ + public int getOrgnr() { + return orgnr; + } + + /** + * Sets the value of the orgnr property. + * + */ + public void setOrgnr(int value) { + this.orgnr = value; + } + + /** + * Gets the value of the hovedStatus property. + * + */ + public int getHovedStatus() { + return hovedStatus; + } + + /** + * Sets the value of the hovedStatus property. + * + */ + public void setHovedStatus(int value) { + this.hovedStatus = value; + } + + /** + * Gets the value of the underStatus property. + * + * @return + * possible object is + * {@link Grunndata.ResponseHeader.UnderStatus } + * + */ + public Grunndata.ResponseHeader.UnderStatus getUnderStatus() { + return underStatus; + } + + /** + * Sets the value of the underStatus property. + * + * @param value + * allowed object is + * {@link Grunndata.ResponseHeader.UnderStatus } + * + */ + public void setUnderStatus(Grunndata.ResponseHeader.UnderStatus value) { + this.underStatus = value; + } + + /** + * Gets the value of the prossessDato property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getProssessDato() { + return prossessDato; + } + + /** + * Sets the value of the prossessDato property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setProssessDato(XMLGregorianCalendar value) { + this.prossessDato = value; + } + + /** + * Gets the value of the tjeneste property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTjeneste() { + return tjeneste; + } + + /** + * Sets the value of the tjeneste property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTjeneste(String value) { + this.tjeneste = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="underStatusMelding" maxOccurs="unbounded">
+         *           <complexType>
+         *             <simpleContent>
+         *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *                 <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *               </extension>
+         *             </simpleContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "underStatusMelding" + }) + public static class UnderStatus { + + @XmlElement(required = true) + protected List underStatusMelding; + + /** + * Gets the value of the underStatusMelding property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the underStatusMelding property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getUnderStatusMelding().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Grunndata.ResponseHeader.UnderStatus.UnderStatusMelding } + * + * + */ + public List getUnderStatusMelding() { + if (underStatusMelding == null) { + underStatusMelding = new ArrayList(); + } + return this.underStatusMelding; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+             * <complexType>
+             *   <simpleContent>
+             *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+             *       <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *     </extension>
+             *   </simpleContent>
+             * </complexType>
+             *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class UnderStatusMelding { + + @XmlValue + protected String value; + @XmlAttribute(name = "kode", required = true) + protected int kode; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the kode property. + * + */ + public int getKode() { + return kode; + } + + /** + * Sets the value of the kode property. + * + */ + public void setKode(int value) { + this.kode = value; + } + + } + + } + + } + +} diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/GrunndataUtskrift.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/GrunndataUtskrift.java new file mode 100644 index 00000000000..72306e8e5af --- /dev/null +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/GrunndataUtskrift.java @@ -0,0 +1,1815 @@ + +package no.nav.brregstub.generated; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; + +import javax.xml.datatype.XMLGregorianCalendar; +import java.util.ArrayList; +import java.util.List; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="responseHeader">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <choice>
+ *                     <element name="orgnr" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                     <element name="fodselsnr">
+ *                       <simpleType>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                           <length value="11"/>
+ *                         </restriction>
+ *                       </simpleType>
+ *                     </element>
+ *                     <element name="requestID" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   </choice>
+ *                   <element name="hovedStatus" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                   <element name="underStatus">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="underStatusMelding" maxOccurs="unbounded">
+ *                               <complexType>
+ *                                 <simpleContent>
+ *                                   <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                                     <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                   </extension>
+ *                                 </simpleContent>
+ *                               </complexType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="prossessDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+ *                 <attribute name="tjeneste" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="melding" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="rolleInnehaver">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <choice>
+ *                               <element name="orgnr">
+ *                                 <complexType>
+ *                                   <simpleContent>
+ *                                     <extension base="<http://www.w3.org/2001/XMLSchema>int">
+ *                                       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                     </extension>
+ *                                   </simpleContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="fodselsnr">
+ *                                 <complexType>
+ *                                   <simpleContent>
+ *                                     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                                       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                     </extension>
+ *                                   </simpleContent>
+ *                                 </complexType>
+ *                               </element>
+ *                               <element name="fodselsdato">
+ *                                 <complexType>
+ *                                   <simpleContent>
+ *                                     <extension base="<http://www.w3.org/2001/XMLSchema>date">
+ *                                       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                     </extension>
+ *                                   </simpleContent>
+ *                                 </complexType>
+ *                               </element>
+ *                             </choice>
+ *                             <element name="navn" type="{}navnType"/>
+ *                             <element name="adresse" type="{}adresseType1"/>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="roller" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="enhet" maxOccurs="unbounded">
+ *                               <complexType>
+ *                                 <complexContent>
+ *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                     <sequence>
+ *                                       <element name="rolleBeskrivelse">
+ *                                         <complexType>
+ *                                           <simpleContent>
+ *                                             <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                                               <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                             </extension>
+ *                                           </simpleContent>
+ *                                         </complexType>
+ *                                       </element>
+ *                                       <element name="orgnr">
+ *                                         <complexType>
+ *                                           <simpleContent>
+ *                                             <extension base="<http://www.w3.org/2001/XMLSchema>int">
+ *                                               <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                             </extension>
+ *                                           </simpleContent>
+ *                                         </complexType>
+ *                                       </element>
+ *                                       <element name="navn" type="{}navnType"/>
+ *                                       <element name="adresse">
+ *                                         <complexType>
+ *                                           <complexContent>
+ *                                             <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                               <sequence>
+ *                                                 <element name="forretningsAdresse" type="{}adresseType2" minOccurs="0"/>
+ *                                                 <element name="postAdresse" type="{}adresseType2" minOccurs="0"/>
+ *                                               </sequence>
+ *                                             </restriction>
+ *                                           </complexContent>
+ *                                         </complexType>
+ *                                       </element>
+ *                                     </sequence>
+ *                                     <attribute name="nr" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                                     <attribute name="registreringsDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+ *                                   </restriction>
+ *                                 </complexContent>
+ *                               </complexType>
+ *                             </element>
+ *                           </sequence>
+ *                           <attribute name="ledetekst" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="tjeneste" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "responseHeader", + "melding" +}) +@XmlRootElement(name = "grunndatautskrift") +public class GrunndataUtskrift { + + @XmlElement(required = true) + protected GrunndataUtskrift.ResponseHeader responseHeader; + protected GrunndataUtskrift.Melding melding; + + /** + * Gets the value of the responseHeader property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.ResponseHeader } + * + */ + public GrunndataUtskrift.ResponseHeader getResponseHeader() { + return responseHeader; + } + + /** + * Sets the value of the responseHeader property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.ResponseHeader } + * + */ + public void setResponseHeader(GrunndataUtskrift.ResponseHeader value) { + this.responseHeader = value; + } + + /** + * Gets the value of the melding property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.Melding } + * + */ + public GrunndataUtskrift.Melding getMelding() { + return melding; + } + + /** + * Sets the value of the melding property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.Melding } + * + */ + public void setMelding(GrunndataUtskrift.Melding value) { + this.melding = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="rolleInnehaver">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <choice>
+     *                     <element name="orgnr">
+     *                       <complexType>
+     *                         <simpleContent>
+     *                           <extension base="<http://www.w3.org/2001/XMLSchema>int">
+     *                             <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                           </extension>
+     *                         </simpleContent>
+     *                       </complexType>
+     *                     </element>
+     *                     <element name="fodselsnr">
+     *                       <complexType>
+     *                         <simpleContent>
+     *                           <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                             <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                           </extension>
+     *                         </simpleContent>
+     *                       </complexType>
+     *                     </element>
+     *                     <element name="fodselsdato">
+     *                       <complexType>
+     *                         <simpleContent>
+     *                           <extension base="<http://www.w3.org/2001/XMLSchema>date">
+     *                             <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                           </extension>
+     *                         </simpleContent>
+     *                       </complexType>
+     *                     </element>
+     *                   </choice>
+     *                   <element name="navn" type="{}navnType"/>
+     *                   <element name="adresse" type="{}adresseType1"/>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="roller" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="enhet" maxOccurs="unbounded">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                             <element name="rolleBeskrivelse">
+     *                               <complexType>
+     *                                 <simpleContent>
+     *                                   <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                                     <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                                   </extension>
+     *                                 </simpleContent>
+     *                               </complexType>
+     *                             </element>
+     *                             <element name="orgnr">
+     *                               <complexType>
+     *                                 <simpleContent>
+     *                                   <extension base="<http://www.w3.org/2001/XMLSchema>int">
+     *                                     <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *                                   </extension>
+     *                                 </simpleContent>
+     *                               </complexType>
+     *                             </element>
+     *                             <element name="navn" type="{}navnType"/>
+     *                             <element name="adresse">
+     *                               <complexType>
+     *                                 <complexContent>
+     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                                     <sequence>
+     *                                       <element name="forretningsAdresse" type="{}adresseType2" minOccurs="0"/>
+     *                                       <element name="postAdresse" type="{}adresseType2" minOccurs="0"/>
+     *                                     </sequence>
+     *                                   </restriction>
+     *                                 </complexContent>
+     *                               </complexType>
+     *                             </element>
+     *                           </sequence>
+     *                           <attribute name="nr" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                           <attribute name="registreringsDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *                 <attribute name="ledetekst" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="tjeneste" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "rolleInnehaver", + "roller" + }) + public static class Melding { + + @XmlElement(required = true) + protected GrunndataUtskrift.Melding.RolleInnehaver rolleInnehaver; + protected GrunndataUtskrift.Melding.Roller roller; + @XmlAttribute(name = "tjeneste", required = true) + protected String tjeneste; + + /** + * Gets the value of the rolleInnehaver property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.Melding.RolleInnehaver } + * + */ + public GrunndataUtskrift.Melding.RolleInnehaver getRolleInnehaver() { + return rolleInnehaver; + } + + /** + * Sets the value of the rolleInnehaver property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.Melding.RolleInnehaver } + * + */ + public void setRolleInnehaver(GrunndataUtskrift.Melding.RolleInnehaver value) { + this.rolleInnehaver = value; + } + + /** + * Gets the value of the roller property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.Melding.Roller } + * + */ + public GrunndataUtskrift.Melding.Roller getRoller() { + return roller; + } + + /** + * Sets the value of the roller property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.Melding.Roller } + * + */ + public void setRoller(GrunndataUtskrift.Melding.Roller value) { + this.roller = value; + } + + /** + * Gets the value of the tjeneste property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTjeneste() { + return tjeneste; + } + + /** + * Sets the value of the tjeneste property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTjeneste(String value) { + this.tjeneste = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <choice>
+         *           <element name="orgnr">
+         *             <complexType>
+         *               <simpleContent>
+         *                 <extension base="<http://www.w3.org/2001/XMLSchema>int">
+         *                   <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *                 </extension>
+         *               </simpleContent>
+         *             </complexType>
+         *           </element>
+         *           <element name="fodselsnr">
+         *             <complexType>
+         *               <simpleContent>
+         *                 <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *                   <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *                 </extension>
+         *               </simpleContent>
+         *             </complexType>
+         *           </element>
+         *           <element name="fodselsdato">
+         *             <complexType>
+         *               <simpleContent>
+         *                 <extension base="<http://www.w3.org/2001/XMLSchema>date">
+         *                   <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *                 </extension>
+         *               </simpleContent>
+         *             </complexType>
+         *           </element>
+         *         </choice>
+         *         <element name="navn" type="{}navnType"/>
+         *         <element name="adresse" type="{}adresseType1"/>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "orgnr", + "fodselsnr", + "fodselsdato", + "navn", + "adresse" + }) + public static class RolleInnehaver { + + protected GrunndataUtskrift.Melding.RolleInnehaver.Orgnr orgnr; + protected GrunndataUtskrift.Melding.RolleInnehaver.Fodselsnr fodselsnr; + protected GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato fodselsdato; + @XmlElement(required = true) + protected NavnType navn; + @XmlElement(required = true) + protected AdresseType1 adresse; + + /** + * Gets the value of the orgnr property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.Melding.RolleInnehaver.Orgnr } + * + */ + public GrunndataUtskrift.Melding.RolleInnehaver.Orgnr getOrgnr() { + return orgnr; + } + + /** + * Sets the value of the orgnr property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.Melding.RolleInnehaver.Orgnr } + * + */ + public void setOrgnr(GrunndataUtskrift.Melding.RolleInnehaver.Orgnr value) { + this.orgnr = value; + } + + /** + * Gets the value of the fodselsnr property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.Melding.RolleInnehaver.Fodselsnr } + * + */ + public GrunndataUtskrift.Melding.RolleInnehaver.Fodselsnr getFodselsnr() { + return fodselsnr; + } + + /** + * Sets the value of the fodselsnr property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.Melding.RolleInnehaver.Fodselsnr } + * + */ + public void setFodselsnr(GrunndataUtskrift.Melding.RolleInnehaver.Fodselsnr value) { + this.fodselsnr = value; + } + + /** + * Gets the value of the fodselsdato property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato } + * + */ + public GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato getFodselsdato() { + return fodselsdato; + } + + /** + * Sets the value of the fodselsdato property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato } + * + */ + public void setFodselsdato(GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato value) { + this.fodselsdato = value; + } + + /** + * Gets the value of the navn property. + * + * @return + * possible object is + * {@link NavnType } + * + */ + public NavnType getNavn() { + return navn; + } + + /** + * Sets the value of the navn property. + * + * @param value + * allowed object is + * {@link NavnType } + * + */ + public void setNavn(NavnType value) { + this.navn = value; + } + + /** + * Gets the value of the adresse property. + * + * @return + * possible object is + * {@link AdresseType1 } + * + */ + public AdresseType1 getAdresse() { + return adresse; + } + + /** + * Sets the value of the adresse property. + * + * @param value + * allowed object is + * {@link AdresseType1 } + * + */ + public void setAdresse(AdresseType1 value) { + this.adresse = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+             * <complexType>
+             *   <simpleContent>
+             *     <extension base="<http://www.w3.org/2001/XMLSchema>date">
+             *       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *     </extension>
+             *   </simpleContent>
+             * </complexType>
+             *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Fodselsdato { + + @XmlValue + @XmlSchemaType(name = "date") + protected XMLGregorianCalendar value; + @XmlAttribute(name = "ledetekst") + protected String ledetekst; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setValue(XMLGregorianCalendar value) { + this.value = value; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+             * <complexType>
+             *   <simpleContent>
+             *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+             *       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *     </extension>
+             *   </simpleContent>
+             * </complexType>
+             *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Fodselsnr { + + @XmlValue + protected String value; + @XmlAttribute(name = "ledetekst") + protected String ledetekst; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+             * <complexType>
+             *   <simpleContent>
+             *     <extension base="<http://www.w3.org/2001/XMLSchema>int">
+             *       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *     </extension>
+             *   </simpleContent>
+             * </complexType>
+             *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Orgnr { + + @XmlValue + protected int value; + @XmlAttribute(name = "ledetekst") + protected String ledetekst; + + /** + * Gets the value of the value property. + * + */ + public int getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(int value) { + this.value = value; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="enhet" maxOccurs="unbounded">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                   <element name="rolleBeskrivelse">
+         *                     <complexType>
+         *                       <simpleContent>
+         *                         <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *                           <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *                         </extension>
+         *                       </simpleContent>
+         *                     </complexType>
+         *                   </element>
+         *                   <element name="orgnr">
+         *                     <complexType>
+         *                       <simpleContent>
+         *                         <extension base="<http://www.w3.org/2001/XMLSchema>int">
+         *                           <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *                         </extension>
+         *                       </simpleContent>
+         *                     </complexType>
+         *                   </element>
+         *                   <element name="navn" type="{}navnType"/>
+         *                   <element name="adresse">
+         *                     <complexType>
+         *                       <complexContent>
+         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                           <sequence>
+         *                             <element name="forretningsAdresse" type="{}adresseType2" minOccurs="0"/>
+         *                             <element name="postAdresse" type="{}adresseType2" minOccurs="0"/>
+         *                           </sequence>
+         *                         </restriction>
+         *                       </complexContent>
+         *                     </complexType>
+         *                   </element>
+         *                 </sequence>
+         *                 <attribute name="nr" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *                 <attribute name="registreringsDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *       <attribute name="ledetekst" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "enhet" + }) + public static class Roller { + + @XmlElement(required = true) + protected List enhet; + @XmlAttribute(name = "ledetekst", required = true) + protected String ledetekst; + + /** + * Gets the value of the enhet property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the enhet property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getEnhet().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link GrunndataUtskrift.Melding.Roller.Enhet } + * + * + */ + public List getEnhet() { + if (enhet == null) { + enhet = new ArrayList(); + } + return this.enhet; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="rolleBeskrivelse">
+             *           <complexType>
+             *             <simpleContent>
+             *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+             *                 <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *               </extension>
+             *             </simpleContent>
+             *           </complexType>
+             *         </element>
+             *         <element name="orgnr">
+             *           <complexType>
+             *             <simpleContent>
+             *               <extension base="<http://www.w3.org/2001/XMLSchema>int">
+             *                 <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+             *               </extension>
+             *             </simpleContent>
+             *           </complexType>
+             *         </element>
+             *         <element name="navn" type="{}navnType"/>
+             *         <element name="adresse">
+             *           <complexType>
+             *             <complexContent>
+             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *                 <sequence>
+             *                   <element name="forretningsAdresse" type="{}adresseType2" minOccurs="0"/>
+             *                   <element name="postAdresse" type="{}adresseType2" minOccurs="0"/>
+             *                 </sequence>
+             *               </restriction>
+             *             </complexContent>
+             *           </complexType>
+             *         </element>
+             *       </sequence>
+             *       <attribute name="nr" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *       <attribute name="registreringsDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "rolleBeskrivelse", + "orgnr", + "navn", + "adresse" + }) + public static class Enhet { + + @XmlElement(required = true) + protected GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse rolleBeskrivelse; + @XmlElement(required = true) + protected GrunndataUtskrift.Melding.Roller.Enhet.Orgnr orgnr; + @XmlElement(required = true) + protected NavnType navn; + @XmlElement(required = true) + protected GrunndataUtskrift.Melding.Roller.Enhet.Adresse adresse; + @XmlAttribute(name = "nr", required = true) + protected int nr; + @XmlAttribute(name = "registreringsDato", required = true) + @XmlSchemaType(name = "date") + protected XMLGregorianCalendar registreringsDato; + + /** + * Gets the value of the rolleBeskrivelse property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse } + * + */ + public GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse getRolleBeskrivelse() { + return rolleBeskrivelse; + } + + /** + * Sets the value of the rolleBeskrivelse property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse } + * + */ + public void setRolleBeskrivelse(GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse value) { + this.rolleBeskrivelse = value; + } + + /** + * Gets the value of the orgnr property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.Melding.Roller.Enhet.Orgnr } + * + */ + public GrunndataUtskrift.Melding.Roller.Enhet.Orgnr getOrgnr() { + return orgnr; + } + + /** + * Sets the value of the orgnr property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.Melding.Roller.Enhet.Orgnr } + * + */ + public void setOrgnr(GrunndataUtskrift.Melding.Roller.Enhet.Orgnr value) { + this.orgnr = value; + } + + /** + * Gets the value of the navn property. + * + * @return + * possible object is + * {@link NavnType } + * + */ + public NavnType getNavn() { + return navn; + } + + /** + * Sets the value of the navn property. + * + * @param value + * allowed object is + * {@link NavnType } + * + */ + public void setNavn(NavnType value) { + this.navn = value; + } + + /** + * Gets the value of the adresse property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.Melding.Roller.Enhet.Adresse } + * + */ + public GrunndataUtskrift.Melding.Roller.Enhet.Adresse getAdresse() { + return adresse; + } + + /** + * Sets the value of the adresse property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.Melding.Roller.Enhet.Adresse } + * + */ + public void setAdresse(GrunndataUtskrift.Melding.Roller.Enhet.Adresse value) { + this.adresse = value; + } + + /** + * Gets the value of the nr property. + * + */ + public int getNr() { + return nr; + } + + /** + * Sets the value of the nr property. + * + */ + public void setNr(int value) { + this.nr = value; + } + + /** + * Gets the value of the registreringsDato property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getRegistreringsDato() { + return registreringsDato; + } + + /** + * Sets the value of the registreringsDato property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setRegistreringsDato(XMLGregorianCalendar value) { + this.registreringsDato = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+                 * <complexType>
+                 *   <complexContent>
+                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+                 *       <sequence>
+                 *         <element name="forretningsAdresse" type="{}adresseType2" minOccurs="0"/>
+                 *         <element name="postAdresse" type="{}adresseType2" minOccurs="0"/>
+                 *       </sequence>
+                 *     </restriction>
+                 *   </complexContent>
+                 * </complexType>
+                 *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "forretningsAdresse", + "postAdresse" + }) + public static class Adresse { + + protected AdresseType2 forretningsAdresse; + protected AdresseType2 postAdresse; + + /** + * Gets the value of the forretningsAdresse property. + * + * @return + * possible object is + * {@link AdresseType2 } + * + */ + public AdresseType2 getForretningsAdresse() { + return forretningsAdresse; + } + + /** + * Sets the value of the forretningsAdresse property. + * + * @param value + * allowed object is + * {@link AdresseType2 } + * + */ + public void setForretningsAdresse(AdresseType2 value) { + this.forretningsAdresse = value; + } + + /** + * Gets the value of the postAdresse property. + * + * @return + * possible object is + * {@link AdresseType2 } + * + */ + public AdresseType2 getPostAdresse() { + return postAdresse; + } + + /** + * Sets the value of the postAdresse property. + * + * @param value + * allowed object is + * {@link AdresseType2 } + * + */ + public void setPostAdresse(AdresseType2 value) { + this.postAdresse = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+                 * <complexType>
+                 *   <simpleContent>
+                 *     <extension base="<http://www.w3.org/2001/XMLSchema>int">
+                 *       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *     </extension>
+                 *   </simpleContent>
+                 * </complexType>
+                 *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class Orgnr { + + @XmlValue + protected int value; + @XmlAttribute(name = "ledetekst") + protected String ledetekst; + + /** + * Gets the value of the value property. + * + */ + public int getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(int value) { + this.value = value; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+                 * <complexType>
+                 *   <simpleContent>
+                 *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+                 *       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+                 *     </extension>
+                 *   </simpleContent>
+                 * </complexType>
+                 *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class RolleBeskrivelse { + + @XmlValue + protected String value; + @XmlAttribute(name = "ledetekst") + protected String ledetekst; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + + } + + } + + } + + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <choice>
+     *           <element name="orgnr" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *           <element name="fodselsnr">
+     *             <simpleType>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                 <length value="11"/>
+     *               </restriction>
+     *             </simpleType>
+     *           </element>
+     *           <element name="requestID" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     *         </choice>
+     *         <element name="hovedStatus" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *         <element name="underStatus">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="underStatusMelding" maxOccurs="unbounded">
+     *                     <complexType>
+     *                       <simpleContent>
+     *                         <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *                           <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *                         </extension>
+     *                       </simpleContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="prossessDato" use="required" type="{http://www.w3.org/2001/XMLSchema}date" />
+     *       <attribute name="tjeneste" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "orgnr", + "fodselsnr", + "requestID", + "hovedStatus", + "underStatus" + }) + public static class ResponseHeader { + + protected Integer orgnr; + protected String fodselsnr; + protected String requestID; + protected int hovedStatus; + @XmlElement(required = true) + protected GrunndataUtskrift.ResponseHeader.UnderStatus underStatus; + @XmlAttribute(name = "prossessDato", required = true) + @XmlSchemaType(name = "date") + protected XMLGregorianCalendar prossessDato; + @XmlAttribute(name = "tjeneste", required = true) + protected String tjeneste; + + /** + * Gets the value of the orgnr property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getOrgnr() { + return orgnr; + } + + /** + * Sets the value of the orgnr property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setOrgnr(Integer value) { + this.orgnr = value; + } + + /** + * Gets the value of the fodselsnr property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFodselsnr() { + return fodselsnr; + } + + /** + * Sets the value of the fodselsnr property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFodselsnr(String value) { + this.fodselsnr = value; + } + + /** + * Gets the value of the requestID property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRequestID() { + return requestID; + } + + /** + * Sets the value of the requestID property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRequestID(String value) { + this.requestID = value; + } + + /** + * Gets the value of the hovedStatus property. + * + */ + public int getHovedStatus() { + return hovedStatus; + } + + /** + * Sets the value of the hovedStatus property. + * + */ + public void setHovedStatus(int value) { + this.hovedStatus = value; + } + + /** + * Gets the value of the underStatus property. + * + * @return + * possible object is + * {@link GrunndataUtskrift.ResponseHeader.UnderStatus } + * + */ + public GrunndataUtskrift.ResponseHeader.UnderStatus getUnderStatus() { + return underStatus; + } + + /** + * Sets the value of the underStatus property. + * + * @param value + * allowed object is + * {@link GrunndataUtskrift.ResponseHeader.UnderStatus } + * + */ + public void setUnderStatus(GrunndataUtskrift.ResponseHeader.UnderStatus value) { + this.underStatus = value; + } + + /** + * Gets the value of the prossessDato property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getProssessDato() { + return prossessDato; + } + + /** + * Sets the value of the prossessDato property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setProssessDato(XMLGregorianCalendar value) { + this.prossessDato = value; + } + + /** + * Gets the value of the tjeneste property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTjeneste() { + return tjeneste; + } + + /** + * Sets the value of the tjeneste property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTjeneste(String value) { + this.tjeneste = value; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="underStatusMelding" maxOccurs="unbounded">
+         *           <complexType>
+         *             <simpleContent>
+         *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+         *                 <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *               </extension>
+         *             </simpleContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "underStatusMelding" + }) + public static class UnderStatus { + + @XmlElement(required = true) + protected List underStatusMelding; + + /** + * Gets the value of the underStatusMelding property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the Jakarta XML Binding object. + * This is why there is not a set method for the underStatusMelding property. + * + *

+ * For example, to add a new item, do as follows: + * 

+             *    getUnderStatusMelding().add(newItem);
+             *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link GrunndataUtskrift.ResponseHeader.UnderStatus.UnderStatusMelding } + * + * + */ + public List getUnderStatusMelding() { + if (underStatusMelding == null) { + underStatusMelding = new ArrayList(); + } + return this.underStatusMelding; + } + + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+             * <complexType>
+             *   <simpleContent>
+             *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+             *       <attribute name="kode" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+             *     </extension>
+             *   </simpleContent>
+             * </complexType>
+             *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "value" + }) + public static class UnderStatusMelding { + + @XmlValue + protected String value; + @XmlAttribute(name = "kode", required = true) + protected int kode; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the kode property. + * + */ + public int getKode() { + return kode; + } + + /** + * Sets the value of the kode property. + * + */ + public void setKode(int value) { + this.kode = value; + } + + } + + } + + } + +} diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/NavnType.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/NavnType.java new file mode 100644 index 00000000000..6e4845ccf22 --- /dev/null +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/NavnType.java @@ -0,0 +1,233 @@ + +package no.nav.brregstub.generated; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + + +/** + *

Java class for navnType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="navnType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="navn1">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="50"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="navn2" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="50"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="navn3" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="50"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="navn4" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="35"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="navn5" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="35"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="ledetekst" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "navnType", propOrder = { + "navn1", + "navn2", + "navn3", + "navn4", + "navn5" +}) +public class NavnType { + + @XmlElement(required = true) + protected String navn1; + protected String navn2; + protected String navn3; + protected String navn4; + protected String navn5; + @XmlAttribute(name = "ledetekst") + protected String ledetekst; + + /** + * Gets the value of the navn1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNavn1() { + return navn1; + } + + /** + * Sets the value of the navn1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNavn1(String value) { + this.navn1 = value; + } + + /** + * Gets the value of the navn2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNavn2() { + return navn2; + } + + /** + * Sets the value of the navn2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNavn2(String value) { + this.navn2 = value; + } + + /** + * Gets the value of the navn3 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNavn3() { + return navn3; + } + + /** + * Sets the value of the navn3 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNavn3(String value) { + this.navn3 = value; + } + + /** + * Gets the value of the navn4 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNavn4() { + return navn4; + } + + /** + * Sets the value of the navn4 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNavn4(String value) { + this.navn4 = value; + } + + /** + * Gets the value of the navn5 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNavn5() { + return navn5; + } + + /** + * Sets the value of the navn5 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNavn5(String value) { + this.navn5 = value; + } + + /** + * Gets the value of the ledetekst property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLedetekst() { + return ledetekst; + } + + /** + * Sets the value of the ledetekst property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLedetekst(String value) { + this.ledetekst = value; + } + +} diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/ObjectFactory.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/ObjectFactory.java new file mode 100644 index 00000000000..105f80bb1de --- /dev/null +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/generated/ObjectFactory.java @@ -0,0 +1,192 @@ + +package no.nav.brregstub.generated; + +import jakarta.xml.bind.annotation.XmlRegistry; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the xsd package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: xsd + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GrunndataUtskrift } + * + */ + public GrunndataUtskrift createGrunndatautskrift() { + return new GrunndataUtskrift(); + } + + /** + * Create an instance of {@link AdresseType2 } + * + */ + public AdresseType2 createAdresseType2() { + return new AdresseType2(); + } + + /** + * Create an instance of {@link AdresseType1 } + * + */ + public AdresseType1 createAdresseType1() { + return new AdresseType1(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.Melding } + * + */ + public GrunndataUtskrift.Melding createGrunndatautskriftMelding() { + return new GrunndataUtskrift.Melding(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.Melding.Roller } + * + */ + public GrunndataUtskrift.Melding.Roller createGrunndatautskriftMeldingRoller() { + return new GrunndataUtskrift.Melding.Roller(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.Melding.Roller.Enhet } + * + */ + public GrunndataUtskrift.Melding.Roller.Enhet createGrunndatautskriftMeldingRollerEnhet() { + return new GrunndataUtskrift.Melding.Roller.Enhet(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.Melding.RolleInnehaver } + * + */ + public GrunndataUtskrift.Melding.RolleInnehaver createGrunndatautskriftMeldingRolleInnehaver() { + return new GrunndataUtskrift.Melding.RolleInnehaver(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.ResponseHeader } + * + */ + public GrunndataUtskrift.ResponseHeader createGrunndatautskriftResponseHeader() { + return new GrunndataUtskrift.ResponseHeader(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.ResponseHeader.UnderStatus } + * + */ + public GrunndataUtskrift.ResponseHeader.UnderStatus createGrunndatautskriftResponseHeaderUnderStatus() { + return new GrunndataUtskrift.ResponseHeader.UnderStatus(); + } + + /** + * Create an instance of {@link NavnType } + * + */ + public NavnType createNavnType() { + return new NavnType(); + } + + /** + * Create an instance of {@link AdresseType2 .Kommune } + * + */ + public AdresseType2 .Kommune createAdresseType2Kommune() { + return new AdresseType2 .Kommune(); + } + + /** + * Create an instance of {@link AdresseType2 .Land } + * + */ + public AdresseType2 .Land createAdresseType2Land() { + return new AdresseType2 .Land(); + } + + /** + * Create an instance of {@link AdresseType1 .Land } + * + */ + public AdresseType1 .Land createAdresseType1Land() { + return new AdresseType1 .Land(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse } + * + */ + public GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse createGrunndatautskriftMeldingRollerEnhetRolleBeskrivelse() { + return new GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.Melding.Roller.Enhet.Orgnr } + * + */ + public GrunndataUtskrift.Melding.Roller.Enhet.Orgnr createGrunndatautskriftMeldingRollerEnhetOrgnr() { + return new GrunndataUtskrift.Melding.Roller.Enhet.Orgnr(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.Melding.Roller.Enhet.Adresse } + * + */ + public GrunndataUtskrift.Melding.Roller.Enhet.Adresse createGrunndatautskriftMeldingRollerEnhetAdresse() { + return new GrunndataUtskrift.Melding.Roller.Enhet.Adresse(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.Melding.RolleInnehaver.Orgnr } + * + */ + public GrunndataUtskrift.Melding.RolleInnehaver.Orgnr createGrunndatautskriftMeldingRolleInnehaverOrgnr() { + return new GrunndataUtskrift.Melding.RolleInnehaver.Orgnr(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.Melding.RolleInnehaver.Fodselsnr } + * + */ + public GrunndataUtskrift.Melding.RolleInnehaver.Fodselsnr createGrunndatautskriftMeldingRolleInnehaverFodselsnr() { + return new GrunndataUtskrift.Melding.RolleInnehaver.Fodselsnr(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato } + * + */ + public GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato createGrunndatautskriftMeldingRolleInnehaverFodselsdato() { + return new GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato(); + } + + /** + * Create an instance of {@link GrunndataUtskrift.ResponseHeader.UnderStatus.UnderStatusMelding } + * + */ + public GrunndataUtskrift.ResponseHeader.UnderStatus.UnderStatusMelding createGrunndatautskriftResponseHeaderUnderStatusUnderStatusMelding() { + return new GrunndataUtskrift.ResponseHeader.UnderStatus.UnderStatusMelding(); + } + +} diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/mapper/HentRolleMapper.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/mapper/HentRolleMapper.java index d2940204e80..d931bc978c9 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/mapper/HentRolleMapper.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/mapper/HentRolleMapper.java @@ -5,11 +5,7 @@ import no.nav.brregstub.api.common.RsOrganisasjon; import no.nav.brregstub.api.common.RsPersonOgRolle; import no.nav.brregstub.api.common.RsSamendring; -import no.nav.brregstub.tjenestekontrakter.hentroller.Grunndata; -import no.nav.brregstub.tjenestekontrakter.hentroller.Grunndata.Melding; -import no.nav.brregstub.tjenestekontrakter.hentroller.Grunndata.Melding.Eierkommune.Samendring; -import no.nav.brregstub.tjenestekontrakter.hentroller.Grunndata.ResponseHeader; -import no.nav.brregstub.tjenestekontrakter.hentroller.Grunndata.ResponseHeader.UnderStatus.UnderStatusMelding; +import no.nav.brregstub.generated.Grunndata; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; @@ -34,15 +30,15 @@ public static Grunndata map(RsOrganisasjon rsOrganisasjon) { return grunndata; } - private static ResponseHeader mapTilResponseHeader(RsOrganisasjon rsOrganisasjon) { - var responseHeader = new ResponseHeader(); + private static Grunndata.ResponseHeader mapTilResponseHeader(RsOrganisasjon rsOrganisasjon) { + var responseHeader = new Grunndata.ResponseHeader(); responseHeader.setProssessDato(localDateToXmlGregorianCalendar(LocalDate.now())); responseHeader.setTjeneste(TJENESTE_NAVN); responseHeader.setOrgnr(rsOrganisasjon.getOrgnr()); responseHeader.setHovedStatus(rsOrganisasjon.getHovedstatus() == null ? 0 : rsOrganisasjon.getHovedstatus()); - var underStatus = new ResponseHeader.UnderStatus(); + var underStatus = new Grunndata.ResponseHeader.UnderStatus(); for (Integer understatus : rsOrganisasjon.getUnderstatuser()) { - var underStatusMelding = new UnderStatusMelding(); + var underStatusMelding = new Grunndata.ResponseHeader.UnderStatus.UnderStatusMelding(); underStatusMelding.setKode(understatus); underStatusMelding.setValue(understatusKoder.get(understatus)); @@ -52,8 +48,8 @@ private static ResponseHeader mapTilResponseHeader(RsOrganisasjon rsOrganisasjon return responseHeader; } - private static Melding mapTilMelding(RsOrganisasjon rsOrganisasjon) { - var melding = new Melding(); + private static Grunndata.Melding mapTilMelding(RsOrganisasjon rsOrganisasjon) { + var melding = new Grunndata.Melding(); melding.setOrganisasjonsnummer(mapTilOrganisasjonsNummer(rsOrganisasjon)); melding.setKontaktperson(mapTilKontaktperson(rsOrganisasjon)); melding.setStyre(mapTilStyre(rsOrganisasjon)); @@ -65,57 +61,57 @@ private static Melding mapTilMelding(RsOrganisasjon rsOrganisasjon) { return melding; } - private static Melding.Kontaktperson mapTilKontaktperson(RsOrganisasjon rsOrganisasjon) { + private static Grunndata.Melding.Kontaktperson mapTilKontaktperson(RsOrganisasjon rsOrganisasjon) { if (rsOrganisasjon.getKontaktperson() != null) { - var kontaktperson = new Melding.Kontaktperson(); + var kontaktperson = new Grunndata.Melding.Kontaktperson(); kontaktperson.getSamendring().add(mapTilSamendring(rsOrganisasjon.getKontaktperson(), RolleKode.KONT)); return kontaktperson; } return null; } - private static Melding.Styre mapTilStyre(RsOrganisasjon rsOrganisasjon) { + private static Grunndata.Melding.Styre mapTilStyre(RsOrganisasjon rsOrganisasjon) { if (rsOrganisasjon.getStyre() != null) { - var styre = new Melding.Styre(); + var styre = new Grunndata.Melding.Styre(); styre.getSamendring().add(mapTilSamendring(rsOrganisasjon.getStyre(), RolleKode.STYR)); return styre; } return null; } - private static Melding.Deltakere mapTilDeltakere(RsOrganisasjon rsOrganisasjon) { + private static Grunndata.Melding.Deltakere mapTilDeltakere(RsOrganisasjon rsOrganisasjon) { if (rsOrganisasjon.getDeltakere() != null) { - var deltakere = new Melding.Deltakere(); + var deltakere = new Grunndata.Melding.Deltakere(); deltakere.getSamendring().add(mapTilSamendring(rsOrganisasjon.getDeltakere(), RolleKode.DELT)); return deltakere; } return null; } - private static Melding.Komplementar mapTilKomplementar(RsOrganisasjon rsOrganisasjon) { + private static Grunndata.Melding.Komplementar mapTilKomplementar(RsOrganisasjon rsOrganisasjon) { if (rsOrganisasjon.getKomplementar() != null) { - var komplementar = new Melding.Komplementar(); + var komplementar = new Grunndata.Melding.Komplementar(); komplementar.getSamendring().add(mapTilSamendring(rsOrganisasjon.getKomplementar(), RolleKode.KOMP)); return komplementar; } return null; } - private static Melding.Sameiere mapTilSameiere(RsOrganisasjon rsOrganisasjon) { + private static Grunndata.Melding.Sameiere mapTilSameiere(RsOrganisasjon rsOrganisasjon) { if (rsOrganisasjon.getSameier() != null) { - var sameier = new Melding.Sameiere(); + var sameier = new Grunndata.Melding.Sameiere(); sameier.getSamendring().add(mapTilSamendring(rsOrganisasjon.getSameier(), RolleKode.SAM)); return sameier; } return null; } - private static Samendring mapTilSamendring( + private static Grunndata.Melding.Eierkommune.Samendring mapTilSamendring( RsSamendring rsSamendring, RolleKode rolleKode ) { if (!rsSamendring.getRoller().isEmpty()) { - var samendring = new Samendring(); + var samendring = new Grunndata.Melding.Eierkommune.Samendring(); samendring.setSamendringstype(rolleKode.name()); samendring.setBeskrivelse(rolleKode.getBeskrivelse()); samendring.setRegistreringsDato(localDateToXmlGregorianCalendar(rsSamendring.getRegistringsDato())); @@ -129,12 +125,12 @@ private static Samendring mapTilSamendring( return null; } - private static Samendring.Rolle mapTilSamendringRolle(RsPersonOgRolle rsPersonOgRolle) { - var rolle = new Samendring.Rolle(); + private static Grunndata.Melding.Eierkommune.Samendring.Rolle mapTilSamendringRolle(RsPersonOgRolle rsPersonOgRolle) { + var rolle = new Grunndata.Melding.Eierkommune.Samendring.Rolle(); rolle.setBeskrivelse(rsPersonOgRolle.getRollebeskrivelse()); rolle.setRolletype(rsPersonOgRolle.getRolle()); - var person = new Samendring.Rolle.Person(); + var person = new Grunndata.Melding.Eierkommune.Samendring.Rolle.Person(); person.setBeskrivelse("Lever"); person.setStatuskode("L"); person.setFodselsnr(rsPersonOgRolle.getFodselsnr()); @@ -144,7 +140,7 @@ private static Samendring.Rolle mapTilSamendringRolle(RsPersonOgRolle rsPersonOg person.setFratraadt(rsPersonOgRolle.isFratraadt() ? "F" : "N"); person.setPoststed(rsPersonOgRolle.getPoststed()); person.setPostnr((rsPersonOgRolle.getPostnr())); - var land = new Samendring.Rolle.Person.Land(); + var land = new Grunndata.Melding.Eierkommune.Samendring.Rolle.Person.Land(); land.setLandkode4("NOR"); land.setValue("Norge"); person.setLand(land); @@ -152,8 +148,8 @@ private static Samendring.Rolle mapTilSamendringRolle(RsPersonOgRolle rsPersonOg return rolle; } - private static Melding.Organisasjonsnummer mapTilOrganisasjonsNummer(RsOrganisasjon rsOrganisasjon) { - var orgnr = new Melding.Organisasjonsnummer(); + private static Grunndata.Melding.Organisasjonsnummer mapTilOrganisasjonsNummer(RsOrganisasjon rsOrganisasjon) { + var orgnr = new Grunndata.Melding.Organisasjonsnummer(); orgnr.setRegistreringsDato(localDateToXmlGregorianCalendar(rsOrganisasjon.getRegistreringsdato())); orgnr.setValue(String.valueOf(rsOrganisasjon.getOrgnr())); return orgnr; diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/mapper/RolleoversiktMapper.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/mapper/RolleoversiktMapper.java index 3894e84752e..b9ab6c9faa8 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/mapper/RolleoversiktMapper.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/mapper/RolleoversiktMapper.java @@ -1,14 +1,6 @@ package no.nav.brregstub.mapper; -import static java.time.format.DateTimeFormatter.ISO_DATE; -import static no.nav.brregstub.api.common.UnderstatusKode.understatusKoder; - import lombok.SneakyThrows; - -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; -import java.time.LocalDate; - import no.nav.brregstub.api.common.RolleKode; import no.nav.brregstub.api.common.RsAdresse; import no.nav.brregstub.api.common.RsNavn; @@ -16,24 +8,24 @@ import no.nav.brregstub.api.v1.RolleoversiktTo; import no.nav.brregstub.api.v2.RsRolle; import no.nav.brregstub.api.v2.RsRolleoversikt; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.AdresseType1; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.AdresseType2; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.Grunndata; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.Grunndata.Melding; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.Grunndata.Melding.RolleInnehaver; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.Grunndata.Melding.RolleInnehaver.Fodselsdato; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.Grunndata.Melding.Roller.Enhet; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.Grunndata.ResponseHeader; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.Grunndata.ResponseHeader.UnderStatus; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.Grunndata.ResponseHeader.UnderStatus.UnderStatusMelding; -import no.nav.brregstub.tjenestekontrakter.rolleutskrift.NavnType; +import no.nav.brregstub.generated.AdresseType1; +import no.nav.brregstub.generated.AdresseType2; +import no.nav.brregstub.generated.GrunndataUtskrift; +import no.nav.brregstub.generated.NavnType; + +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; +import java.time.LocalDate; + +import static java.time.format.DateTimeFormatter.ISO_DATE; +import static no.nav.brregstub.api.common.UnderstatusKode.understatusKoder; public class RolleoversiktMapper { public static final String TJENESTE_NAVN = "hentRolleutskrift"; - public static Grunndata map(RolleoversiktTo to) { - var grunndata = new Grunndata(); + public static GrunndataUtskrift map(RolleoversiktTo to) { + var grunndata = new GrunndataUtskrift(); var responseHeader = mapTilResponseHeader(to); grunndata.setResponseHeader(responseHeader); @@ -45,8 +37,8 @@ public static Grunndata map(RolleoversiktTo to) { return grunndata; } - public static Grunndata map(RsRolleoversikt rsRolleoversikt) { - var grunndata = new Grunndata(); + public static GrunndataUtskrift map(RsRolleoversikt rsRolleoversikt) { + var grunndata = new GrunndataUtskrift(); var responseHeader = mapTilResponseHeader(rsRolleoversikt); grunndata.setResponseHeader(responseHeader); @@ -58,22 +50,50 @@ public static Grunndata map(RsRolleoversikt rsRolleoversikt) { return grunndata; } - private static ResponseHeader mapTilResponseHeader(RolleoversiktTo to) { - var responseHeader = new ResponseHeader(); + public static GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse mapTilRollebeskrivelse(String beskrivelseTo) { + var beskrivelse = new GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse(); + beskrivelse.setValue(beskrivelseTo); + beskrivelse.setLedetekst("Rolle"); + return beskrivelse; + } + + public static GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse mapTilRollebeskrivelse(RolleKode rolleKode) { + var beskrivelse = new GrunndataUtskrift.Melding.Roller.Enhet.RolleBeskrivelse(); + beskrivelse.setValue(rolleKode.getBeskrivelse()); + beskrivelse.setLedetekst("Rolle"); + return beskrivelse; + } + + public static GrunndataUtskrift.Melding.Roller.Enhet.Orgnr mapTilOrganisasjonsNummer(Integer orgnrTo) { + var orgnr = new GrunndataUtskrift.Melding.Roller.Enhet.Orgnr(); + orgnr.setValue(orgnrTo); + return orgnr; + } + + public static NavnType mapTilNavntype(RsNavn rsNavn) { + var navn = new NavnType(); + navn.setNavn1(rsNavn.getNavn1()); + navn.setNavn2(rsNavn.getNavn2()); + navn.setNavn3(rsNavn.getNavn3()); + return navn; + } + + private static GrunndataUtskrift.ResponseHeader mapTilResponseHeader(RolleoversiktTo to) { + var responseHeader = new GrunndataUtskrift.ResponseHeader(); responseHeader.setProssessDato(localDateToXmlGregorianCalendar(LocalDate.now())); responseHeader.setTjeneste(TJENESTE_NAVN); responseHeader.setFodselsnr(to.getFnr()); responseHeader.setHovedStatus(to.getHovedstatus()); - var underStatus = new UnderStatus(); + var underStatus = new GrunndataUtskrift.ResponseHeader.UnderStatus(); if (to.getUnderstatuser().isEmpty()) { - var underStatusMelding = new UnderStatusMelding(); + var underStatusMelding = new GrunndataUtskrift.ResponseHeader.UnderStatus.UnderStatusMelding(); underStatusMelding.setKode(0); underStatusMelding.setValue(understatusKoder.get(0)); underStatus.getUnderStatusMelding().add(underStatusMelding); } else { to.getUnderstatuser().forEach(understatus -> { - var underStatusMelding = new UnderStatusMelding(); + var underStatusMelding = new GrunndataUtskrift.ResponseHeader.UnderStatus.UnderStatusMelding(); underStatusMelding.setKode(understatus); underStatusMelding.setValue(understatusKoder.get(understatus)); underStatus.getUnderStatusMelding().add(underStatusMelding); @@ -84,22 +104,22 @@ private static ResponseHeader mapTilResponseHeader(RolleoversiktTo to) { return responseHeader; } - private static ResponseHeader mapTilResponseHeader(RsRolleoversikt rsRolleoversikt) { - var responseHeader = new ResponseHeader(); + private static GrunndataUtskrift.ResponseHeader mapTilResponseHeader(RsRolleoversikt rsRolleoversikt) { + var responseHeader = new GrunndataUtskrift.ResponseHeader(); responseHeader.setProssessDato(localDateToXmlGregorianCalendar(LocalDate.now())); responseHeader.setTjeneste(TJENESTE_NAVN); responseHeader.setFodselsnr(rsRolleoversikt.getFnr()); responseHeader.setHovedStatus(rsRolleoversikt.getHovedstatus()); - var underStatus = new UnderStatus(); + var underStatus = new GrunndataUtskrift.ResponseHeader.UnderStatus(); if (rsRolleoversikt.getUnderstatuser().isEmpty()) { - var underStatusMelding = new UnderStatusMelding(); + var underStatusMelding = new GrunndataUtskrift.ResponseHeader.UnderStatus.UnderStatusMelding(); underStatusMelding.setKode(0); underStatusMelding.setValue(understatusKoder.get(0)); underStatus.getUnderStatusMelding().add(underStatusMelding); } else { rsRolleoversikt.getUnderstatuser().forEach(understatus -> { - var underStatusMelding = new UnderStatusMelding(); + var underStatusMelding = new GrunndataUtskrift.ResponseHeader.UnderStatus.UnderStatusMelding(); underStatusMelding.setKode(understatus); underStatusMelding.setValue(understatusKoder.get(understatus)); underStatus.getUnderStatusMelding().add(underStatusMelding); @@ -110,8 +130,8 @@ private static ResponseHeader mapTilResponseHeader(RsRolleoversikt rsRolleoversi return responseHeader; } - private static Melding mapTilMelding(RolleoversiktTo to) { - var melding = new Melding(); + private static GrunndataUtskrift.Melding mapTilMelding(RolleoversiktTo to) { + var melding = new GrunndataUtskrift.Melding(); melding.setRolleInnehaver(mapTilRolleInnhaver(to)); melding.setRoller(mapTilRoller(to)); melding.setTjeneste(TJENESTE_NAVN); @@ -119,8 +139,8 @@ private static Melding mapTilMelding(RolleoversiktTo to) { return melding; } - private static Melding mapTilMelding(RsRolleoversikt rsRolleoversikt) { - var melding = new Melding(); + private static GrunndataUtskrift.Melding mapTilMelding(RsRolleoversikt rsRolleoversikt) { + var melding = new GrunndataUtskrift.Melding(); melding.setRolleInnehaver(mapTilRolleInnhaver(rsRolleoversikt)); melding.setRoller(mapTilRoller(rsRolleoversikt)); melding.setTjeneste(TJENESTE_NAVN); @@ -128,12 +148,12 @@ private static Melding mapTilMelding(RsRolleoversikt rsRolleoversikt) { return melding; } - private static Melding.Roller mapTilRoller(RolleoversiktTo to) { - var roller = new Melding.Roller(); + private static GrunndataUtskrift.Melding.Roller mapTilRoller(RolleoversiktTo to) { + var roller = new GrunndataUtskrift.Melding.Roller(); if (to.getEnheter() != null) { int count = 1; for (RolleTo enhetTo : to.getEnheter()) { - var enhet = new Enhet(); + var enhet = new GrunndataUtskrift.Melding.Roller.Enhet(); enhet.setRolleBeskrivelse(mapTilRollebeskrivelse(enhetTo.getRollebeskrivelse())); enhet.setNr(count); count++; @@ -147,12 +167,12 @@ private static Melding.Roller mapTilRoller(RolleoversiktTo to) { return roller; } - private static Melding.Roller mapTilRoller(RsRolleoversikt rsRolleoversikt) { - var roller = new Melding.Roller(); + private static GrunndataUtskrift.Melding.Roller mapTilRoller(RsRolleoversikt rsRolleoversikt) { + var roller = new GrunndataUtskrift.Melding.Roller(); if (rsRolleoversikt.getEnheter() != null) { int count = 1; for (RsRolle rsRolle : rsRolleoversikt.getEnheter()) { - var enhet = new Enhet(); + var enhet = new GrunndataUtskrift.Melding.Roller.Enhet(); enhet.setRolleBeskrivelse(mapTilRollebeskrivelse(rsRolle.getRolle())); enhet.setNr(count); count++; @@ -166,48 +186,20 @@ private static Melding.Roller mapTilRoller(RsRolleoversikt rsRolleoversikt) { return roller; } - public static Enhet.RolleBeskrivelse mapTilRollebeskrivelse(String beskrivelseTo) { - var beskrivelse = new Enhet.RolleBeskrivelse(); - beskrivelse.setValue(beskrivelseTo); - beskrivelse.setLedetekst("Rolle"); - return beskrivelse; - } - - public static Enhet.RolleBeskrivelse mapTilRollebeskrivelse(RolleKode rolleKode) { - var beskrivelse = new Enhet.RolleBeskrivelse(); - beskrivelse.setValue(rolleKode.getBeskrivelse()); - beskrivelse.setLedetekst("Rolle"); - return beskrivelse; - } - - public static Enhet.Orgnr mapTilOrganisasjonsNummer(Integer orgnrTo) { - var orgnr = new Enhet.Orgnr(); - orgnr.setValue(orgnrTo); - return orgnr; - } - - public static NavnType mapTilNavntype(RsNavn rsNavn) { - var navn = new NavnType(); - navn.setNavn1(rsNavn.getNavn1()); - navn.setNavn2(rsNavn.getNavn2()); - navn.setNavn3(rsNavn.getNavn3()); - return navn; - } - - private static RolleInnehaver mapTilRolleInnhaver(RolleoversiktTo to) { - var rolleInnehaver = new RolleInnehaver(); + private static GrunndataUtskrift.Melding.RolleInnehaver mapTilRolleInnhaver(RolleoversiktTo to) { + var rolleInnehaver = new GrunndataUtskrift.Melding.RolleInnehaver(); rolleInnehaver.setNavn(mapTilNavntype(to.getNavn())); - Fodselsdato fødselsdato = new Fodselsdato(); + GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato fødselsdato = new GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato(); fødselsdato.setValue(localDateToXmlGregorianCalendar(to.getFodselsdato())); rolleInnehaver.setFodselsdato(fødselsdato); rolleInnehaver.setAdresse(mapTilAdresse(to.getAdresse())); return rolleInnehaver; } - private static RolleInnehaver mapTilRolleInnhaver(RsRolleoversikt rsRolleoversikt) { - var rolleInnehaver = new RolleInnehaver(); + private static GrunndataUtskrift.Melding.RolleInnehaver mapTilRolleInnhaver(RsRolleoversikt rsRolleoversikt) { + var rolleInnehaver = new GrunndataUtskrift.Melding.RolleInnehaver(); rolleInnehaver.setNavn(mapTilNavntype(rsRolleoversikt.getNavn())); - Fodselsdato fødselsdato = new Fodselsdato(); + GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato fødselsdato = new GrunndataUtskrift.Melding.RolleInnehaver.Fodselsdato(); fødselsdato.setValue(localDateToXmlGregorianCalendar(rsRolleoversikt.getFodselsdato())); rolleInnehaver.setFodselsdato(fødselsdato); rolleInnehaver.setAdresse(mapTilAdresse(rsRolleoversikt.getAdresse())); @@ -252,15 +244,15 @@ private static AdresseType2 mapTilAdresse2(RsAdresse rsAdresse) { return adresse; } - private static Enhet.Adresse mapTilAdresseEnhet(RolleTo to) { - var adresse = new Enhet.Adresse(); + private static GrunndataUtskrift.Melding.Roller.Enhet.Adresse mapTilAdresseEnhet(RolleTo to) { + var adresse = new GrunndataUtskrift.Melding.Roller.Enhet.Adresse(); adresse.setForretningsAdresse(mapTilAdresse2(to.getForretningsAdresse())); adresse.setPostAdresse(mapTilAdresse2(to.getPostAdresse())); return adresse; } - private static Enhet.Adresse mapTilAdresseEnhet(RsRolle rsRolle) { - var adresse = new Enhet.Adresse(); + private static GrunndataUtskrift.Melding.Roller.Enhet.Adresse mapTilAdresseEnhet(RsRolle rsRolle) { + var adresse = new GrunndataUtskrift.Melding.Roller.Enhet.Adresse(); adresse.setForretningsAdresse(mapTilAdresse2(rsRolle.getForretningsAdresse())); adresse.setPostAdresse(mapTilAdresse2(rsRolle.getPostAdresse())); return adresse; diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/service/BrregService.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/service/BrregService.java index 9b3807d4075..af8a2d14ef7 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/service/BrregService.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/service/BrregService.java @@ -7,9 +7,10 @@ import no.nav.brregstub.api.v1.RolleoversiktTo; import no.nav.brregstub.database.repository.HentRolleRepository; import no.nav.brregstub.database.repository.RolleoversiktRepository; +import no.nav.brregstub.generated.Grunndata; +import no.nav.brregstub.generated.GrunndataUtskrift; import no.nav.brregstub.mapper.HentRolleMapper; import no.nav.brregstub.mapper.RolleoversiktMapper; -import no.nav.brregstub.tjenestekontrakter.hentroller.Grunndata; import org.springframework.stereotype.Service; @Service @@ -43,7 +44,7 @@ public Grunndata hentRoller(String orgnummer) { } @SneakyThrows - public no.nav.brregstub.tjenestekontrakter.rolleutskrift.Grunndata hentRolleutskrift(String requestId) { + public GrunndataUtskrift hentRolleutskrift(String requestId) { var rolleutskrift = rolleoversiktRepository.findByIdent(requestId); if (rolleutskrift.isPresent()) { var d = objectMapper.readValue(rolleutskrift.get().getJson(), RolleoversiktTo.class); diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java index 5ab00a904b1..b414591e5d4 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java @@ -1,5 +1,7 @@ package no.nav.brregstub.ws; +import jakarta.xml.bind.JAXB; +import jakarta.xml.bind.JAXBElement; import no.nav.brregstub.service.BrregService; import no.nav.brregstub.tjenestekontrakter.ws.HentRoller; import no.nav.brregstub.tjenestekontrakter.ws.HentRollerResponse; @@ -13,8 +15,6 @@ import org.springframework.ws.server.endpoint.annotation.RequestPayload; import org.springframework.ws.server.endpoint.annotation.ResponsePayload; -import javax.xml.bind.JAXB; -import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import java.io.StringWriter; diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/ws/BrregEndpointTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/ws/BrregEndpointTest.java index b41d0c565e1..60bc0b4c1dc 100644 --- a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/ws/BrregEndpointTest.java +++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/ws/BrregEndpointTest.java @@ -1,9 +1,5 @@ package no.nav.brregstub.endpoint.ws; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; - import no.nav.brregstub.tjenestekontrakter.ws.ErFr; import no.nav.common.cxf.CXFClient; import org.junit.jupiter.api.BeforeAll; @@ -15,6 +11,8 @@ import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @SpringBootTest(webEnvironment = RANDOM_PORT) @ActiveProfiles("test") diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java index 49e09f830d5..a4788f6594e 100644 --- a/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java +++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java @@ -8,7 +8,7 @@ import no.nav.brregstub.database.domene.Rolleoversikt; import no.nav.brregstub.database.repository.HentRolleRepository; import no.nav.brregstub.database.repository.RolleoversiktRepository; -import no.nav.brregstub.tjenestekontrakter.hentroller.Grunndata; +import no.nav.brregstub.generated.Grunndata; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; From e7262f80e95bcd3547641ed7a75645f6c5b5180b Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 09:05:51 +0200 Subject: [PATCH 12/49] Brreg-stub hibernate 6 migrering #deploy-brreg-stub --- .../no/nav/brregstub/database/domene/HentRolle.java | 10 +++++++++- .../nav/brregstub/database/domene/Rolleoversikt.java | 10 +++++++++- .../java/no/nav/brregstub/jpa/HibernateConstants.java | 9 +++++++++ proxies/aareg-proxy/build.gradle | 7 ++++--- 4 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 apps/brreg-stub/src/main/java/no/nav/brregstub/jpa/HibernateConstants.java diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java index 6b7e319927e..197f63a5fde 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java @@ -4,6 +4,9 @@ import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import org.hibernate.annotations.GenericGenerator; + +import static no.nav.brregstub.jpa.HibernateConstants.SEQUENCE_STYLE_GENERATOR; @Entity @Getter @@ -12,7 +15,12 @@ public class HentRolle { @Id - @GeneratedValue + @GeneratedValue(generator = "hentRolleIdGenerator") + @GenericGenerator(name = "hentRolleIdGenerator", strategy = SEQUENCE_STYLE_GENERATOR, parameters = { + @org.hibernate.annotations.Parameter(name = "sequence_name", value = "HENTROLLE_SEQ"), + @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), + @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") + }) private Long id; @NotNull(message = "orgnr must not be null") diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java index e630e4e6a26..a8378520f0b 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java @@ -4,6 +4,9 @@ import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import org.hibernate.annotations.GenericGenerator; + +import static no.nav.brregstub.jpa.HibernateConstants.SEQUENCE_STYLE_GENERATOR; @Entity @Getter @@ -12,7 +15,12 @@ public class Rolleoversikt { @Id - @GeneratedValue + @GeneratedValue(generator = "rolleOversiktIdGenerator") + @GenericGenerator(name = "rolleOversiktIdGenerator", strategy = SEQUENCE_STYLE_GENERATOR, parameters = { + @org.hibernate.annotations.Parameter(name = "sequence_name", value = "ROLLEOVERSIKT_SEQ"), + @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), + @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") + }) private Long id; @NotNull(message = "fnr must not be null") diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/jpa/HibernateConstants.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/jpa/HibernateConstants.java new file mode 100644 index 00000000000..9bbda425c1c --- /dev/null +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/jpa/HibernateConstants.java @@ -0,0 +1,9 @@ +package no.nav.brregstub.jpa; + +import lombok.experimental.UtilityClass; + +@UtilityClass +public class HibernateConstants { + + public static final String SEQUENCE_STYLE_GENERATOR = "org.hibernate.id.enhanced.SequenceStyleGenerator"; +} diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index 803112cbebf..c282f9f5f54 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -72,7 +72,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' } - java { - sourceCompatibility = JavaVersion.VERSION_21 -} \ No newline at end of file + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} From 3941f33e5dcd00b0c68631dde5eed598f7f9e151 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 09:20:04 +0200 Subject: [PATCH 13/49] Brreg-stub hibernate 6 migrering #deploy-brreg-stub --- .../brregstub/database/domene/HentRolle.java | 23 +++++++++++-------- .../database/domene/Rolleoversikt.java | 23 +++++++++++-------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java index 197f63a5fde..8749912355c 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java @@ -1,12 +1,14 @@ package no.nav.brregstub.database.domene; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import static no.nav.brregstub.jpa.HibernateConstants.SEQUENCE_STYLE_GENERATOR; @Entity @Getter @@ -15,12 +17,13 @@ public class HentRolle { @Id - @GeneratedValue(generator = "hentRolleIdGenerator") - @GenericGenerator(name = "hentRolleIdGenerator", strategy = SEQUENCE_STYLE_GENERATOR, parameters = { - @org.hibernate.annotations.Parameter(name = "sequence_name", value = "HENTROLLE_SEQ"), - @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), - @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") - }) + @GeneratedValue(strategy = GenerationType.IDENTITY) +// @GeneratedValue(generator = "hentRolleIdGenerator") +// @GenericGenerator(name = "hentRolleIdGenerator", strategy = SEQUENCE_STYLE_GENERATOR, parameters = { +// @org.hibernate.annotations.Parameter(name = "sequence_name", value = "HENTROLLE_SEQ"), +// @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), +// @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") +// }) private Long id; @NotNull(message = "orgnr must not be null") diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java index a8378520f0b..26bf845c48e 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java @@ -1,12 +1,14 @@ package no.nav.brregstub.database.domene; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import static no.nav.brregstub.jpa.HibernateConstants.SEQUENCE_STYLE_GENERATOR; @Entity @Getter @@ -15,12 +17,13 @@ public class Rolleoversikt { @Id - @GeneratedValue(generator = "rolleOversiktIdGenerator") - @GenericGenerator(name = "rolleOversiktIdGenerator", strategy = SEQUENCE_STYLE_GENERATOR, parameters = { - @org.hibernate.annotations.Parameter(name = "sequence_name", value = "ROLLEOVERSIKT_SEQ"), - @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), - @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") - }) + @GeneratedValue(strategy = GenerationType.IDENTITY) +// @GeneratedValue(generator = "rolleOversiktIdGenerator") +// @GenericGenerator(name = "rolleOversiktIdGenerator", strategy = SEQUENCE_STYLE_GENERATOR, parameters = { +// @org.hibernate.annotations.Parameter(name = "sequence_name", value = "ROLLEOVERSIKT_SEQ"), +// @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), +// @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") +// }) private Long id; @NotNull(message = "fnr must not be null") From 3ee01e9b48e4b56142513a4aed3294c4a6bb94d2 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 09:39:01 +0200 Subject: [PATCH 14/49] Brreg-stub hibernate 6 migrering #deploy-brreg-stub --- .../java/no/nav/brregstub/database/domene/HentRolle.java | 9 +-------- .../no/nav/brregstub/database/domene/Rolleoversikt.java | 9 +-------- .../java/no/nav/brregstub/jpa/HibernateConstants.java | 9 --------- .../db/migration/postgresql/V1.3__init_sequences.sql | 5 +++++ 4 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 apps/brreg-stub/src/main/java/no/nav/brregstub/jpa/HibernateConstants.java create mode 100644 apps/brreg-stub/src/main/resources/db/migration/postgresql/V1.3__init_sequences.sql diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java index 8749912355c..c592beb4027 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java @@ -3,7 +3,6 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; @@ -17,13 +16,7 @@ public class HentRolle { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) -// @GeneratedValue(generator = "hentRolleIdGenerator") -// @GenericGenerator(name = "hentRolleIdGenerator", strategy = SEQUENCE_STYLE_GENERATOR, parameters = { -// @org.hibernate.annotations.Parameter(name = "sequence_name", value = "HENTROLLE_SEQ"), -// @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), -// @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") -// }) + @GeneratedValue private Long id; @NotNull(message = "orgnr must not be null") diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java index 26bf845c48e..175625d6b7b 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java @@ -3,7 +3,6 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; @@ -17,13 +16,7 @@ public class Rolleoversikt { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) -// @GeneratedValue(generator = "rolleOversiktIdGenerator") -// @GenericGenerator(name = "rolleOversiktIdGenerator", strategy = SEQUENCE_STYLE_GENERATOR, parameters = { -// @org.hibernate.annotations.Parameter(name = "sequence_name", value = "ROLLEOVERSIKT_SEQ"), -// @org.hibernate.annotations.Parameter(name = "initial_value", value = "1"), -// @org.hibernate.annotations.Parameter(name = "increment_size", value = "1") -// }) + @GeneratedValue private Long id; @NotNull(message = "fnr must not be null") diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/jpa/HibernateConstants.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/jpa/HibernateConstants.java deleted file mode 100644 index 9bbda425c1c..00000000000 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/jpa/HibernateConstants.java +++ /dev/null @@ -1,9 +0,0 @@ -package no.nav.brregstub.jpa; - -import lombok.experimental.UtilityClass; - -@UtilityClass -public class HibernateConstants { - - public static final String SEQUENCE_STYLE_GENERATOR = "org.hibernate.id.enhanced.SequenceStyleGenerator"; -} diff --git a/apps/brreg-stub/src/main/resources/db/migration/postgresql/V1.3__init_sequences.sql b/apps/brreg-stub/src/main/resources/db/migration/postgresql/V1.3__init_sequences.sql new file mode 100644 index 00000000000..3a4006730c0 --- /dev/null +++ b/apps/brreg-stub/src/main/resources/db/migration/postgresql/V1.3__init_sequences.sql @@ -0,0 +1,5 @@ +------------------------------------- +-- C R E A T E S E Q U E N C E S -- +------------------------------------- +create sequence rolleoversikt_seq; +create sequence hentrolle_seq; From 0c74e8d31bdbf51afe3ef12ef8fa7fbeb86f152a Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 09:44:07 +0200 Subject: [PATCH 15/49] Brreg-stub hibernate 6 migrering #deploy-brreg-stub --- .../java/no/nav/brregstub/database/domene/HentRolle.java | 5 ++++- .../java/no/nav/brregstub/database/domene/Rolleoversikt.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java index c592beb4027..cd0caaeeb58 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/HentRolle.java @@ -3,7 +3,9 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import lombok.Getter; @@ -16,7 +18,8 @@ public class HentRolle { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "hentrolle_seq") + @SequenceGenerator(name = "hentrolle_seq", sequenceName = "HENTROLLE_SEQ", allocationSize = 1) private Long id; @NotNull(message = "orgnr must not be null") diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java index 175625d6b7b..34daf96715b 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/database/domene/Rolleoversikt.java @@ -3,7 +3,9 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import lombok.Getter; @@ -16,7 +18,8 @@ public class Rolleoversikt { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "rolleoversikt_seq") + @SequenceGenerator(name = "rolleoversikt_seq", sequenceName = "ROLLEOVERSIKT_SEQ", allocationSize = 1) private Long id; @NotNull(message = "fnr must not be null") From ea002f048428155a5d45236b1edf5c975824e73e Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 10:27:46 +0200 Subject: [PATCH 16/49] =?UTF-8?q?Fikset=20aareg-proxy=20Endret=20deploy=20?= =?UTF-8?q?for=20proxyer,=20kan=20n=C3=A5=20bruke=20kun=20deploy-proxy=20#?= =?UTF-8?q?deploy-proxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/proxy.aareg-proxy.yml | 2 +- .github/workflows/proxy.aareg-synt-services-proxy.yml | 2 +- .github/workflows/proxy.arbeidsplassencv-proxy.yml | 2 +- .github/workflows/proxy.arena-forvalteren-proxy.yml | 2 +- .github/workflows/proxy.batch-adeo-proxy.yml | 2 +- .github/workflows/proxy.brregstub-proxy.yml | 2 +- .github/workflows/proxy.dokarkiv-proxy.yml | 2 +- .github/workflows/proxy.ereg-proxy.yml | 2 +- .github/workflows/proxy.histark-proxy.yml | 2 +- .github/workflows/proxy.hodejegeren-proxy.yml | 2 +- .github/workflows/proxy.inntektstub-proxy.yml | 2 +- .github/workflows/proxy.inst-proxy.yml | 2 +- .github/workflows/proxy.kodeverk-proxy.yml | 2 +- .github/workflows/proxy.kontoregister-person-proxy.yml | 2 +- .github/workflows/proxy.krrstub-proxy.yml | 2 +- .github/workflows/proxy.medl-proxy.yml | 2 +- .github/workflows/proxy.norg2-proxy.yml | 2 +- .github/workflows/proxy.pdl-proxy.yml | 2 +- .github/workflows/proxy.pensjon-testdata-facade-proxy.yml | 2 +- .github/workflows/proxy.saf-proxy.yml | 2 +- .github/workflows/proxy.sigrunstub-proxy.yml | 2 +- .github/workflows/proxy.skjermingsregister-proxy.yml | 2 +- .github/workflows/proxy.statisk-data-forvalter-proxy.yml | 2 +- .github/workflows/proxy.synthdata-meldekort-proxy.yml | 2 +- .github/workflows/proxy.tps-forvalteren-proxy.yml | 2 +- .github/workflows/proxy.udistub-proxy.yml | 2 +- .../no/nav/testnav/proxies/aareg/LocalSecurityConfig.java | 8 ++------ .../nav/testnav/proxies/aareg/ApplicationContextTest.java | 3 +-- 28 files changed, 29 insertions(+), 34 deletions(-) diff --git a/.github/workflows/proxy.aareg-proxy.yml b/.github/workflows/proxy.aareg-proxy.yml index ecee09af164..28d7ddc113a 100644 --- a/.github/workflows/proxy.aareg-proxy.yml +++ b/.github/workflows/proxy.aareg-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/aareg-proxy" - deploy-tag: "#deploy-aareg-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.aareg-synt-services-proxy.yml b/.github/workflows/proxy.aareg-synt-services-proxy.yml index ae62d4ea7ba..244813526fc 100644 --- a/.github/workflows/proxy.aareg-synt-services-proxy.yml +++ b/.github/workflows/proxy.aareg-synt-services-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/aareg-synt-services-proxy" - deploy-tag: "#deploy-aareg-synt-services-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml index 70d2fcde8b6..4692437fb9d 100644 --- a/.github/workflows/proxy.arbeidsplassencv-proxy.yml +++ b/.github/workflows/proxy.arbeidsplassencv-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/arbeidsplassencv-proxy" - deploy-tag: "#deploy-arbeidsplassencv-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.arena-forvalteren-proxy.yml b/.github/workflows/proxy.arena-forvalteren-proxy.yml index 8ccf7bba6c3..be18f3e63fa 100644 --- a/.github/workflows/proxy.arena-forvalteren-proxy.yml +++ b/.github/workflows/proxy.arena-forvalteren-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/arena-forvalteren-proxy" - deploy-tag: "#deploy-arena-forvalteren-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.batch-adeo-proxy.yml b/.github/workflows/proxy.batch-adeo-proxy.yml index 6c8fc6a9103..5baf1f00748 100644 --- a/.github/workflows/proxy.batch-adeo-proxy.yml +++ b/.github/workflows/proxy.batch-adeo-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/batch-adeo-proxy" - deploy-tag: "#deploy-batch-adeo-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.brregstub-proxy.yml b/.github/workflows/proxy.brregstub-proxy.yml index aa7e46b61eb..5e6995ee696 100644 --- a/.github/workflows/proxy.brregstub-proxy.yml +++ b/.github/workflows/proxy.brregstub-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/brregstub-proxy" - deploy-tag: "#deploy-brregstub-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.dokarkiv-proxy.yml b/.github/workflows/proxy.dokarkiv-proxy.yml index 0e9a68f76cd..4d16fb4ff2a 100644 --- a/.github/workflows/proxy.dokarkiv-proxy.yml +++ b/.github/workflows/proxy.dokarkiv-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/dokarkiv-proxy" - deploy-tag: "#deploy-dokarkiv-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.ereg-proxy.yml b/.github/workflows/proxy.ereg-proxy.yml index be9bb11fe9b..8ecffe0130e 100644 --- a/.github/workflows/proxy.ereg-proxy.yml +++ b/.github/workflows/proxy.ereg-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/ereg-proxy" - deploy-tag: "#deploy-ereg-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.histark-proxy.yml b/.github/workflows/proxy.histark-proxy.yml index c57b338d254..cd477338e80 100644 --- a/.github/workflows/proxy.histark-proxy.yml +++ b/.github/workflows/proxy.histark-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/histark-proxy" - deploy-tag: "#deploy-histark-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.hodejegeren-proxy.yml b/.github/workflows/proxy.hodejegeren-proxy.yml index 51d1078b31d..362a1235fe8 100644 --- a/.github/workflows/proxy.hodejegeren-proxy.yml +++ b/.github/workflows/proxy.hodejegeren-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/hodejegeren-proxy" - deploy-tag: "#deploy-hodejegeren-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.inntektstub-proxy.yml b/.github/workflows/proxy.inntektstub-proxy.yml index 8f6e06f5052..0d0ff4f0b24 100644 --- a/.github/workflows/proxy.inntektstub-proxy.yml +++ b/.github/workflows/proxy.inntektstub-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/inntektstub-proxy" - deploy-tag: "#deploy-inntektstub-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml index efcf944cc00..007c64c1239 100644 --- a/.github/workflows/proxy.inst-proxy.yml +++ b/.github/workflows/proxy.inst-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/inst-proxy" - deploy-tag: "#deploy-inst-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.kodeverk-proxy.yml b/.github/workflows/proxy.kodeverk-proxy.yml index 48626f04f1c..4a4c0befbca 100644 --- a/.github/workflows/proxy.kodeverk-proxy.yml +++ b/.github/workflows/proxy.kodeverk-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/kodeverk-proxy" - deploy-tag: "#deploy-kodeverk-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.kontoregister-person-proxy.yml b/.github/workflows/proxy.kontoregister-person-proxy.yml index 7020e5780e4..2618e3be7d7 100644 --- a/.github/workflows/proxy.kontoregister-person-proxy.yml +++ b/.github/workflows/proxy.kontoregister-person-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/kontoregister-person-proxy" - deploy-tag: "#deploy-kontoregister-person-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.krrstub-proxy.yml b/.github/workflows/proxy.krrstub-proxy.yml index d976f81e0ee..83f126d1f55 100644 --- a/.github/workflows/proxy.krrstub-proxy.yml +++ b/.github/workflows/proxy.krrstub-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/krrstub-proxy" - deploy-tag: "#deploy-krrstub-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.medl-proxy.yml b/.github/workflows/proxy.medl-proxy.yml index 0511372612a..816b6fa3ad9 100644 --- a/.github/workflows/proxy.medl-proxy.yml +++ b/.github/workflows/proxy.medl-proxy.yml @@ -18,7 +18,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/medl-proxy" - deploy-tag: "#deploy-medl-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.norg2-proxy.yml b/.github/workflows/proxy.norg2-proxy.yml index 4eb1135424b..eeeab46890a 100644 --- a/.github/workflows/proxy.norg2-proxy.yml +++ b/.github/workflows/proxy.norg2-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/norg2-proxy" - deploy-tag: "#deploy-norg2-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.pdl-proxy.yml b/.github/workflows/proxy.pdl-proxy.yml index 8c95138d8ca..f9070b8401a 100644 --- a/.github/workflows/proxy.pdl-proxy.yml +++ b/.github/workflows/proxy.pdl-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/pdl-proxy" - deploy-tag: "#deploy-pdl-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml index 9b77a04c49a..cecc122f40a 100644 --- a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml +++ b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/pensjon-testdata-facade-proxy" - deploy-tag: "#deploy-pensjon-testdata-facade-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.saf-proxy.yml b/.github/workflows/proxy.saf-proxy.yml index b8b1f57dadf..8ad13efbf17 100644 --- a/.github/workflows/proxy.saf-proxy.yml +++ b/.github/workflows/proxy.saf-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/saf-proxy" - deploy-tag: "#deploy-saf-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.sigrunstub-proxy.yml b/.github/workflows/proxy.sigrunstub-proxy.yml index 6c3c1d4aed4..5ce006a6a9c 100644 --- a/.github/workflows/proxy.sigrunstub-proxy.yml +++ b/.github/workflows/proxy.sigrunstub-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/sigrunstub-proxy" - deploy-tag: "#deploy-sigrunstub-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.skjermingsregister-proxy.yml b/.github/workflows/proxy.skjermingsregister-proxy.yml index 0cc683568dc..227bcde795b 100644 --- a/.github/workflows/proxy.skjermingsregister-proxy.yml +++ b/.github/workflows/proxy.skjermingsregister-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/skjermingsregister-proxy" - deploy-tag: "#deploy-skjermingsregister-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.statisk-data-forvalter-proxy.yml b/.github/workflows/proxy.statisk-data-forvalter-proxy.yml index 67a2c6c356a..8e3de7516dd 100644 --- a/.github/workflows/proxy.statisk-data-forvalter-proxy.yml +++ b/.github/workflows/proxy.statisk-data-forvalter-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/statisk-data-forvalter-proxy" - deploy-tag: "#deploy-statisk-data-forvalter-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.synthdata-meldekort-proxy.yml b/.github/workflows/proxy.synthdata-meldekort-proxy.yml index 135b056b076..ef36d482a0e 100644 --- a/.github/workflows/proxy.synthdata-meldekort-proxy.yml +++ b/.github/workflows/proxy.synthdata-meldekort-proxy.yml @@ -15,7 +15,7 @@ jobs: uses: ./.github/workflows/common.workflow.backend.yml with: working-directory: "proxies/synthdata-meldekort-proxy" - deploy-tag: "#deploy-synthdata-meldekort-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.tps-forvalteren-proxy.yml b/.github/workflows/proxy.tps-forvalteren-proxy.yml index a0a477369c3..7a81ab1a699 100644 --- a/.github/workflows/proxy.tps-forvalteren-proxy.yml +++ b/.github/workflows/proxy.tps-forvalteren-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/tps-forvalteren-proxy" - deploy-tag: "#deploy-tps-forvalteren-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.udistub-proxy.yml b/.github/workflows/proxy.udistub-proxy.yml index ac0c5e49216..9784f847502 100644 --- a/.github/workflows/proxy.udistub-proxy.yml +++ b/.github/workflows/proxy.udistub-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/udistub-proxy" - deploy-tag: "#deploy-udistub-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/LocalSecurityConfig.java b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/LocalSecurityConfig.java index 834a7dc6241..4bdc6517be5 100644 --- a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/LocalSecurityConfig.java +++ b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/LocalSecurityConfig.java @@ -16,12 +16,8 @@ public class LocalSecurityConfig { @Bean public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) { return http - .csrf().disable() - .authorizeExchange() - .anyExchange() - .permitAll() - .and() + .csrf(ServerHttpSecurity.CsrfSpec::disable) + .authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec.anyExchange().permitAll()) .build(); } - } \ No newline at end of file diff --git a/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java b/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java index 5176a12c1cc..97893924508 100644 --- a/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java +++ b/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java @@ -1,6 +1,5 @@ package no.nav.testnav.proxies.aareg; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; @@ -15,7 +14,7 @@ class ApplicationContextTest { @MockBean @SuppressWarnings("unused") - private JwtDecoder jwtDecoder; + private ReactiveJwtDecoder jwtDecoder; @Test void contextLoads() { From 732ad438368b64747bd4c3cec0c42a7b863aaa49 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 10:40:14 +0200 Subject: [PATCH 17/49] Oppdatert gradle versjoner som fortsatt var utdatert #deploy-proxy --- apps/budpro-service/gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties b/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f0c..744c64d1277 100644 --- a/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties index f398c33c4b0..744c64d1277 100644 --- a/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties index 9256e2f388e..15bc9344b74 100644 --- a/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 60f0315be346e85e5feb7c2757786ebf4848b4a4 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 11:06:00 +0200 Subject: [PATCH 18/49] Testfix #deploy-proxy --- .../nav/testnav/libs/reactiveproxy/config/SecurityConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java index 60ad2638f69..7e20ed40d0a 100644 --- a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java +++ b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java @@ -6,6 +6,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.config.web.server.ServerHttpSecurity; @@ -35,7 +36,6 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS "/error", "/swagger-ui.html" ).permitAll().anyExchange().authenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })).build(); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())).build(); } } From 93271897022dae6d34c555b0eb36448f49d9d7e1 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 11:13:52 +0200 Subject: [PATCH 19/49] =?UTF-8?q?Endret=20SecurityConfig=20jwt=20til=20?= =?UTF-8?q?=C3=A5=20bruke=20withDefaults=20#deploy-proxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../testnav/apps/adresseservice/config/SecurityConfig.java | 4 ++-- .../arbeidsforholdexportapi/config/SecurityConfig.java | 4 ++-- .../arbeidsforholdservice/config/SecurityConfig.java | 4 ++-- .../batchbestillingservice/config/SecurityConfig.java | 4 ++-- .../src/main/java/no/nav/dolly/config/SecurityConfig.java | 4 ++-- .../eregbatchstatusservice/config/SecurityConfig.java | 4 ++-- .../config/SecurityConfig.java | 4 ++-- .../testnorge/generernavnservice/config/SecurityConfig.java | 4 ++-- .../config/SecurityConfig.java | 4 ++-- .../generersyntameldingservice/config/SecurityConfig.java | 4 ++-- .../geografiskekodeverkservice/config/SecurityConfig.java | 4 ++-- .../helsepersonellservice/config/SecurityConfig.java | 4 ++-- .../nav/testnav/apps/hodejegeren/config/SecurityConfig.java | 4 ++-- .../config/SecurityConfig.java | 4 ++-- .../jenkinsbatchstatusservice/config/SecurityConfig.java | 4 ++-- .../testnav/joarkdokumentservice/config/SecurityConfig.java | 4 ++-- .../testnorge/miljoerservice/config/SecurityConfig.java | 4 ++-- .../mn/syntarbeidsforholdservice/config/SecurityConfig.java | 4 ++-- .../oppsummeringsdokumentservice/config/SecurityConfig.java | 4 ++-- .../organisasjonbestillingservice/config/SecurityConfig.java | 4 ++-- .../organisasjonfastedataservice/config/SecurityConfig.java | 4 ++-- .../no/nav/organisasjonforvalter/config/SecurityConfig.java | 4 ++-- .../testnorge/organisasjonmottak/config/SecurityConfig.java | 4 ++-- .../testnorge/organisasjonservice/config/SecurityConfig.java | 4 ++-- .../no/nav/registre/orgnrservice/config/SecurityConfig.java | 4 ++-- .../main/java/no/nav/pdl/forvalter/config/SecurityConfig.java | 4 ++-- .../testnav/apps/personexportapi/config/SecurityConfig.java | 4 ++-- .../testnorge/personsearchservice/config/SecurityConfig.java | 4 ++-- .../nav/testnav/apps/personservice/config/SecurityConfig.java | 4 ++-- .../testnorge/profil/config/SecurityConfiguration.java | 4 ++-- .../registre/testnorge/sykemelding/config/SecurityConfig.java | 4 ++-- .../apps/syntsykemeldingapi/config/SecurityConfig.java | 4 ++-- .../syntvedtakshistorikkservice/config/SecurityConfig.java | 4 ++-- .../java/no/nav/testnav/identpool/config/SecurityConfig.java | 4 ++-- .../main/java/no/nav/registre/tp/config/SecurityConfig.java | 4 ++-- .../testnorge/tilbakemeldingapi/config/SecurityConfig.java | 4 ++-- .../apps/tpsmessagingservice/config/SecurityConfig.java | 4 ++-- .../src/main/java/no/nav/udistub/config/SecurityConfig.java | 4 ++-- .../nav/registre/varslingerservice/config/SecurityConfig.java | 4 ++-- .../nav/testnav/libs/reactiveproxy/config/SecurityConfig.java | 3 ++- 40 files changed, 80 insertions(+), 79 deletions(-) diff --git a/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/SecurityConfig.java b/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/SecurityConfig.java index bfbd2872db7..fcbddbaf8b3 100644 --- a/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/SecurityConfig.java +++ b/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -30,8 +31,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/SecurityConfig.java b/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/SecurityConfig.java index 4ad8029350a..4a8cb1ae4a3 100644 --- a/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/SecurityConfig.java +++ b/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/SecurityConfig.java b/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/SecurityConfig.java index 49ab0aab175..f036df45948 100644 --- a/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/SecurityConfig.java +++ b/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/SecurityConfig.java b/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/SecurityConfig.java index 32cd0eb1517..445fc51198b 100644 --- a/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/SecurityConfig.java +++ b/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/SecurityConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/SecurityConfig.java index f42fc58ce07..b35e4adc845 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/SecurityConfig.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/SecurityConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; @@ -27,8 +28,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/SecurityConfig.java b/apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/SecurityConfig.java index 1f8827a51ab..ec6102ed65e 100644 --- a/apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/SecurityConfig.java +++ b/apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/SecurityConfig.java b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/SecurityConfig.java index 8c1916bc076..c46b340b94e 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/SecurityConfig.java +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -29,8 +30,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/SecurityConfig.java b/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/SecurityConfig.java index d3074d33910..d36bdb17e42 100644 --- a/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/SecurityConfig.java +++ b/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/SecurityConfig.java b/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/SecurityConfig.java index d816bad522e..7f375e30b44 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/SecurityConfig.java +++ b/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/SecurityConfig.java b/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/SecurityConfig.java index ba5d4c0f263..4e39146fb0b 100644 --- a/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/SecurityConfig.java +++ b/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/geografiske-kodeverk-service/src/main/java/no/nav/registre/testnav/geografiskekodeverkservice/config/SecurityConfig.java b/apps/geografiske-kodeverk-service/src/main/java/no/nav/registre/testnav/geografiskekodeverkservice/config/SecurityConfig.java index a12df16bbf3..0c00757d26a 100644 --- a/apps/geografiske-kodeverk-service/src/main/java/no/nav/registre/testnav/geografiskekodeverkservice/config/SecurityConfig.java +++ b/apps/geografiske-kodeverk-service/src/main/java/no/nav/registre/testnav/geografiskekodeverkservice/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -30,8 +31,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/SecurityConfig.java b/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/SecurityConfig.java index 36cc85e0096..71c4b77899a 100644 --- a/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/SecurityConfig.java +++ b/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/SecurityConfig.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/SecurityConfig.java index 0095449043f..34cdc116f83 100644 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/SecurityConfig.java +++ b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; @@ -32,8 +33,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/SecurityConfig.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/SecurityConfig.java index ac472015258..468bfaf9797 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/SecurityConfig.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/SecurityConfig.java b/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/SecurityConfig.java index 077cd1e8404..5b000179273 100644 --- a/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/SecurityConfig.java +++ b/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/SecurityConfig.java b/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/SecurityConfig.java index e79d497ca23..c79dd76bd47 100644 --- a/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/SecurityConfig.java +++ b/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -27,8 +28,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/SecurityConfig.java b/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/SecurityConfig.java index 522cce01713..6f9c33b1657 100644 --- a/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/SecurityConfig.java +++ b/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SecurityConfig.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SecurityConfig.java index 0b881ad1a5e..7a32a601cb7 100644 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SecurityConfig.java +++ b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/SecurityConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/SecurityConfig.java index b2c598bed6d..baac159e439 100644 --- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/SecurityConfig.java +++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -29,8 +30,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/SecurityConfig.java b/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/SecurityConfig.java index bcb3f47ed2b..2ea35fda1cd 100644 --- a/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/SecurityConfig.java +++ b/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/SecurityConfig.java b/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/SecurityConfig.java index f5974fcc567..16e870da80d 100644 --- a/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/SecurityConfig.java +++ b/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/organisasjon-forvalter/src/main/java/no/nav/organisasjonforvalter/config/SecurityConfig.java b/apps/organisasjon-forvalter/src/main/java/no/nav/organisasjonforvalter/config/SecurityConfig.java index e37d7b8d39a..c08b413ce91 100644 --- a/apps/organisasjon-forvalter/src/main/java/no/nav/organisasjonforvalter/config/SecurityConfig.java +++ b/apps/organisasjon-forvalter/src/main/java/no/nav/organisasjonforvalter/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/SecurityConfig.java b/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/SecurityConfig.java index a53b1c3f170..d6bef8d9f4a 100644 --- a/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/SecurityConfig.java +++ b/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/SecurityConfig.java b/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/SecurityConfig.java index 57921c31110..e117013c75a 100644 --- a/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/SecurityConfig.java +++ b/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/SecurityConfig.java b/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/SecurityConfig.java index 31d224f17b1..e14ad70d821 100644 --- a/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/SecurityConfig.java +++ b/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/SecurityConfig.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/SecurityConfig.java index 9b915bf11a9..752681c3f15 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/SecurityConfig.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/SecurityConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -26,8 +27,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/person-export-api/src/main/java/no/nav/testnav/apps/personexportapi/config/SecurityConfig.java b/apps/person-export-api/src/main/java/no/nav/testnav/apps/personexportapi/config/SecurityConfig.java index 045222f358e..acf49f5cd08 100644 --- a/apps/person-export-api/src/main/java/no/nav/testnav/apps/personexportapi/config/SecurityConfig.java +++ b/apps/person-export-api/src/main/java/no/nav/testnav/apps/personexportapi/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -29,8 +30,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/SecurityConfig.java b/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/SecurityConfig.java index eeef554da19..4659dda6bae 100644 --- a/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/SecurityConfig.java +++ b/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/SecurityConfig.java b/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/SecurityConfig.java index 778363e59c2..deabba60472 100644 --- a/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/SecurityConfig.java +++ b/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/SecurityConfiguration.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/SecurityConfiguration.java index 5a7d19a31a3..7f467471ff1 100644 --- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/SecurityConfiguration.java +++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/SecurityConfiguration.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/SecurityConfig.java b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/SecurityConfig.java index 67a7fdde906..bddd84ea4dc 100644 --- a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/SecurityConfig.java +++ b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/SecurityConfig.java b/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/SecurityConfig.java index 55de701547e..f96bdfd2631 100644 --- a/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/SecurityConfig.java +++ b/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/SecurityConfig.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/SecurityConfig.java index 09270479b87..854330b650b 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/SecurityConfig.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/SecurityConfig.java b/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/SecurityConfig.java index 65c349d240f..8f7d5042fbb 100644 --- a/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/SecurityConfig.java +++ b/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/SecurityConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -26,8 +27,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/testnorge-tp/src/main/java/no/nav/registre/tp/config/SecurityConfig.java b/apps/testnorge-tp/src/main/java/no/nav/registre/tp/config/SecurityConfig.java index 15df6a173cc..90b9a052e59 100644 --- a/apps/testnorge-tp/src/main/java/no/nav/registre/tp/config/SecurityConfig.java +++ b/apps/testnorge-tp/src/main/java/no/nav/registre/tp/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/SecurityConfig.java b/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/SecurityConfig.java index 04efa45bc88..30d81e6a131 100644 --- a/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/SecurityConfig.java +++ b/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/SecurityConfig.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/SecurityConfig.java index 8b7158389ad..e1dbd8a575e 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/SecurityConfig.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -30,8 +31,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/config/SecurityConfig.java b/apps/udi-stub/src/main/java/no/nav/udistub/config/SecurityConfig.java index 1931e1181c7..e72d859f0b7 100644 --- a/apps/udi-stub/src/main/java/no/nav/udistub/config/SecurityConfig.java +++ b/apps/udi-stub/src/main/java/no/nav/udistub/config/SecurityConfig.java @@ -3,6 +3,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/SecurityConfig.java b/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/SecurityConfig.java index 632c00da6d2..b734fa96cdc 100644 --- a/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/SecurityConfig.java +++ b/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/SecurityConfig.java @@ -2,6 +2,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -26,8 +27,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti "/error", "/swagger-ui.html" ).permitAll().requestMatchers("/api/**").fullyAuthenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java index 7e20ed40d0a..a947440fe39 100644 --- a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java +++ b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java @@ -36,6 +36,7 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS "/error", "/swagger-ui.html" ).permitAll().anyExchange().authenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())).build(); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())) + .build(); } } From 6e7f92ead4482a5b47e7468eca15e445699a9f9b Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 11:14:19 +0200 Subject: [PATCH 20/49] Deploy aareg proxy #deploy-proxy --- .../no/nav/testnav/proxies/aareg/AaregProxyApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java index 2825cc8d776..db4d386fca6 100644 --- a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java +++ b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java @@ -14,4 +14,4 @@ public class AaregProxyApplication { public static void main(String[] args) { SpringApplication.run(AaregProxyApplication.class, args); } -} \ No newline at end of file +} From 80bb092d33188d1c1e25e944ec59e75b3ca67569 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 11:33:21 +0200 Subject: [PATCH 21/49] ReactiveJwtDecoder Bean og deploy aareg proxy #deploy-proxy --- .../libs/reactiveproxy/config/SecurityConfig.java | 12 ++++++++++++ .../testnav/proxies/aareg/AaregProxyApplication.java | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java index a947440fe39..177dbb50d1c 100644 --- a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java +++ b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java @@ -3,6 +3,8 @@ import lombok.RequiredArgsConstructor; import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration; import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; +import no.nav.testnav.libs.reactivesecurity.properties.ResourceServerProperties; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -10,8 +12,12 @@ import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.config.web.server.ServerHttpSecurity; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoders; import org.springframework.security.web.server.SecurityWebFilterChain; +import java.util.List; + @Configuration @EnableWebFluxSecurity @@ -39,4 +45,10 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())) .build(); } + + @Bean + @ConditionalOnMissingBean + public ReactiveJwtDecoder jwtDecoder(List properties) { + return ReactiveJwtDecoders.fromIssuerLocation(properties.getFirst().getIssuerUri()); + } } diff --git a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java index db4d386fca6..2825cc8d776 100644 --- a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java +++ b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java @@ -14,4 +14,4 @@ public class AaregProxyApplication { public static void main(String[] args) { SpringApplication.run(AaregProxyApplication.class, args); } -} +} \ No newline at end of file From 82af8e379f5c6fefb0ad2971cd0aa28ded037602 Mon Sep 17 00:00:00 2001 From: Stian Gustavsson Date: Fri, 20 Oct 2023 11:45:13 +0200 Subject: [PATCH 22/49] Update ApplicationContextTest.java deploy aareg-proxy From f5a989d380f9a0f135da6dfd71dc9140f5e839ae Mon Sep 17 00:00:00 2001 From: Stian Gustavsson Date: Fri, 20 Oct 2023 11:49:37 +0200 Subject: [PATCH 23/49] Update AaregProxyApplication.java Deploy aareg-proxy --- .../no/nav/testnav/proxies/aareg/AaregProxyApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java index 2825cc8d776..db4d386fca6 100644 --- a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java +++ b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java @@ -14,4 +14,4 @@ public class AaregProxyApplication { public static void main(String[] args) { SpringApplication.run(AaregProxyApplication.class, args); } -} \ No newline at end of file +} From ef374bdd4c0446a29018611b0afe5dd17a9da928 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 13:17:15 +0200 Subject: [PATCH 24/49] Deploy BrregstubProxy #deploy-proxy --- .../reactiveproxy/config/SecurityConfig.java | 12 ---- .../reactivesecurity/decoder/JwtDecoder.java | 64 ++++++++++--------- .../BrregstubProxyApplicationStarter.java | 2 +- 3 files changed, 34 insertions(+), 44 deletions(-) diff --git a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java index 177dbb50d1c..a947440fe39 100644 --- a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java +++ b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java @@ -3,8 +3,6 @@ import lombok.RequiredArgsConstructor; import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration; import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; -import no.nav.testnav.libs.reactivesecurity.properties.ResourceServerProperties; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -12,12 +10,8 @@ import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.config.web.server.ServerHttpSecurity; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoders; import org.springframework.security.web.server.SecurityWebFilterChain; -import java.util.List; - @Configuration @EnableWebFluxSecurity @@ -45,10 +39,4 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())) .build(); } - - @Bean - @ConditionalOnMissingBean - public ReactiveJwtDecoder jwtDecoder(List properties) { - return ReactiveJwtDecoders.fromIssuerLocation(properties.getFirst().getIssuerUri()); - } } diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java index 702b7fc9617..3a05114b3f2 100644 --- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java +++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java @@ -1,6 +1,8 @@ package no.nav.testnav.libs.reactivesecurity.decoder; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.libs.reactivesecurity.properties.ResourceServerProperties; +import org.springframework.context.annotation.Bean; import org.springframework.http.client.reactive.ReactorClientHttpConnector; import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator; import org.springframework.security.oauth2.core.OAuth2Error; @@ -16,8 +18,6 @@ import java.net.URI; -import no.nav.testnav.libs.reactivesecurity.properties.ResourceServerProperties; - @Slf4j public class JwtDecoder { @@ -29,17 +29,20 @@ public JwtDecoder(ResourceServerProperties resourceServerProperties, String prox this.proxyWebClient = buildProxyWebClient(proxyHost); } - public class AudienceValidator implements OAuth2TokenValidator { - public OAuth2TokenValidatorResult validate(Jwt jwt) { - var error = new OAuth2Error( - "invalid_token", - String.format("None of required audience values '%s' found in token", resourceServerProperties.getAcceptedAudience()), - null - ); - return jwt.getAudience().stream().anyMatch(resourceServerProperties.getAcceptedAudience()::contains) - ? OAuth2TokenValidatorResult.success() - : OAuth2TokenValidatorResult.failure(error); - } + @Bean + public ReactiveJwtDecoder jwtDecoder() { + NimbusReactiveJwtDecoder jwtDecoder = switch (resourceServerProperties.getType()) { + case TOKEN_X -> NimbusReactiveJwtDecoder.withJwkSetUri(resourceServerProperties.getJwkSetUri()).build(); + case AZURE_AD -> + NimbusReactiveJwtDecoder.withJwkSetUri(resourceServerProperties.getJwkSetUri()).webClient(proxyWebClient).build(); + }; + + OAuth2TokenValidator audienceValidator = new AudienceValidator(); + OAuth2TokenValidator withIssuer = JwtValidators.createDefaultWithIssuer(resourceServerProperties.getIssuerUri()); + OAuth2TokenValidator withAudience = new DelegatingOAuth2TokenValidator<>(withIssuer, audienceValidator); + + jwtDecoder.setJwtValidator(withAudience); + return jwtDecoder; } private WebClient buildProxyWebClient(String proxyHost) { @@ -48,28 +51,27 @@ private WebClient buildProxyWebClient(String proxyHost) { log.info("Setter opp proxy host {} for jwt decoder.", proxyHost); var uri = URI.create(proxyHost); builder.clientConnector(new ReactorClientHttpConnector( - HttpClient - .create() - .proxy(proxy -> proxy - .type(ProxyProvider.Proxy.HTTP) - .host(uri.getHost()) - .port(uri.getPort())) + HttpClient + .create() + .proxy(proxy -> proxy + .type(ProxyProvider.Proxy.HTTP) + .host(uri.getHost()) + .port(uri.getPort())) )); } return builder.build(); } - public ReactiveJwtDecoder jwtDecoder() { - NimbusReactiveJwtDecoder jwtDecoder = switch (resourceServerProperties.getType()) { - case TOKEN_X -> NimbusReactiveJwtDecoder.withJwkSetUri(resourceServerProperties.getJwkSetUri()).build(); - case AZURE_AD -> NimbusReactiveJwtDecoder.withJwkSetUri(resourceServerProperties.getJwkSetUri()).webClient(proxyWebClient).build(); - }; - - OAuth2TokenValidator audienceValidator = new AudienceValidator(); - OAuth2TokenValidator withIssuer = JwtValidators.createDefaultWithIssuer(resourceServerProperties.getIssuerUri()); - OAuth2TokenValidator withAudience = new DelegatingOAuth2TokenValidator<>(withIssuer, audienceValidator); - - jwtDecoder.setJwtValidator(withAudience); - return jwtDecoder; + public class AudienceValidator implements OAuth2TokenValidator { + public OAuth2TokenValidatorResult validate(Jwt jwt) { + var error = new OAuth2Error( + "invalid_token", + String.format("None of required audience values '%s' found in token", resourceServerProperties.getAcceptedAudience()), + null + ); + return jwt.getAudience().stream().anyMatch(resourceServerProperties.getAcceptedAudience()::contains) + ? OAuth2TokenValidatorResult.success() + : OAuth2TokenValidatorResult.failure(error); + } } } diff --git a/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java b/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java index e78cd572248..7aa8dec9ff6 100644 --- a/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java +++ b/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java @@ -27,4 +27,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .route(spec -> spec.path("/**").uri("http://brreg-stub.dolly.svc.nais.local/")) .build(); } -} \ No newline at end of file +} From 81ff5a5e6f94ab84aaf60ebb71e8514f5436eae4 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 13:35:13 +0200 Subject: [PATCH 25/49] Lagt til reactiveJdkAuthenticationManager i securityConfig #deploy-proxy --- .../config/SecurityConfig.java | 3 +- .../config/SecurityConfig.java | 29 +++++++++---------- .../brukerservice/config/SecurityConfig.java | 29 +++++++++---------- .../config/SecurityConfig.java | 3 +- .../config/SecurityConfig.java | 3 +- .../config/SecurityConfig.java | 3 +- .../config/SecurityConfig.java | 3 +- .../config/SecurityConfig.java | 3 +- .../config/SecurityConfig.java | 3 +- .../reactiveproxy/config/SecurityConfig.java | 3 +- .../reactivesecurity/decoder/JwtDecoder.java | 2 -- .../BrregstubProxyApplicationStarter.java | 2 +- 12 files changed, 35 insertions(+), 51 deletions(-) diff --git a/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java b/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java index 0cfa4bbf1a6..7fcae4204a5 100644 --- a/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java +++ b/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java @@ -32,8 +32,7 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS "/error", "/swagger-ui.html" ).permitAll().anyExchange().authenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))) .build(); } } diff --git a/apps/app-tilgang-analyse-service/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/SecurityConfig.java b/apps/app-tilgang-analyse-service/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/SecurityConfig.java index 18f1b4826f7..b9b65670b2f 100644 --- a/apps/app-tilgang-analyse-service/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/SecurityConfig.java +++ b/apps/app-tilgang-analyse-service/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/SecurityConfig.java @@ -2,6 +2,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; @@ -9,8 +10,6 @@ import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.web.server.SecurityWebFilterChain; -import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; - @Slf4j @Configuration @@ -22,22 +21,20 @@ public class SecurityConfig { private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager; @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.csrf().disable() - .authorizeExchange() - .pathMatchers( - "/swagger**", + public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) { + return httpSecurity + .csrf(csrfSpec -> csrfSpec.disable()) + .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers( + "/internal/**", "/webjars/**", "/v3/api-docs/**", - "/internal/metrics", - "/internal/isReady", - "/internal/isAlive", - "/h2" - ).permitAll() - .anyExchange().authenticated() - .and().oauth2ResourceServer() - .jwt(spec -> spec.authenticationManager(jwtReactiveAuthenticationManager)) - .and().build(); + "/swagger-ui/**", + "/swagger", + "/error", + "/swagger-ui.html" + ).permitAll().anyExchange().authenticated()) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))) + .build(); } } diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/SecurityConfig.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/SecurityConfig.java index 97eb01f74e4..069237b983e 100644 --- a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/SecurityConfig.java +++ b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/SecurityConfig.java @@ -2,6 +2,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; @@ -9,8 +10,6 @@ import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.web.server.SecurityWebFilterChain; -import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; - @Slf4j @Configuration @@ -22,22 +21,20 @@ public class SecurityConfig { private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager; @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.csrf().disable() - .authorizeExchange() - .pathMatchers( - "/swagger-ui.html", + public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) { + return httpSecurity + .csrf(csrfSpec -> csrfSpec.disable()) + .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers( + "/internal/**", "/webjars/**", "/v3/api-docs/**", - "/internal/metrics", - "/internal/isReady", - "/internal/isAlive" - ).permitAll() - .anyExchange().authenticated() - .and() - .oauth2ResourceServer() - .jwt(spec -> spec.authenticationManager(jwtReactiveAuthenticationManager)) - .and().build(); + "/swagger-ui/**", + "/swagger", + "/error", + "/swagger-ui.html" + ).permitAll().anyExchange().authenticated()) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))) + .build(); } } diff --git a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/SecurityConfig.java b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/SecurityConfig.java index 94a7c497213..98cf1b252d5 100644 --- a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/SecurityConfig.java +++ b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/SecurityConfig.java @@ -32,8 +32,7 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS "/error", "/swagger-ui.html" ).permitAll().anyExchange().authenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))) .build(); } } diff --git a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/SecurityConfig.java b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/SecurityConfig.java index f6242ce5f61..34606fbf39f 100644 --- a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/SecurityConfig.java +++ b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/SecurityConfig.java @@ -35,8 +35,7 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS "/error", "/swagger-ui.html" ).permitAll().anyExchange().authenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))) .build(); } } diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/SecurityConfig.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/SecurityConfig.java index 5d163ab57d9..feb36ffe4d0 100644 --- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/SecurityConfig.java +++ b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/SecurityConfig.java @@ -34,8 +34,7 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS "/error", "/swagger-ui.html" ).permitAll().anyExchange().authenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })).build(); + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))).build(); } } diff --git a/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/SecurityConfig.java b/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/SecurityConfig.java index e97acf87827..626b599f700 100644 --- a/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/SecurityConfig.java +++ b/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/SecurityConfig.java @@ -31,8 +31,7 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS "/error", "/swagger-ui.html" ).permitAll().anyExchange().authenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))) .build(); } } diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java index f08c361c85a..a2e5113e417 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java +++ b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java @@ -34,8 +34,7 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS "/error", "/swagger-ui.html" ).permitAll().anyExchange().authenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))) .build(); } } diff --git a/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/SecurityConfig.java b/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/SecurityConfig.java index d0b8bd90815..f54af83f376 100644 --- a/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/SecurityConfig.java +++ b/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/SecurityConfig.java @@ -35,8 +35,7 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS "/error", "/swagger-ui.html" ).permitAll().anyExchange().authenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> { - })) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))) .build(); } } diff --git a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java index a947440fe39..7dd8b153771 100644 --- a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java +++ b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/SecurityConfig.java @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.config.web.server.ServerHttpSecurity; @@ -36,7 +35,7 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpS "/error", "/swagger-ui.html" ).permitAll().anyExchange().authenticated()) - .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults())) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))) .build(); } } diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java index 3a05114b3f2..335f81e629d 100644 --- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java +++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java @@ -2,7 +2,6 @@ import lombok.extern.slf4j.Slf4j; import no.nav.testnav.libs.reactivesecurity.properties.ResourceServerProperties; -import org.springframework.context.annotation.Bean; import org.springframework.http.client.reactive.ReactorClientHttpConnector; import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator; import org.springframework.security.oauth2.core.OAuth2Error; @@ -29,7 +28,6 @@ public JwtDecoder(ResourceServerProperties resourceServerProperties, String prox this.proxyWebClient = buildProxyWebClient(proxyHost); } - @Bean public ReactiveJwtDecoder jwtDecoder() { NimbusReactiveJwtDecoder jwtDecoder = switch (resourceServerProperties.getType()) { case TOKEN_X -> NimbusReactiveJwtDecoder.withJwkSetUri(resourceServerProperties.getJwkSetUri()).build(); diff --git a/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java b/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java index 7aa8dec9ff6..e78cd572248 100644 --- a/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java +++ b/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java @@ -27,4 +27,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .route(spec -> spec.path("/**").uri("http://brreg-stub.dolly.svc.nais.local/")) .build(); } -} +} \ No newline at end of file From 22033df949263e2ed90ed200a3cecac7511b5331 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 13:44:56 +0200 Subject: [PATCH 26/49] Deploy aareg proxy for testing #deploy-proxy --- .../no/nav/testnav/proxies/aareg/AaregProxyApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java index 2825cc8d776..db4d386fca6 100644 --- a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java +++ b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java @@ -14,4 +14,4 @@ public class AaregProxyApplication { public static void main(String[] args) { SpringApplication.run(AaregProxyApplication.class, args); } -} \ No newline at end of file +} From 287aeb1a7257d59cbc384adde8099c913ed2af42 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 13:54:28 +0200 Subject: [PATCH 27/49] =?UTF-8?q?Deploy=20proxier=20p=C3=A5=20nytt=20etter?= =?UTF-8?q?=20fix=20#deploy-proxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../no/nav/testnav/proxies/aareg/AaregProxyApplication.java | 2 +- .../AaregSyntServiceProxyApplicationStarter.java | 2 +- .../ArbeidsplassenCVProxyApplicationStarter.java | 2 +- .../ArenaForvalterenProxyApplicationStarter.java | 2 +- .../batchadeoproxy/BatchAdeoProxyApplicationStarter.java | 2 +- .../brregstubproxy/BrregstubProxyApplicationStarter.java | 2 +- .../proxies/dokarkivproxy/DokarkivProxyApplicationStarter.java | 2 +- .../testnav/proxies/eregproxy/EregProxyApplicationStarter.java | 2 +- .../proxies/histarkproxy/HistarkProxyApplicationStarter.java | 2 +- .../hodejegerenproxy/HodejegerenProxyApplicationStarter.java | 2 +- .../inntektstubproxy/InntektstubProxyApplicationStarter.java | 2 +- .../testnav/proxies/instproxy/InstProxyApplicationStarter.java | 2 +- .../proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java | 2 +- .../KontoregisterProxyApplicationStarter.java | 2 +- .../proxies/krrstubproxy/KrrstubProxyApplicationStarter.java | 2 +- .../testnav/proxies/medlproxy/MedlProxyApplicationStarter.java | 2 +- .../proxies/norg2proxy/Norg2ProxyApplicationStarter.java | 2 +- .../testnav/proxies/pdlproxy/PdlProxyApplicationStarter.java | 2 +- .../PensjonTestdataFacadeProxyApplicationStarter.java | 2 +- .../testnav/proxies/safproxy/SafProxyApplicationStarter.java | 2 +- .../sigrunstubproxy/SigrunstubProxyApplicationStarter.java | 2 +- .../SkjermingsregisterProxyApplicationStarter.java | 2 +- .../StatiskDataForvalterProxyApplicationStarter.java | 2 +- .../SynthdataMeldekortProxyApplicationStarter.java | 2 +- .../TpsForvalterenProxyApplicationStarter.java | 2 +- .../proxies/udistubproxy/UdistubProxyApplicationStarter.java | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java index db4d386fca6..2825cc8d776 100644 --- a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java +++ b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/AaregProxyApplication.java @@ -14,4 +14,4 @@ public class AaregProxyApplication { public static void main(String[] args) { SpringApplication.run(AaregProxyApplication.class, args); } -} +} \ No newline at end of file diff --git a/proxies/aareg-synt-services-proxy/src/main/java/no/nav/testnav/proxies/aaregsyntservicesproxy/AaregSyntServiceProxyApplicationStarter.java b/proxies/aareg-synt-services-proxy/src/main/java/no/nav/testnav/proxies/aaregsyntservicesproxy/AaregSyntServiceProxyApplicationStarter.java index 781552429ff..652c65f783d 100644 --- a/proxies/aareg-synt-services-proxy/src/main/java/no/nav/testnav/proxies/aaregsyntservicesproxy/AaregSyntServiceProxyApplicationStarter.java +++ b/proxies/aareg-synt-services-proxy/src/main/java/no/nav/testnav/proxies/aaregsyntservicesproxy/AaregSyntServiceProxyApplicationStarter.java @@ -27,4 +27,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .route(spec -> spec.path("/**").uri("http://aareg-synt-services.arbeidsforhold.svc.nais.local")) .build(); } -} +} \ No newline at end of file diff --git a/proxies/arbeidsplassencv-proxy/src/main/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ArbeidsplassenCVProxyApplicationStarter.java b/proxies/arbeidsplassencv-proxy/src/main/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ArbeidsplassenCVProxyApplicationStarter.java index 36d8e562cef..bb30f389f18 100644 --- a/proxies/arbeidsplassencv-proxy/src/main/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ArbeidsplassenCVProxyApplicationStarter.java +++ b/proxies/arbeidsplassencv-proxy/src/main/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ArbeidsplassenCVProxyApplicationStarter.java @@ -54,4 +54,4 @@ private Function> createRoute(String url, Gatewa .filter(filter) ).uri(url); } -} +} \ No newline at end of file diff --git a/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaForvalterenProxyApplicationStarter.java b/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaForvalterenProxyApplicationStarter.java index f26f488146b..801da53eb8e 100644 --- a/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaForvalterenProxyApplicationStarter.java +++ b/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaForvalterenProxyApplicationStarter.java @@ -50,4 +50,4 @@ private Function> createRoute(String segment, St .rewritePath("/" + segment + "/(?.*)", "/${segment}") ).uri(host); } -} \ No newline at end of file +} diff --git a/proxies/batch-adeo-proxy/src/main/java/no/nav/testnav/proxies/batchadeoproxy/BatchAdeoProxyApplicationStarter.java b/proxies/batch-adeo-proxy/src/main/java/no/nav/testnav/proxies/batchadeoproxy/BatchAdeoProxyApplicationStarter.java index 563c8a127e9..c9404c773e1 100644 --- a/proxies/batch-adeo-proxy/src/main/java/no/nav/testnav/proxies/batchadeoproxy/BatchAdeoProxyApplicationStarter.java +++ b/proxies/batch-adeo-proxy/src/main/java/no/nav/testnav/proxies/batchadeoproxy/BatchAdeoProxyApplicationStarter.java @@ -28,4 +28,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .route(spec -> spec.path("/**").uri("https://batch.adeo.no")) .build(); } -} +} \ No newline at end of file diff --git a/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java b/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java index e78cd572248..7aa8dec9ff6 100644 --- a/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java +++ b/proxies/brregstub-proxy/src/main/java/no/nav/testnav/proxies/brregstubproxy/BrregstubProxyApplicationStarter.java @@ -27,4 +27,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .route(spec -> spec.path("/**").uri("http://brreg-stub.dolly.svc.nais.local/")) .build(); } -} \ No newline at end of file +} diff --git a/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/DokarkivProxyApplicationStarter.java b/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/DokarkivProxyApplicationStarter.java index fec979030fe..c624b0c7245 100644 --- a/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/DokarkivProxyApplicationStarter.java +++ b/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/DokarkivProxyApplicationStarter.java @@ -59,4 +59,4 @@ private Function> createRoute(String miljo, Stri .filter(filter) ).uri(url); } -} +} \ No newline at end of file diff --git a/proxies/ereg-proxy/src/main/java/no/nav/testnav/proxies/eregproxy/EregProxyApplicationStarter.java b/proxies/ereg-proxy/src/main/java/no/nav/testnav/proxies/eregproxy/EregProxyApplicationStarter.java index 1300adf1334..4ec7582870a 100644 --- a/proxies/ereg-proxy/src/main/java/no/nav/testnav/proxies/eregproxy/EregProxyApplicationStarter.java +++ b/proxies/ereg-proxy/src/main/java/no/nav/testnav/proxies/eregproxy/EregProxyApplicationStarter.java @@ -45,4 +45,4 @@ private Function> createRoute(String miljo) { .rewritePath("/api/" + miljo + "/(?.*)", "/${segment}") ).uri("https://ereg-services-" + miljo + ".dev.intern.nav.no/"); } -} \ No newline at end of file +} diff --git a/proxies/histark-proxy/src/main/java/no/nav/testnav/proxies/histarkproxy/HistarkProxyApplicationStarter.java b/proxies/histark-proxy/src/main/java/no/nav/testnav/proxies/histarkproxy/HistarkProxyApplicationStarter.java index a3a877bbf57..2306c5e8137 100644 --- a/proxies/histark-proxy/src/main/java/no/nav/testnav/proxies/histarkproxy/HistarkProxyApplicationStarter.java +++ b/proxies/histark-proxy/src/main/java/no/nav/testnav/proxies/histarkproxy/HistarkProxyApplicationStarter.java @@ -27,4 +27,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { public static void main(String[] args) { SpringApplication.run(HistarkProxyApplicationStarter.class, args); } -} +} \ No newline at end of file diff --git a/proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/HodejegerenProxyApplicationStarter.java b/proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/HodejegerenProxyApplicationStarter.java index ce81c45b68c..fe1b221acd2 100644 --- a/proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/HodejegerenProxyApplicationStarter.java +++ b/proxies/hodejegeren-proxy/src/main/java/no/nav/testnav/proxies/hodejegerenproxy/HodejegerenProxyApplicationStarter.java @@ -39,4 +39,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder, NavAzureAdTo .uri(properties.getUrl())) .build(); } -} +} \ No newline at end of file diff --git a/proxies/inntektstub-proxy/src/main/java/no/nav/testnav/proxies/inntektstubproxy/InntektstubProxyApplicationStarter.java b/proxies/inntektstub-proxy/src/main/java/no/nav/testnav/proxies/inntektstubproxy/InntektstubProxyApplicationStarter.java index 5c58c0e646a..0aedfddb27b 100644 --- a/proxies/inntektstub-proxy/src/main/java/no/nav/testnav/proxies/inntektstubproxy/InntektstubProxyApplicationStarter.java +++ b/proxies/inntektstub-proxy/src/main/java/no/nav/testnav/proxies/inntektstubproxy/InntektstubProxyApplicationStarter.java @@ -27,4 +27,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .route(spec -> spec.path("/**").uri("http://inntektstub.team-inntekt.svc.nais.local/")) .build(); } -} \ No newline at end of file +} diff --git a/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java b/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java index a46462d02ed..25cb6073a50 100644 --- a/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java +++ b/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java @@ -30,4 +30,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .uri("https://institusjon-opphold-testdata.dev.intern.nav.no/")) .build(); } -} +} \ No newline at end of file diff --git a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java b/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java index 6b1bcd20818..76d8eec90ef 100644 --- a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java +++ b/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java @@ -30,4 +30,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { ) .build(); } -} \ No newline at end of file +} diff --git a/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/KontoregisterProxyApplicationStarter.java b/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/KontoregisterProxyApplicationStarter.java index c3cf29bbd44..5c74ba885f2 100644 --- a/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/KontoregisterProxyApplicationStarter.java +++ b/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/KontoregisterProxyApplicationStarter.java @@ -41,4 +41,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder, Trygdeetaten .build(); } -} +} \ No newline at end of file diff --git a/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/KrrstubProxyApplicationStarter.java b/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/KrrstubProxyApplicationStarter.java index f159d9cc1a0..5a24605760f 100644 --- a/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/KrrstubProxyApplicationStarter.java +++ b/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/KrrstubProxyApplicationStarter.java @@ -40,4 +40,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder, Trygdeetaten .uri(properties.getUrl())) .build(); } -} \ No newline at end of file +} diff --git a/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/MedlProxyApplicationStarter.java b/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/MedlProxyApplicationStarter.java index b776c7716fa..45abaaf55f6 100644 --- a/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/MedlProxyApplicationStarter.java +++ b/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/MedlProxyApplicationStarter.java @@ -40,4 +40,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder, Trygdeetaten .uri(properties.getUrl())) .build(); } -} +} \ No newline at end of file diff --git a/proxies/norg2-proxy/src/main/java/no/nav/testnav/proxies/norg2proxy/Norg2ProxyApplicationStarter.java b/proxies/norg2-proxy/src/main/java/no/nav/testnav/proxies/norg2proxy/Norg2ProxyApplicationStarter.java index 335d19b29d1..1b614326c72 100644 --- a/proxies/norg2-proxy/src/main/java/no/nav/testnav/proxies/norg2proxy/Norg2ProxyApplicationStarter.java +++ b/proxies/norg2-proxy/src/main/java/no/nav/testnav/proxies/norg2proxy/Norg2ProxyApplicationStarter.java @@ -28,4 +28,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .uri("http://norg2.org.svc.nais.local")) .build(); } -} +} \ No newline at end of file diff --git a/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/PdlProxyApplicationStarter.java b/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/PdlProxyApplicationStarter.java index b6c57f5d8d3..bdf9e0b038c 100644 --- a/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/PdlProxyApplicationStarter.java +++ b/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/PdlProxyApplicationStarter.java @@ -92,4 +92,4 @@ private Function> createRoute(String segment, St .filter(filter) ).uri(host); } -} +} \ No newline at end of file diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/PensjonTestdataFacadeProxyApplicationStarter.java b/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/PensjonTestdataFacadeProxyApplicationStarter.java index 3373f64442e..4a18d5568a5 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/PensjonTestdataFacadeProxyApplicationStarter.java +++ b/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/PensjonTestdataFacadeProxyApplicationStarter.java @@ -79,4 +79,4 @@ private GatewayFilter getAuthenticationFilter(TrygdeetatenAzureAdTokenService to public static void main(String[] args) { SpringApplication.run(PensjonTestdataFacadeProxyApplicationStarter.class, args); } -} +} \ No newline at end of file diff --git a/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/SafProxyApplicationStarter.java b/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/SafProxyApplicationStarter.java index 7a904a2b175..2d05f94cd08 100644 --- a/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/SafProxyApplicationStarter.java +++ b/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/SafProxyApplicationStarter.java @@ -61,4 +61,4 @@ private Function> createRoute(String miljo, Stri .filter(filter) ).uri(url); } -} \ No newline at end of file +} diff --git a/proxies/sigrunstub-proxy/src/main/java/no/nav/testnav/proxies/sigrunstubproxy/SigrunstubProxyApplicationStarter.java b/proxies/sigrunstub-proxy/src/main/java/no/nav/testnav/proxies/sigrunstubproxy/SigrunstubProxyApplicationStarter.java index 55ed2381fe0..09974df3c04 100644 --- a/proxies/sigrunstub-proxy/src/main/java/no/nav/testnav/proxies/sigrunstubproxy/SigrunstubProxyApplicationStarter.java +++ b/proxies/sigrunstub-proxy/src/main/java/no/nav/testnav/proxies/sigrunstubproxy/SigrunstubProxyApplicationStarter.java @@ -27,4 +27,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .route(spec -> spec.path("/**").uri("http://sigrun-skd-stub.team-inntekt.svc.nais.local/")) .build(); } -} +} \ No newline at end of file diff --git a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/SkjermingsregisterProxyApplicationStarter.java b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/SkjermingsregisterProxyApplicationStarter.java index 6b0a97e5ece..170d704c300 100644 --- a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/SkjermingsregisterProxyApplicationStarter.java +++ b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/SkjermingsregisterProxyApplicationStarter.java @@ -48,4 +48,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder, StsOidcToken .build(); } -} \ No newline at end of file +} diff --git a/proxies/statisk-data-forvalter-proxy/src/main/java/no/nav/testnav/proxies/statiskdataforvalterproxy/StatiskDataForvalterProxyApplicationStarter.java b/proxies/statisk-data-forvalter-proxy/src/main/java/no/nav/testnav/proxies/statiskdataforvalterproxy/StatiskDataForvalterProxyApplicationStarter.java index e0239911e8f..000b9c63e1e 100644 --- a/proxies/statisk-data-forvalter-proxy/src/main/java/no/nav/testnav/proxies/statiskdataforvalterproxy/StatiskDataForvalterProxyApplicationStarter.java +++ b/proxies/statisk-data-forvalter-proxy/src/main/java/no/nav/testnav/proxies/statiskdataforvalterproxy/StatiskDataForvalterProxyApplicationStarter.java @@ -41,4 +41,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder, NavAzureAdTo .build(); } -} \ No newline at end of file +} diff --git a/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/SynthdataMeldekortProxyApplicationStarter.java b/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/SynthdataMeldekortProxyApplicationStarter.java index 46412737b5a..4010c801920 100644 --- a/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/SynthdataMeldekortProxyApplicationStarter.java +++ b/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/SynthdataMeldekortProxyApplicationStarter.java @@ -40,4 +40,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder, NavAzureAdTo .uri(properties.getUrl())) .build(); } -} +} \ No newline at end of file diff --git a/proxies/tps-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/tpsforvalterenproxy/TpsForvalterenProxyApplicationStarter.java b/proxies/tps-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/tpsforvalterenproxy/TpsForvalterenProxyApplicationStarter.java index 9a5e2c47fc3..736cc99d9f9 100644 --- a/proxies/tps-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/tpsforvalterenproxy/TpsForvalterenProxyApplicationStarter.java +++ b/proxies/tps-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/tpsforvalterenproxy/TpsForvalterenProxyApplicationStarter.java @@ -48,4 +48,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { .uri(url) ).build(); } -} \ No newline at end of file +} diff --git a/proxies/udistub-proxy/src/main/java/no/nav/testnav/proxies/udistubproxy/UdistubProxyApplicationStarter.java b/proxies/udistub-proxy/src/main/java/no/nav/testnav/proxies/udistubproxy/UdistubProxyApplicationStarter.java index a5ab430bf06..0ea9037d984 100644 --- a/proxies/udistub-proxy/src/main/java/no/nav/testnav/proxies/udistubproxy/UdistubProxyApplicationStarter.java +++ b/proxies/udistub-proxy/src/main/java/no/nav/testnav/proxies/udistubproxy/UdistubProxyApplicationStarter.java @@ -52,4 +52,4 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) { public static void main(String[] args) { SpringApplication.run(UdistubProxyApplicationStarter.class, args); } -} \ No newline at end of file +} From 6564af83941a1f4bc6b3014c0239a5f26d7e500a Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 14:16:51 +0200 Subject: [PATCH 28/49] Aareg proxy service discovery #deploy-proxy --- proxies/aareg-proxy/src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxies/aareg-proxy/src/main/resources/application.yaml b/proxies/aareg-proxy/src/main/resources/application.yaml index 874bacaa042..b98b6102175 100644 --- a/proxies/aareg-proxy/src/main/resources/application.yaml +++ b/proxies/aareg-proxy/src/main/resources/application.yaml @@ -33,7 +33,7 @@ app: services: name: aareg-services-nais-{env} namespace: arbeidsforhold - url: https://aareg-services-{env}.dev.intern.nav.no + url: http://aareg-services-{env}.arbeidsforhold.svc.nais.local cluster: dev-fss vedlikehold: name: aareg-vedlikehold-{env} From 31434e32d73c5dece37b52842d2a9d095ae3b057 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 14:30:48 +0200 Subject: [PATCH 29/49] Arenaforvalteren endring #deploy-proxy --- .../proxies/arenaforvalterenproxy/ArenaServerProperties.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java b/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java index a6dce5b44dc..a8919e44169 100644 --- a/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java +++ b/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java @@ -22,6 +22,7 @@ ArenaServerProperties forEnvironment(String env) { var copy = copyOf(this); copy.setUrl(copy.getUrl().replace("{env}", env)); + copy.setName(copy.getName().replace("{env}", env)); return copy; } -} +} \ No newline at end of file From 560670a8cbfcc5be11c5a90378a8921b58e34eed Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 14:52:41 +0200 Subject: [PATCH 30/49] Lombok endringer #deploy-proxy --- proxies/arena-forvalteren-proxy/build.gradle | 5 ++++- proxies/pensjon-testdata-facade-proxy/build.gradle | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 037ee378ff2..2005fc1e50b 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -1,6 +1,5 @@ plugins { id 'java' - id "io.freefair.lombok" version "6.6.2" id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.3" @@ -67,6 +66,10 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' + + implementation 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' } java { toolchain { diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index cad2b347def..7cd76a85cfb 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -1,6 +1,5 @@ plugins { id 'java' - id "io.freefair.lombok" version "6.6.2" id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.1.4" id 'io.spring.dependency-management' version "1.1.3" @@ -68,6 +67,10 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' + + implementation 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' } java { toolchain { From a424ac57ed7e261226297bc8ee4246de533eaeee Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 15:03:30 +0200 Subject: [PATCH 31/49] Tester endring #deploy-proxy --- .../dokarkivproxy/config/credentials/DokarkivProperties.java | 4 ++-- proxies/dokarkiv-proxy/src/main/resources/application.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/credentials/DokarkivProperties.java b/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/credentials/DokarkivProperties.java index 9e448151f9d..f86441c3eac 100644 --- a/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/credentials/DokarkivProperties.java +++ b/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/credentials/DokarkivProperties.java @@ -20,8 +20,8 @@ private static DokarkivProperties copyOf(DokarkivProperties original) { public DokarkivProperties forEnvironment(String env) { var replacement = "q2".equals(env) ? "" : '-' + env; var copy = DokarkivProperties.copyOf(this); - copy.setUrl(copy.getUrl().replace("-{env}", replacement)); - copy.setName(copy.getName().replace("-{env}", replacement)); + copy.setUrl(copy.getUrl().replace("-TEMP", replacement)); + copy.setName(copy.getName().replace("-TEMP", replacement)); return copy; } diff --git a/proxies/dokarkiv-proxy/src/main/resources/application.yml b/proxies/dokarkiv-proxy/src/main/resources/application.yml index 2e78ccc7618..15c9b2a32cf 100644 --- a/proxies/dokarkiv-proxy/src/main/resources/application.yml +++ b/proxies/dokarkiv-proxy/src/main/resources/application.yml @@ -24,9 +24,9 @@ spring: consumers: dokarkiv: - url: http://dokarkiv-{env}.teamdokumenthandtering.svc.nais.local + url: http://dokarkiv-TEMP.teamdokumenthandtering.svc.nais.local cluster: dev-fss - name: dokarkiv-{env} + name: dokarkiv-TEMP namespace: teamdokumenthandtering environments: q1,q2,q4,q5 From 4801f4775c9996ff21c589c84aa773bb29ede6b4 Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 15:11:07 +0200 Subject: [PATCH 32/49] Fikset resterende proxier i crashbackloop #deploy-proxy --- .../proxies/arenaforvalterenproxy/ArenaServerProperties.java | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../config/credentials/SamboerTestdataProperties.java | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../proxies/safproxy/config/credentials/SafProperties.java | 4 ++-- proxies/saf-proxy/src/main/resources/application.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java b/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java index a8919e44169..b1a2579fa39 100644 --- a/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java +++ b/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java @@ -21,8 +21,8 @@ private static ArenaServerProperties copyOf(ArenaServerProperties original) { ArenaServerProperties forEnvironment(String env) { var copy = copyOf(this); - copy.setUrl(copy.getUrl().replace("{env}", env)); - copy.setName(copy.getName().replace("{env}", env)); + copy.setUrl(copy.getUrl().replace("TEMP", env)); + copy.setName(copy.getName().replace("TEMP", env)); return copy; } } \ No newline at end of file diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application.yml index 7135d0178d2..dc587764496 100644 --- a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml +++ b/proxies/arena-forvalteren-proxy/src/main/resources/application.yml @@ -25,7 +25,7 @@ spring: app: arena: services: - name: arena-services-{env} + name: arena-services-TEMP namespace: teamarenanais - url: http://arena-ords-{env}.teamarenanais.svc.nais.local + url: http://arena-ords-TEMP.teamarenanais.svc.nais.local cluster: dev-fss \ No newline at end of file diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/credentials/SamboerTestdataProperties.java b/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/credentials/SamboerTestdataProperties.java index 498bf938bff..89743455065 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/credentials/SamboerTestdataProperties.java +++ b/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/credentials/SamboerTestdataProperties.java @@ -20,8 +20,8 @@ private static SamboerTestdataProperties copyOf(SamboerTestdataProperties origin public SamboerTestdataProperties forEnvironment(String env) { var copy = copyOf(this); - copy.setUrl(copy.getUrl().replace("{env}", env + ("q1".equals(env) ? ".very" : ""))); - copy.setName(copy.getName().replace("{env}", env)); + copy.setUrl(copy.getUrl().replace("TEMP", env + ("q1".equals(env) ? ".very" : ""))); + copy.setName(copy.getName().replace("TEMP", env)); return copy; } } diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml index 6dae2b20d9b..a1247f21ba2 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml +++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml @@ -29,7 +29,7 @@ consumers: url: https://popp-testdata.intern.dev.nav.no cluster: dev-gcp samboer-testdata: - name: pensjon-samboerforhold-backend-{env} + name: pensjon-samboerforhold-backend-TEMP namespace: pensjon-person - url: https://pensjon-samboerforhold-backend-{env}.intern.dev.nav.no + url: https://pensjon-samboerforhold-backend-TEMP.intern.dev.nav.no cluster: dev-gcp \ No newline at end of file diff --git a/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/config/credentials/SafProperties.java b/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/config/credentials/SafProperties.java index 9186e16c87e..04e0715cd4b 100644 --- a/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/config/credentials/SafProperties.java +++ b/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/config/credentials/SafProperties.java @@ -20,8 +20,8 @@ private static SafProperties copyOf(SafProperties original) { public ServerProperties forEnvironment(String env) { var replacement = "q2".equals(env) ? "" : '-' + env; var copy = SafProperties.copyOf(this); - copy.setUrl(copy.getUrl().replace("-{env}", replacement)); - copy.setName(copy.getName().replace("-{env}", replacement)); + copy.setUrl(copy.getUrl().replace("-TEMP", replacement)); + copy.setName(copy.getName().replace("-TEMP", replacement)); return copy; } diff --git a/proxies/saf-proxy/src/main/resources/application.yml b/proxies/saf-proxy/src/main/resources/application.yml index 613b7aae7cc..ba9af9f59ff 100644 --- a/proxies/saf-proxy/src/main/resources/application.yml +++ b/proxies/saf-proxy/src/main/resources/application.yml @@ -24,7 +24,7 @@ spring: consumers: saf: - url: http://saf-{env}.teamdokumenthandtering.svc.nais.local + url: http://saf-TEMP.teamdokumenthandtering.svc.nais.local cluster: dev-fss - name: saf-{env} + name: saf-TEMP namespace: teamdokumenthandtering \ No newline at end of file From 8f21ba47e240b26ee70cb585bcf099f5d4051bfc Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 15:30:25 +0200 Subject: [PATCH 33/49] Endret navn #deploy-proxy --- .../proxies/arenaforvalterenproxy/ArenaServerProperties.java | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../dokarkivproxy/config/credentials/DokarkivProperties.java | 4 ++-- proxies/dokarkiv-proxy/src/main/resources/application.yml | 4 ++-- .../config/credentials/SamboerTestdataProperties.java | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../proxies/safproxy/config/credentials/SafProperties.java | 4 ++-- proxies/saf-proxy/src/main/resources/application.yml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java b/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java index b1a2579fa39..ba9ba1bfc5d 100644 --- a/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java +++ b/proxies/arena-forvalteren-proxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java @@ -21,8 +21,8 @@ private static ArenaServerProperties copyOf(ArenaServerProperties original) { ArenaServerProperties forEnvironment(String env) { var copy = copyOf(this); - copy.setUrl(copy.getUrl().replace("TEMP", env)); - copy.setName(copy.getName().replace("TEMP", env)); + copy.setUrl(copy.getUrl().replace("MILJOE", env)); + copy.setName(copy.getName().replace("MILJOE", env)); return copy; } } \ No newline at end of file diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application.yml index dc587764496..46bf39d43e1 100644 --- a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml +++ b/proxies/arena-forvalteren-proxy/src/main/resources/application.yml @@ -25,7 +25,7 @@ spring: app: arena: services: - name: arena-services-TEMP + name: arena-services-MILJOE namespace: teamarenanais - url: http://arena-ords-TEMP.teamarenanais.svc.nais.local + url: http://arena-ords-MILJOE.teamarenanais.svc.nais.local cluster: dev-fss \ No newline at end of file diff --git a/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/credentials/DokarkivProperties.java b/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/credentials/DokarkivProperties.java index f86441c3eac..2d7b4f5acd4 100644 --- a/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/credentials/DokarkivProperties.java +++ b/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/credentials/DokarkivProperties.java @@ -20,8 +20,8 @@ private static DokarkivProperties copyOf(DokarkivProperties original) { public DokarkivProperties forEnvironment(String env) { var replacement = "q2".equals(env) ? "" : '-' + env; var copy = DokarkivProperties.copyOf(this); - copy.setUrl(copy.getUrl().replace("-TEMP", replacement)); - copy.setName(copy.getName().replace("-TEMP", replacement)); + copy.setUrl(copy.getUrl().replace("-MILJOE", replacement)); + copy.setName(copy.getName().replace("-MILJOE", replacement)); return copy; } diff --git a/proxies/dokarkiv-proxy/src/main/resources/application.yml b/proxies/dokarkiv-proxy/src/main/resources/application.yml index 15c9b2a32cf..557541271a9 100644 --- a/proxies/dokarkiv-proxy/src/main/resources/application.yml +++ b/proxies/dokarkiv-proxy/src/main/resources/application.yml @@ -24,9 +24,9 @@ spring: consumers: dokarkiv: - url: http://dokarkiv-TEMP.teamdokumenthandtering.svc.nais.local + url: http://dokarkiv-MILJOE.teamdokumenthandtering.svc.nais.local cluster: dev-fss - name: dokarkiv-TEMP + name: dokarkiv-MILJOE namespace: teamdokumenthandtering environments: q1,q2,q4,q5 diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/credentials/SamboerTestdataProperties.java b/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/credentials/SamboerTestdataProperties.java index 89743455065..bb19cd87b1e 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/credentials/SamboerTestdataProperties.java +++ b/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/credentials/SamboerTestdataProperties.java @@ -20,8 +20,8 @@ private static SamboerTestdataProperties copyOf(SamboerTestdataProperties origin public SamboerTestdataProperties forEnvironment(String env) { var copy = copyOf(this); - copy.setUrl(copy.getUrl().replace("TEMP", env + ("q1".equals(env) ? ".very" : ""))); - copy.setName(copy.getName().replace("TEMP", env)); + copy.setUrl(copy.getUrl().replace("MILJOE", env + ("q1".equals(env) ? ".very" : ""))); + copy.setName(copy.getName().replace("MILJOE", env)); return copy; } } diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml index a1247f21ba2..c22bfb5f11e 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml +++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml @@ -29,7 +29,7 @@ consumers: url: https://popp-testdata.intern.dev.nav.no cluster: dev-gcp samboer-testdata: - name: pensjon-samboerforhold-backend-TEMP + name: pensjon-samboerforhold-backend-MILJOE namespace: pensjon-person - url: https://pensjon-samboerforhold-backend-TEMP.intern.dev.nav.no + url: https://pensjon-samboerforhold-backend-MILJOE.intern.dev.nav.no cluster: dev-gcp \ No newline at end of file diff --git a/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/config/credentials/SafProperties.java b/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/config/credentials/SafProperties.java index 04e0715cd4b..deeae335fb9 100644 --- a/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/config/credentials/SafProperties.java +++ b/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/config/credentials/SafProperties.java @@ -20,8 +20,8 @@ private static SafProperties copyOf(SafProperties original) { public ServerProperties forEnvironment(String env) { var replacement = "q2".equals(env) ? "" : '-' + env; var copy = SafProperties.copyOf(this); - copy.setUrl(copy.getUrl().replace("-TEMP", replacement)); - copy.setName(copy.getName().replace("-TEMP", replacement)); + copy.setUrl(copy.getUrl().replace("-MILJOE", replacement)); + copy.setName(copy.getName().replace("-MILJOE", replacement)); return copy; } diff --git a/proxies/saf-proxy/src/main/resources/application.yml b/proxies/saf-proxy/src/main/resources/application.yml index ba9af9f59ff..962d2834e86 100644 --- a/proxies/saf-proxy/src/main/resources/application.yml +++ b/proxies/saf-proxy/src/main/resources/application.yml @@ -24,7 +24,7 @@ spring: consumers: saf: - url: http://saf-TEMP.teamdokumenthandtering.svc.nais.local + url: http://saf-MILJOE.teamdokumenthandtering.svc.nais.local cluster: dev-fss - name: saf-TEMP + name: saf-MILJOE namespace: teamdokumenthandtering \ No newline at end of file From 6bf0ce204b10bbdd0c5cc2c25da9ecba35b3982a Mon Sep 17 00:00:00 2001 From: stigus Date: Mon, 23 Oct 2023 10:02:18 +0200 Subject: [PATCH 34/49] Deploy oppsummeringsdokument-service #deploy-oppsummeringsdokument-service --- .../OppsummeringsdokumentServiceApplicationStarter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/OppsummeringsdokumentServiceApplicationStarter.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/OppsummeringsdokumentServiceApplicationStarter.java index cf9d43cae1a..c29911c75ea 100644 --- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/OppsummeringsdokumentServiceApplicationStarter.java +++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/OppsummeringsdokumentServiceApplicationStarter.java @@ -11,4 +11,4 @@ public class OppsummeringsdokumentServiceApplicationStarter { public static void main(String[] args) { SpringApplication.run(OppsummeringsdokumentServiceApplicationStarter.class, args); } -} +} \ No newline at end of file From e42a5379d9cd1c748dc4006418ada24244980ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Mon, 23 Oct 2023 13:27:40 +0200 Subject: [PATCH 35/49] =?UTF-8?q?KOR2024=20lagt=20til=20postnumre=20for=20?= =?UTF-8?q?Haram=20og=20=C3=85lesund=20#deploy-test-pdl-forv=E2=80=A6=20(#?= =?UTF-8?q?3314)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit KOR2024 lagt til postnumre for Haram og Ålesund --- .../MatrikkeladresseServiceCommand.java | 4 +- .../command/VegadresseServiceCommand.java | 4 +- .../utils/Kor2024KommuneEndringer.java | 336 ++++++++++++------ 3 files changed, 225 insertions(+), 119 deletions(-) diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/MatrikkeladresseServiceCommand.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/MatrikkeladresseServiceCommand.java index 9291e94f6cd..e5080e778c9 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/MatrikkeladresseServiceCommand.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/MatrikkeladresseServiceCommand.java @@ -92,7 +92,9 @@ private MultiValueMap getQuery() { Kor2024KommuneEndringer.getKommuneNummer(query.getKommunenummer()) : null), "gaardsnummer", filterArtifact(nullcheck(query.getGaardsnummer())), "bruksnummer", filterArtifact(nullcheck(query.getBruksnummer())), - "postnummer", filterArtifact(query.getPostnummer()), + "postnummer", filterArtifact(isNotBlank(query.getKommunenummer()) ? + Kor2024KommuneEndringer.getRandomPostnummer(query.getKommunenummer()) : + query.getPostnummer()), "tilleggsnavn", filterArtifact(query.getTilleggsnavn())) .entrySet().stream() .filter(entry -> isNotBlank(entry.getValue())) diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/VegadresseServiceCommand.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/VegadresseServiceCommand.java index 59efa626f0d..d8bf208fdd4 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/VegadresseServiceCommand.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/consumer/command/VegadresseServiceCommand.java @@ -86,7 +86,9 @@ private MultiValueMap getQuery() { "adressenavn", filterArtifact(query.getAdressenavn()), "husnummer", filterArtifact(query.getHusnummer()), "husbokstav", filterArtifact(query.getHusbokstav()), - "postnummer", filterArtifact(query.getPostnummer()), + "postnummer", filterArtifact(isNotBlank(query.getKommunenummer()) ? + Kor2024KommuneEndringer.getRandomPostnummer(query.getKommunenummer()) : + query.getPostnummer()), "kommunenummer", filterArtifact(isNotBlank(query.getKommunenummer()) ? Kor2024KommuneEndringer.getKommuneNummer(query.getKommunenummer()) : null), "bydelsnummer", filterArtifact(query.getBydelsnummer()), diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/Kor2024KommuneEndringer.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/Kor2024KommuneEndringer.java index a91c5f02cab..3d25c80c10a 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/Kor2024KommuneEndringer.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/utils/Kor2024KommuneEndringer.java @@ -4,137 +4,239 @@ import no.nav.testnav.libs.dto.pdlforvalter.v1.MatrikkeladresseDTO; import no.nav.testnav.libs.dto.pdlforvalter.v1.VegadresseDTO; +import java.security.SecureRandom; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Random; +import java.util.Set; import static org.apache.commons.lang3.StringUtils.isBlank; @UtilityClass public class Kor2024KommuneEndringer { - private static Map KOMMUNER = new HashMap<>(); + private static final String HARAM = "1580"; + private static final String AALESUND = "1508"; + private static Random postnummer = new SecureRandom(); + + private static Map kommuner = new HashMap<>(); + + static { + kommuner.put("1508", "1507"); // Ålesund + kommuner.put("1580", "1507"); // Haram + kommuner.put("3101", "3001"); // Halden + kommuner.put("3103", "3002"); // Moss + kommuner.put("3105", "3003"); // Sarpsborg + kommuner.put("3107", "3004"); // Fredrikstad + kommuner.put("3301", "3005"); // Drammen + kommuner.put("3303", "3006"); // Kongsberg + kommuner.put("3305", "3007"); // Ringerike + kommuner.put("3110", "3011"); // Hvaler + kommuner.put("3124", "3012"); // Aremark + kommuner.put("3122", "3013"); // Marker + kommuner.put("3118", "3014"); // Indre Østfold + kommuner.put("3116", "3015"); // Skiptvet + kommuner.put("3120", "3016"); // Rakkestad + kommuner.put("3112", "3017"); // Råde + kommuner.put("3114", "3018"); // Våler + kommuner.put("3216", "3019"); // Vestby + kommuner.put("3207", "3020"); // Nordre Follo + kommuner.put("3218", "3021"); // Ås + kommuner.put("3214", "3022"); // Frogn + kommuner.put("3212", "3023"); // Nesodden + kommuner.put("3201", "3024"); // Bærum + kommuner.put("3203", "3025"); // Asker + kommuner.put("3226", "3026"); // Aurskog-Høland + kommuner.put("3224", "3027"); // Rælingen + kommuner.put("3220", "3028"); // Enebakk + kommuner.put("3222", "3029"); // Lørenskog + kommuner.put("3205", "3030"); // Lillestrøm + kommuner.put("3232", "3031"); // Nittedal + kommuner.put("3230", "3032"); // Gjerdrum + kommuner.put("3209", "3033"); // Ullensaker + kommuner.put("3228", "3034"); // Nes + kommuner.put("3240", "3035"); // Eidsvoll + kommuner.put("3238", "3036"); // Nannestad + kommuner.put("3242", "3037"); // Hurdal + kommuner.put("3310", "3038"); // Hole + kommuner.put("3320", "3039"); // Flå + kommuner.put("3322", "3040"); // Nesbyen + kommuner.put("3324", "3041"); // Gol + kommuner.put("3326", "3042"); // Hemsedal + kommuner.put("3328", "3043"); // Ål + kommuner.put("3330", "3044"); // Hol + kommuner.put("3332", "3045"); // Sigdal + kommuner.put("3318", "3046"); // Krødsherad + kommuner.put("3316", "3047"); // Modum + kommuner.put("3314", "3048"); // Øvre Eiker + kommuner.put("3312", "3049"); // Lier + kommuner.put("3334", "3050"); // Flesberg + kommuner.put("3336", "3051"); // Rollag + kommuner.put("3338", "3052"); // Nore og Uvdal + kommuner.put("3236", "3053"); // Jevnaker + kommuner.put("3234", "3054"); // Lunner + kommuner.put("3901", "3801"); // Horten + kommuner.put("3903", "3802"); // Holmestrand + kommuner.put("3905", "3803"); // Tønsberg + kommuner.put("3907", "3804"); // Sandefjord + kommuner.put("3909", "3805"); // Larvik + kommuner.put("4001", "3806"); // Porsgrunn + kommuner.put("4003", "3807"); // Skien + kommuner.put("4005", "3808"); // Notodden + kommuner.put("3911", "3811"); // Færder + kommuner.put("4010", "3812"); // Siljan + kommuner.put("4012", "3813"); // Bamble + kommuner.put("4014", "3814"); // Kragerø + kommuner.put("4016", "3815"); // Drangedal + kommuner.put("4018", "3816"); // Nome + kommuner.put("4020", "3817"); // Midt-Telemark + kommuner.put("4026", "3818"); // Tinn + kommuner.put("4024", "3819"); // Hjartdal + kommuner.put("4022", "3820"); // Seljord + kommuner.put("4028", "3821"); // Kviteseid + kommuner.put("4030", "3822"); // Nissedal + kommuner.put("4032", "3823"); // Fyresdal + kommuner.put("4034", "3824"); // Tokke + kommuner.put("4036", "3825"); // Vinje + kommuner.put("5501", "5401"); // Tromsø + kommuner.put("5503", "5402"); // Harstad + kommuner.put("5601", "5403"); // Alta + kommuner.put("5634", "5404"); // Vardø + kommuner.put("5607", "5405"); // Vadsø + kommuner.put("5603", "5406"); // Hammerfest + kommuner.put("5510", "5411"); // Kvæfjord + kommuner.put("5512", "5412"); // Tjeldsund + kommuner.put("5514", "5413"); // Ibestad + kommuner.put("5516", "5414"); // Gratangen + kommuner.put("5518", "5415"); // Lavangen + kommuner.put("5520", "5416"); // Bardu + kommuner.put("5522", "5417"); // Salangen + kommuner.put("5524", "5418"); // Målselv + kommuner.put("5526", "5419"); // Sørreisa + kommuner.put("5528", "5420"); // Dyrøy + kommuner.put("5530", "5421"); // Senja + kommuner.put("5532", "5422"); // Balsfjord + kommuner.put("5534", "5423"); // Karlsøy + kommuner.put("5536", "5424"); // Lyngen + kommuner.put("5538", "5425"); // Storfjord + kommuner.put("5540", "5426"); // Kåfjord + kommuner.put("5542", "5427"); // Skjervøy + kommuner.put("5544", "5428"); // Nordreisa + kommuner.put("5546", "5429"); // Kvænangen + kommuner.put("5612", "5430"); // Kautokeino + kommuner.put("5614", "5432"); // Loppa + kommuner.put("5616", "5433"); // Hasvik + kommuner.put("5618", "5434"); // Måsøy + kommuner.put("5620", "5435"); // Nordkapp + kommuner.put("5622", "5436"); // Porsanger + kommuner.put("5610", "5437"); // Karasjok + kommuner.put("5624", "5438"); // Lebesby + kommuner.put("5626", "5439"); // Gamvik + kommuner.put("5630", "5440"); // Berlevåg + kommuner.put("5628", "5441"); // Tana + kommuner.put("5636", "5442"); // Nesseby + kommuner.put("5632", "5443"); // Båtsfjord + kommuner.put("5605", "5444"); // Sør-Varanger + } + + private static Set postnummerHaram = new HashSet<>(); static { - KOMMUNER.put("1508", "1507"); // Ålesund - KOMMUNER.put("1580", "1507"); // Haram - KOMMUNER.put("3101", "3001"); // Halden - KOMMUNER.put("3103", "3002"); // Moss - KOMMUNER.put("3105", "3003"); // Sarpsborg - KOMMUNER.put("3107", "3004"); // Fredrikstad - KOMMUNER.put("3301", "3005"); // Drammen - KOMMUNER.put("3303", "3006"); // Kongsberg - KOMMUNER.put("3305", "3007"); // Ringerike - KOMMUNER.put("3110", "3011"); // Hvaler - KOMMUNER.put("3124", "3012"); // Aremark - KOMMUNER.put("3122", "3013"); // Marker - KOMMUNER.put("3118", "3014"); // Indre Østfold - KOMMUNER.put("3116", "3015"); // Skiptvet - KOMMUNER.put("3120", "3016"); // Rakkestad - KOMMUNER.put("3112", "3017"); // Råde - KOMMUNER.put("3114", "3018"); // Våler - KOMMUNER.put("3216", "3019"); // Vestby - KOMMUNER.put("3207", "3020"); // Nordre Follo - KOMMUNER.put("3218", "3021"); // Ås - KOMMUNER.put("3214", "3022"); // Frogn - KOMMUNER.put("3212", "3023"); // Nesodden - KOMMUNER.put("3201", "3024"); // Bærum - KOMMUNER.put("3203", "3025"); // Asker - KOMMUNER.put("3226", "3026"); // Aurskog-Høland - KOMMUNER.put("3224", "3027"); // Rælingen - KOMMUNER.put("3220", "3028"); // Enebakk - KOMMUNER.put("3222", "3029"); // Lørenskog - KOMMUNER.put("3205", "3030"); // Lillestrøm - KOMMUNER.put("3232", "3031"); // Nittedal - KOMMUNER.put("3230", "3032"); // Gjerdrum - KOMMUNER.put("3209", "3033"); // Ullensaker - KOMMUNER.put("3228", "3034"); // Nes - KOMMUNER.put("3240", "3035"); // Eidsvoll - KOMMUNER.put("3238", "3036"); // Nannestad - KOMMUNER.put("3242", "3037"); // Hurdal - KOMMUNER.put("3310", "3038"); // Hole - KOMMUNER.put("3320", "3039"); // Flå - KOMMUNER.put("3322", "3040"); // Nesbyen - KOMMUNER.put("3324", "3041"); // Gol - KOMMUNER.put("3326", "3042"); // Hemsedal - KOMMUNER.put("3328", "3043"); // Ål - KOMMUNER.put("3330", "3044"); // Hol - KOMMUNER.put("3332", "3045"); // Sigdal - KOMMUNER.put("3318", "3046"); // Krødsherad - KOMMUNER.put("3316", "3047"); // Modum - KOMMUNER.put("3314", "3048"); // Øvre Eiker - KOMMUNER.put("3312", "3049"); // Lier - KOMMUNER.put("3334", "3050"); // Flesberg - KOMMUNER.put("3336", "3051"); // Rollag - KOMMUNER.put("3338", "3052"); // Nore og Uvdal - KOMMUNER.put("3236", "3053"); // Jevnaker - KOMMUNER.put("3234", "3054"); // Lunner - KOMMUNER.put("3901", "3801"); // Horten - KOMMUNER.put("3903", "3802"); // Holmestrand - KOMMUNER.put("3905", "3803"); // Tønsberg - KOMMUNER.put("3907", "3804"); // Sandefjord - KOMMUNER.put("3909", "3805"); // Larvik - KOMMUNER.put("4001", "3806"); // Porsgrunn - KOMMUNER.put("4003", "3807"); // Skien - KOMMUNER.put("4005", "3808"); // Notodden - KOMMUNER.put("3911", "3811"); // Færder - KOMMUNER.put("4010", "3812"); // Siljan - KOMMUNER.put("4012", "3813"); // Bamble - KOMMUNER.put("4014", "3814"); // Kragerø - KOMMUNER.put("4016", "3815"); // Drangedal - KOMMUNER.put("4018", "3816"); // Nome - KOMMUNER.put("4020", "3817"); // Midt-Telemark - KOMMUNER.put("4026", "3818"); // Tinn - KOMMUNER.put("4024", "3819"); // Hjartdal - KOMMUNER.put("4022", "3820"); // Seljord - KOMMUNER.put("4028", "3821"); // Kviteseid - KOMMUNER.put("4030", "3822"); // Nissedal - KOMMUNER.put("4032", "3823"); // Fyresdal - KOMMUNER.put("4034", "3824"); // Tokke - KOMMUNER.put("4036", "3825"); // Vinje - KOMMUNER.put("5501", "5401"); // Tromsø - KOMMUNER.put("5503", "5402"); // Harstad - KOMMUNER.put("5601", "5403"); // Alta - KOMMUNER.put("5634", "5404"); // Vardø - KOMMUNER.put("5607", "5405"); // Vadsø - KOMMUNER.put("5603", "5406"); // Hammerfest - KOMMUNER.put("5510", "5411"); // Kvæfjord - KOMMUNER.put("5512", "5412"); // Tjeldsund - KOMMUNER.put("5514", "5413"); // Ibestad - KOMMUNER.put("5516", "5414"); // Gratangen - KOMMUNER.put("5518", "5415"); // Lavangen - KOMMUNER.put("5520", "5416"); // Bardu - KOMMUNER.put("5522", "5417"); // Salangen - KOMMUNER.put("5524", "5418"); // Målselv - KOMMUNER.put("5526", "5419"); // Sørreisa - KOMMUNER.put("5528", "5420"); // Dyrøy - KOMMUNER.put("5530", "5421"); // Senja - KOMMUNER.put("5532", "5422"); // Balsfjord - KOMMUNER.put("5534", "5423"); // Karlsøy - KOMMUNER.put("5536", "5424"); // Lyngen - KOMMUNER.put("5538", "5425"); // Storfjord - KOMMUNER.put("5540", "5426"); // Kåfjord - KOMMUNER.put("5542", "5427"); // Skjervøy - KOMMUNER.put("5544", "5428"); // Nordreisa - KOMMUNER.put("5546", "5429"); // Kvænangen - KOMMUNER.put("5612", "5430"); // Kautokeino - KOMMUNER.put("5614", "5432"); // Loppa - KOMMUNER.put("5616", "5433"); // Hasvik - KOMMUNER.put("5618", "5434"); // Måsøy - KOMMUNER.put("5620", "5435"); // Nordkapp - KOMMUNER.put("5622", "5436"); // Porsanger - KOMMUNER.put("5610", "5437"); // Karasjok - KOMMUNER.put("5624", "5438"); // Lebesby - KOMMUNER.put("5626", "5439"); // Gamvik - KOMMUNER.put("5630", "5440"); // Berlevåg - KOMMUNER.put("5628", "5441"); // Tana - KOMMUNER.put("5636", "5442"); // Nesseby - KOMMUNER.put("5632", "5443"); // Båtsfjord - KOMMUNER.put("5605", "5444"); // Sør-Varanger + + postnummerHaram.add("6264"); // TENNFJORD + postnummerHaram.add("6265"); // VATNE + postnummerHaram.add("6270"); // BRATTVÅG + postnummerHaram.add("6272"); // HILDRE + postnummerHaram.add("6280"); // SØVIK + postnummerHaram.add("6281"); // SØVIK + postnummerHaram.add("6282"); // BRATTVÅG + postnummerHaram.add("6283"); // VATNE + postnummerHaram.add("6285"); // STOREKALVØY + postnummerHaram.add("6290"); // HARAMSØY + postnummerHaram.add("6291"); // HARAMSØY + postnummerHaram.add("6292"); // KJERSTAD + postnummerHaram.add("6293"); // LONGVA + postnummerHaram.add("6294"); // FJØRTOF + } + + private static Set postnummerAalesund = new HashSet<>(); + + static { + postnummerAalesund.add("6001"); // ÅLESUND + postnummerAalesund.add("6002"); // ÅLESUND + postnummerAalesund.add("6003"); // ÅLESUND + postnummerAalesund.add("6004"); // ÅLESUND + postnummerAalesund.add("6005"); // ÅLESUND + postnummerAalesund.add("6006"); // ÅLESUND + postnummerAalesund.add("6007"); // ÅLESUND + postnummerAalesund.add("6008"); // ÅLESUND + postnummerAalesund.add("6009"); // ÅLESUND + postnummerAalesund.add("6010"); // ÅLESUND + postnummerAalesund.add("6011"); // ÅLESUND + postnummerAalesund.add("6012"); // ÅLESUND + postnummerAalesund.add("6013"); // ÅLESUND + postnummerAalesund.add("6014"); // ÅLESUND + postnummerAalesund.add("6015"); // ÅLESUND + postnummerAalesund.add("6016"); // ÅLESUND + postnummerAalesund.add("6017"); // ÅLESUND + postnummerAalesund.add("6018"); // ÅLESUND + postnummerAalesund.add("6019"); // ÅLESUND + postnummerAalesund.add("6020"); // ÅLESUND + postnummerAalesund.add("6021"); // ÅLESUND + postnummerAalesund.add("6022"); // ÅLESUND + postnummerAalesund.add("6023"); // ÅLESUND + postnummerAalesund.add("6024"); // ÅLESUND + postnummerAalesund.add("6025"); // ÅLESUND + postnummerAalesund.add("6026"); // ÅLESUND + postnummerAalesund.add("6028"); // ÅLESUND + postnummerAalesund.add("6029"); // ÅLESUND + postnummerAalesund.add("6043"); // ÅLESUND + postnummerAalesund.add("6044"); // ÅLESUND + postnummerAalesund.add("6045"); // ÅLESUND + postnummerAalesund.add("6046"); // ÅLESUND + postnummerAalesund.add("6047"); // ÅLESUND + postnummerAalesund.add("6048"); // ÅLESUND + postnummerAalesund.add("6057"); // ELLINGSØY + postnummerAalesund.add("6240"); // ØRSKOG + postnummerAalesund.add("6249"); // ØRSKOG + postnummerAalesund.add("6260"); // SKODJE + postnummerAalesund.add("6263"); // SKODJE + postnummerAalesund.add("6286"); // ORTEN + postnummerAalesund.add("6287"); // HARØY + postnummerAalesund.add("6295"); // MYKLEBOST + postnummerAalesund.add("6296"); // HARØY + postnummerAalesund.add("6297"); // SANDØY + postnummerAalesund.add("6298"); // ONA + postnummerAalesund.add("6424"); // SANDØY + postnummerAalesund.add("6426"); // ORTEN + postnummerAalesund.add("6427"); // HARØY + postnummerAalesund.add("6428"); // MYKLEBOST + } + + private String getRandomPostnummer(Set kommune) { + + return kommune.stream() + .skip(postnummer.nextInt(kommune.size())) + .findFirst() + .orElse(null); + } + public String getRandomPostnummer(String kommune) { + + if (HARAM.equals(kommune)) { + return getRandomPostnummer(postnummerHaram); + + } else if (AALESUND.equals(kommune)) { + return getRandomPostnummer(postnummerAalesund); + + } else { + return null; + } } public String getKommuneNummer(String kommuneNummer) { - return KOMMUNER.getOrDefault(kommuneNummer, kommuneNummer); + return kommuner.getOrDefault(kommuneNummer, kommuneNummer); } public boolean isGmlKommune(VegadresseDTO request, no.nav.testnav.libs.dto.adresseservice.v1.VegadresseDTO response) { From 9926b35de90b592af35b75f1079386bdb1452f94 Mon Sep 17 00:00:00 2001 From: stigus Date: Mon, 23 Oct 2023 13:35:28 +0200 Subject: [PATCH 36/49] =?UTF-8?q?St=C3=B8rre=20refaktorering=20av=20Oppsum?= =?UTF-8?q?meringsdokumentAdapter=20#deploy-oppsummeringsdokument-service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../build.gradle | 1 - .../adapter/OppsummeringsdokumentAdapter.java | 103 ++++++------------ .../config/OpensearchConfig.java | 16 +-- 3 files changed, 39 insertions(+), 81 deletions(-) diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index b2084bedec4..10e2d66412f 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -80,7 +80,6 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.opensearch.client:spring-data-opensearch:1.0.1' implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java index 936ab2dbad3..37e50555926 100644 --- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java +++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java @@ -9,29 +9,26 @@ import no.nav.testnav.apps.oppsummeringsdokumentservice.repository.OppsummeringsdokumentRepository; import no.nav.testnav.apps.oppsummeringsdokumentservice.repository.model.OppsummeringsdokumentModel; import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v2.Populasjon; -import org.opensearch.client.RestHighLevelClient; -import org.opensearch.data.client.orhlc.NativeSearchQueryBuilder; -import org.opensearch.index.query.QueryBuilder; -import org.opensearch.index.query.QueryBuilders; -import org.opensearch.index.query.RangeQueryBuilder; -import org.opensearch.search.sort.SortBuilders; -import org.opensearch.search.sort.SortOrder; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; +import org.springframework.data.elasticsearch.client.elc.NativeQueryBuilder; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.SearchHit; +import org.springframework.data.elasticsearch.core.query.Criteria; +import org.springframework.data.elasticsearch.core.query.CriteriaQuery; import org.springframework.stereotype.Component; import java.time.LocalDate; -import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.Optional; import java.util.stream.Collectors; +import static java.util.Objects.isNull; + @Slf4j @Component @RequiredArgsConstructor @@ -41,7 +38,6 @@ public class OppsummeringsdokumentAdapter { private final ObjectMapper objectMapper; private final OppsummeringsdokumentRepository repository; private final ElasticsearchOperations operations; - private final RestHighLevelClient client; private final AaregSyntConsumer aaregSyntConsumer; public void deleteAllBy(String miljo, Populasjon populasjon) { @@ -74,30 +70,28 @@ public Oppsummeringsdokument get(String id) { } public List getAllCurrentDocumentsBy(String miljo) { - return getAllCurrentDocumentsBy(new NativeSearchQueryBuilder() + return getAllCurrentDocumentsBy(new NativeQueryBuilder() .withQuery( - QueryBuilders.matchQuery(MILJO, miljo) - ) - ); + new CriteriaQuery(new Criteria(MILJO).is(miljo) + ) + )); } public Page getAllCurrentDocumentsBy(String miljo, Integer page) { var pageable = PageRequest.of(page, 1); - return getAllCurrentDocumentsBy(new NativeSearchQueryBuilder() + return getAllCurrentDocumentsBy(new NativeQueryBuilder() .withQuery( - QueryBuilders.matchQuery(MILJO, miljo) + new CriteriaQuery(new Criteria(MILJO).is(miljo) + ) ).withPageable(pageable), pageable ); } public List getAllCurrentDocumentsBy(String miljo, String ident) { - var queryBuilders = new ArrayList(); - queryBuilders.add(QueryBuilders.matchQuery(MILJO, miljo)); - - queryBuilders.add(QueryBuilders.matchQuery("virksomheter.personer.ident", ident)); - - return getAllCurrentDocumentsBy(new NativeSearchQueryBuilder().withQuery(combinedOnANDOperator(queryBuilders))); + return getAllCurrentDocumentsBy(new NativeQueryBuilder() + .withQuery(new CriteriaQuery(new Criteria(MILJO).is(miljo).and("virksomheter.personer.ident").is(ident))) + ); } public Page getAllCurrentDocumentsBy( @@ -109,19 +103,16 @@ public Page getAllCurrentDocumentsBy( Integer page ) { var pageable = PageRequest.of(page, 1); - var queryBuilders = new ArrayList(); - - queryBuilders.add(QueryBuilders.matchQuery(MILJO, miljo)); - getKalendermaanedBetween(fom, tom).ifPresent(queryBuilders::add); - Optional.ofNullable(ident).ifPresent(value -> queryBuilders.add( - QueryBuilders.matchQuery("virksomheter.personer.ident", value) - )); - Optional.ofNullable(typeArbeidsforhold).ifPresent(value -> queryBuilders.add( - QueryBuilders.matchQuery("virksomheter.personer.arbeidsforhold.typeArbeidsforhold", value) - )); + + var criteria = new Criteria(MILJO).is(miljo); + criteria = isNull(fom) ? criteria : criteria.and("kalendermaaned").greaterThanEqual(fom.withDayOfMonth(1)); + criteria = isNull(tom) ? criteria : criteria.and("kalendermaaned").lessThanEqual(tom.withDayOfMonth(tom.lengthOfMonth())); + criteria = isNull(ident) ? criteria : criteria.and("virksomheter.personer.ident").is(ident); + criteria = isNull(typeArbeidsforhold) ? criteria : criteria.and("virksomheter.personer.arbeidsforhold.typeArbeidsforhold").is(typeArbeidsforhold); + return getAllCurrentDocumentsBy( - new NativeSearchQueryBuilder() - .withQuery(combinedOnANDOperator(queryBuilders)) + new NativeQueryBuilder() + .withQuery(new CriteriaQuery(criteria)) .withPageable(pageable), pageable ); @@ -145,9 +136,9 @@ public Oppsummeringsdokument getCurrentDocumentBy(LocalDate kalendermaaned, Stri return list.stream().findFirst().orElse(null); } - private Page getAllCurrentDocumentsBy(NativeSearchQueryBuilder builder, Pageable pageable) { + private Page getAllCurrentDocumentsBy(NativeQueryBuilder builder, Pageable pageable) { -// builder.withSorts(SortBuilders.fieldSort("lastModified").order(SortOrder.ASC)); + builder.withSort(Sort.by("lastModified").ascending()); var searchHist = operations.search( builder.build(), OppsummeringsdokumentModel.class @@ -162,8 +153,8 @@ private Page getAllCurrentDocumentsBy(NativeSearchQueryBu ); } - private List getAllCurrentDocumentsBy(NativeSearchQueryBuilder builder) { - builder.withSorts(SortBuilders.fieldSort("lastModified").order(SortOrder.ASC)); + private List getAllCurrentDocumentsBy(NativeQueryBuilder builder) { + builder.withSort(Sort.by("lastModified").ascending()); var list = operations.search( builder.build(), OppsummeringsdokumentModel.class @@ -173,42 +164,16 @@ private List getAllCurrentDocumentsBy(NativeSearchQueryBu } private List getAllCurrentDocumentsBy(String miljo, String orgnummer, LocalDate fom, LocalDate tom) { - var queryBuilders = new ArrayList(); - queryBuilders.add(QueryBuilders.matchQuery(MILJO, miljo)); - queryBuilders.add(QueryBuilders.matchQuery("opplysningspliktigOrganisajonsnummer", orgnummer)); + var criteria = new Criteria(MILJO).is(miljo).and("opplysningspliktigOrganisajonsnummer").is(orgnummer); + criteria = isNull(fom) ? criteria : criteria.and("kalendermaaned").greaterThanEqual(fom.withDayOfMonth(1)); + criteria = isNull(tom) ? criteria : criteria.and("kalendermaaned").lessThanEqual(tom.withDayOfMonth(tom.lengthOfMonth())); - getKalendermaanedBetween(fom, tom).ifPresent(queryBuilders::add); - - return getAllCurrentDocumentsBy(new NativeSearchQueryBuilder() - .withQuery(combinedOnANDOperator(queryBuilders)) + return getAllCurrentDocumentsBy(new NativeQueryBuilder() + .withQuery(new CriteriaQuery(criteria)) ); } - private Optional getKalendermaanedBetween(LocalDate fom, LocalDate tom) { - if (fom == null && tom == null) { - return Optional.empty(); - } - var builder = QueryBuilders.rangeQuery("kalendermaaned"); - - if (fom != null) { - builder.gte(fom.withDayOfMonth(1)); - } - - if (tom != null) { - builder.lte(tom.withDayOfMonth(tom.lengthOfMonth())); - } - return Optional.of(builder); - } - - private QueryBuilder combinedOnANDOperator(List list) { - var queryBuilder = QueryBuilders.boolQuery(); - for (var item : list) { - queryBuilder.must(item); - } - return queryBuilder; - } - /** * TODO Find a way to do this operation by elastic search */ diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java index 877dffb3077..f770e465fcf 100644 --- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java +++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java @@ -2,31 +2,25 @@ import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.oppsummeringsdokumentservice.config.credentials.ElasticSearchCredentials; -import org.opensearch.client.RestHighLevelClient; -import org.opensearch.data.client.orhlc.AbstractOpenSearchConfiguration; -import org.opensearch.data.client.orhlc.ClientConfiguration; -import org.opensearch.data.client.orhlc.RestClients; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.elasticsearch.client.ClientConfiguration; +import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration; import java.time.Duration; @Configuration @RequiredArgsConstructor -public class OpensearchConfig extends AbstractOpenSearchConfiguration { +public class OpensearchConfig extends ElasticsearchConfiguration { private final ElasticSearchCredentials elasticSearchCredentials; @Override - @Bean - public RestHighLevelClient opensearchClient() { - ClientConfiguration clientConfiguration = ClientConfiguration.builder() + public ClientConfiguration clientConfiguration() { + return ClientConfiguration.builder() .connectedTo(elasticSearchCredentials.getEndpoints().replace("https://", "")) .usingSsl() .withBasicAuth(elasticSearchCredentials.getUsername(), elasticSearchCredentials.getPassword()) .withConnectTimeout(Duration.ofSeconds(10)) .withSocketTimeout(Duration.ofSeconds(5)) .build(); - - return RestClients.create(clientConfiguration).rest(); } } From b2a5c6af273806700b4287c355317522fb469d17 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Mon, 23 Oct 2023 11:19:45 +0200 Subject: [PATCH 37/49] Fjernet bruk av deprecated API. --- .../sdforvalter/config/SecurityConfig.java | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/SecurityConfig.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/SecurityConfig.java index b4619b02a2d..4d3a6a88351 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/SecurityConfig.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/SecurityConfig.java @@ -4,10 +4,14 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; +import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher; + /** * Remove this call with AzureAd config */ @@ -18,28 +22,23 @@ public class SecurityConfig { @Bean public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { - - httpSecurity.sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and() - .csrf() - .disable() - .authorizeHttpRequests() - .requestMatchers( - "/internal/**", - "/webjars/**", - "/swagger-resources/**", - "/v3/api-docs/**", - "/swagger-ui/**", - "/swagger", - "/error", - "/swagger-ui.html" - ).permitAll() - .requestMatchers("/api/**").fullyAuthenticated() - .and() - .oauth2ResourceServer() - .jwt(); - - return httpSecurity.build(); + return httpSecurity + .sessionManagement(c -> c.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(c -> c + .requestMatchers( + antMatcher("/internal/**"), + antMatcher("/webjars/**"), + antMatcher("/swagger-resources/**"), + antMatcher("/v3/api-docs/**"), + antMatcher("/swagger-ui/**"), + antMatcher("/swagger"), + antMatcher("/error"), + antMatcher("/swagger-ui.html")) + .permitAll() + .requestMatchers(antMatcher("/api/**")) + .fullyAuthenticated()) + .oauth2ResourceServer(c -> c.jwt(Customizer.withDefaults())) + .build(); } } From 1a0de8b7dc6bae3d046efe4f1d9ef45a0a4675c3 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Mon, 23 Oct 2023 12:15:13 +0200 Subject: [PATCH 38/49] Rettet FileControllerIntegrationTest. --- .../sdforvalter/adapter/AaregAdapter.java | 2 +- .../sdforvalter/adapter/EregAdapter.java | 2 +- .../sdforvalter/adapter/FasteDataAdapter.java | 2 +- .../sdforvalter/adapter/KrrAdapter.java | 2 +- .../adapter/TpsIdenterAdapter.java | 19 ++++++++-------- .../database/model/AaregModel.java | 2 ++ .../database/model/FasteDataModel.java | 20 +++++------------ .../database/model/GruppeModel.java | 9 ++------ .../database/model/OpprinnelseModel.java | 2 ++ .../rs/FileControllerIntegrationTest.java | 22 +++++++++---------- 10 files changed, 36 insertions(+), 46 deletions(-) diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/AaregAdapter.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/AaregAdapter.java index f3d1628aed1..d16b9826e3e 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/AaregAdapter.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/AaregAdapter.java @@ -41,7 +41,7 @@ public AaregListe save(AaregListe liste) { } return new AaregListe(repository.saveAll(list .stream() - .map(aareg -> new AaregModel(aareg, getOppinnelse(aareg), getGruppe(aareg))) + .map(aareg -> new AaregModel(aareg, getOpprinnelse(aareg), getGruppe(aareg))) .toList()) ); } diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/EregAdapter.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/EregAdapter.java index dd29a4ec912..7ff2bbb9b8c 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/EregAdapter.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/EregAdapter.java @@ -127,7 +127,7 @@ private List persist(final List liste) { EregModel eregModel = repository.save(new EregModel( ereg, ereg.getJuridiskEnhet() != null ? model : null, - getOppinnelse(ereg), + getOpprinnelse(ereg), getGruppe(ereg) )); List tagModels = ereg.getTags().stream().map(tagsAdapter::save).toList(); diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/FasteDataAdapter.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/FasteDataAdapter.java index 1a61ecba891..f866929d49f 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/FasteDataAdapter.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/FasteDataAdapter.java @@ -12,7 +12,7 @@ abstract class FasteDataAdapter { private final OpprinnelseAdapter opprinnelseAdapter; private final GruppeAdapter gruppeAdapter; - OpprinnelseModel getOppinnelse(FasteData fasteData) { + OpprinnelseModel getOpprinnelse(FasteData fasteData) { return fasteData.getOpprinnelse() != null ? opprinnelseAdapter.saveOpprinnelse(fasteData.getOpprinnelse()) : null; diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/KrrAdapter.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/KrrAdapter.java index 615435a15fa..f94b2245cc9 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/KrrAdapter.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/KrrAdapter.java @@ -41,7 +41,7 @@ public KrrListe save(KrrListe liste) { } return new KrrListe(repository.saveAll(list .stream() - .map(item -> new KrrModel(item, getOppinnelse(item), getGruppe(item))) + .map(item -> new KrrModel(item, getOpprinnelse(item), getGruppe(item))) .toList()) ); } diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/TpsIdenterAdapter.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/TpsIdenterAdapter.java index 1d5f0c51a5b..4f7e44f0b98 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/TpsIdenterAdapter.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/adapter/TpsIdenterAdapter.java @@ -1,19 +1,18 @@ package no.nav.registre.sdforvalter.adapter; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.StreamSupport; - import no.nav.registre.sdforvalter.database.model.TagModel; import no.nav.registre.sdforvalter.database.model.TpsIdentModel; import no.nav.registre.sdforvalter.database.model.TpsIdentTagModel; import no.nav.registre.sdforvalter.database.repository.TpsIdenterRepository; import no.nav.registre.sdforvalter.domain.TpsIdent; import no.nav.registre.sdforvalter.domain.TpsIdentListe; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.StreamSupport; @Slf4j @Component @@ -88,9 +87,9 @@ public TpsIdentListe save(TpsIdentListe liste) { List tpsIdents = new ArrayList<>(); for (TpsIdent tpsIdent : list) { - TpsIdentModel tpsIdentModel = tpsIdenterRepository.save( - new TpsIdentModel(tpsIdent, getOppinnelse(tpsIdent), getGruppe(tpsIdent)) - ); + var opprinnelse = getOpprinnelse(tpsIdent); + var gruppe = getGruppe(tpsIdent); + TpsIdentModel tpsIdentModel = tpsIdenterRepository.save(new TpsIdentModel(tpsIdent, opprinnelse, gruppe)); List tagModels = tpsIdent.getTags() == null ? Collections.emptyList() : tpsIdent.getTags().stream().map(tagsAdapter::save).toList(); tagModels.forEach(tagModel -> tpsIdentTagAdapter.save( new TpsIdentTagModel(null, tpsIdentModel, tagModel) diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/AaregModel.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/AaregModel.java index aa0ed080afb..929e933e7c3 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/AaregModel.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/AaregModel.java @@ -1,5 +1,6 @@ package no.nav.registre.sdforvalter.database.model; +import jakarta.persistence.Column; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -21,6 +22,7 @@ @NoArgsConstructor public class AaregModel extends FasteDataModel { @Id + @Column(nullable = false) private String fnr; private String orgId; diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/FasteDataModel.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/FasteDataModel.java index 01c5cfc2404..bd4b51e0ac4 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/FasteDataModel.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/FasteDataModel.java @@ -1,31 +1,23 @@ package no.nav.registre.sdforvalter.database.model; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -import jakarta.persistence.JoinColumn; -import jakarta.persistence.MappedSuperclass; -import jakarta.persistence.OneToOne; - +import jakarta.persistence.*; +import lombok.*; import no.nav.registre.sdforvalter.domain.FasteData; +@MappedSuperclass @Getter @Setter @AllArgsConstructor @ToString @NoArgsConstructor @EqualsAndHashCode(callSuper = false) -@MappedSuperclass public abstract class FasteDataModel extends AuditModel { - @OneToOne + + @ManyToOne @JoinColumn(name = "gruppe_id") private GruppeModel gruppeModel; - @OneToOne + @ManyToOne @JoinColumn(name = "opprinnelse_id") private OpprinnelseModel opprinnelseModel; diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/GruppeModel.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/GruppeModel.java index e6a18cb39f5..05f244a8007 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/GruppeModel.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/GruppeModel.java @@ -1,17 +1,12 @@ package no.nav.registre.sdforvalter.database.model; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.validation.constraints.NotNull; - @Entity @Data @NoArgsConstructor diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/OpprinnelseModel.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/OpprinnelseModel.java index 968802f0ba8..982401506cd 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/OpprinnelseModel.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/database/model/OpprinnelseModel.java @@ -27,6 +27,7 @@ public class OpprinnelseModel extends AuditModel { @GeneratedValue @EqualsAndHashCode.Exclude private Long id; + @NotNull @Column(unique = true) private String navn; @@ -38,4 +39,5 @@ public OpprinnelseModel(String navn) { public OpprinnelseModel(Opprinnelse opprinnelse) { this(opprinnelse.getNavn()); } + } diff --git a/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/FileControllerIntegrationTest.java b/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/FileControllerIntegrationTest.java index a5e7663e588..c352d42c142 100644 --- a/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/FileControllerIntegrationTest.java +++ b/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/FileControllerIntegrationTest.java @@ -3,12 +3,7 @@ import no.nav.registre.sdforvalter.database.model.GruppeModel; import no.nav.registre.sdforvalter.database.model.OpprinnelseModel; import no.nav.registre.sdforvalter.database.model.TpsIdentModel; -import no.nav.registre.sdforvalter.database.repository.EregTagRepository; -import no.nav.registre.sdforvalter.database.repository.GruppeRepository; -import no.nav.registre.sdforvalter.database.repository.OpprinnelseRepository; -import no.nav.registre.sdforvalter.database.repository.TagRepository; -import no.nav.registre.sdforvalter.database.repository.TpsIdentTagRepository; -import no.nav.registre.sdforvalter.database.repository.TpsIdenterRepository; +import no.nav.registre.sdforvalter.database.repository.*; import no.nav.registre.sdforvalter.domain.TpsIdent; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -67,6 +62,7 @@ public void setup() { } public void assertListOfPersonsFromCsvIsSavedInDatabase(List expectedTpsIdenterListe, String csvInnhold) throws Exception { + MockHttpServletRequestBuilder builder = MockMvcRequestBuilders .multipart("/api/v1/faste-data/file/tpsIdenter") .file("file", csvInnhold.getBytes()) @@ -77,6 +73,7 @@ public void assertListOfPersonsFromCsvIsSavedInDatabase(List expe assertThat(tpsIdenterRepository.findAll()) .containsAll(expectedTpsIdenterListe); + } @AfterEach @@ -116,9 +113,10 @@ void should_save_one_ident_from_csv_to_tps_ident_database() throws Exception { @Test void should_save_two_idents_from_csv_to_tps_ident_database() throws Exception { - String csvInnhold = "FNR*;Fornavn;Etternavn;Adresse;Postnummer;Poststed;Gruppe;Opprinnelse;Tags\n" + - "12345678910;Dolly;Dollesen;Dollygata 2;9999;Dollyville;Gruppen;Test;OTP\n" + - "12345678911;Donald;Dollesen;Dollygata 3;2222;Dollyby;Gruppen;Test;"; + String csvInnhold = """ + FNR*;Fornavn;Etternavn;Adresse;Postnummer;Poststed;Gruppe;Opprinnelse;Tags + 12345678910;Dolly;Dollesen;Dollygata 2;9999;Dollyville;Gruppen;Test;OTP + 12345678911;Donald;Dollesen;Dollygata 3;2222;Dollyby;Gruppen;Test;"""; TpsIdent expectedTpsPerson1 = TpsIdent.builder() .fnr("12345678910") @@ -137,9 +135,11 @@ void should_save_two_idents_from_csv_to_tps_ident_database() throws Exception { .postNr("2222") .city("Dollyby") .build(); + var opprinnelse = new OpprinnelseModel(null, "Test"); + var gruppe = new GruppeModel(null, "Gruppen", "Gruppenbeskrivelse"); List expectedTpsIdenterListe = List.of( - new TpsIdentModel(expectedTpsPerson1, new OpprinnelseModel(null, "Test"), new GruppeModel(null, "Gruppen", "Gruppenbeskrivelse")), - new TpsIdentModel(expectedTpsPerson2, new OpprinnelseModel(null, "Test"), new GruppeModel(null, "Gruppen", "Gruppenbeskrivelse")) + new TpsIdentModel(expectedTpsPerson1, opprinnelse, gruppe), + new TpsIdentModel(expectedTpsPerson2, opprinnelse, gruppe) ); assertListOfPersonsFromCsvIsSavedInDatabase(expectedTpsIdenterListe, csvInnhold); From 58ac22702cf8b27607fcfce0928ef494b998df69 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Mon, 23 Oct 2023 13:46:28 +0200 Subject: [PATCH 39/49] Rettet feil escaping av JSON i JsonWiremockHelper. --- .../libs/testing/JsonWiremockHelper.java | 60 +++---------------- 1 file changed, 9 insertions(+), 51 deletions(-) diff --git a/libs/testing/src/main/java/no/nav/testnav/libs/testing/JsonWiremockHelper.java b/libs/testing/src/main/java/no/nav/testnav/libs/testing/JsonWiremockHelper.java index ceea39c5357..9cbe8de86c5 100644 --- a/libs/testing/src/main/java/no/nav/testnav/libs/testing/JsonWiremockHelper.java +++ b/libs/testing/src/main/java/no/nav/testnav/libs/testing/JsonWiremockHelper.java @@ -9,27 +9,10 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; import static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.responseDefinition; -import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.delete; -import static com.github.tomakehurst.wiremock.client.WireMock.deleteRequestedFor; -import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; -import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; -import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; -import static com.github.tomakehurst.wiremock.client.WireMock.matching; -import static com.github.tomakehurst.wiremock.client.WireMock.post; -import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; -import static com.github.tomakehurst.wiremock.client.WireMock.put; -import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; -import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; -import static com.github.tomakehurst.wiremock.client.WireMock.verify; +import static com.github.tomakehurst.wiremock.client.WireMock.*; public class JsonWiremockHelper { @@ -74,10 +57,6 @@ public void stubPost(HttpStatus status) { ); } - public void stubPut() { - stubFor(updateMappingBuilder(put(urlPathPattern))); - } - public void stubGet() { MappingBuilder mappingBuilder = get(urlPathPattern); @@ -114,27 +93,6 @@ public void verifyPost() { verify(requestPatternBuilder); } - public void stubDelete() { - stubFor(updateMappingBuilder(delete(urlPathPattern))); - } - - public void verifyDelete() { - RequestPatternBuilder requestPatternBuilder = deleteRequestedFor(urlPathPattern); - if (requestBody != null) { - - if (requestFieldsToIgnore.isEmpty()) { - requestPatternBuilder.withRequestBody(equalToJson(requestBody)); - } else { - requestPatternBuilder.withRequestBody(matching(convertToRegexString( - requestBody, - requestFieldsToIgnore.toArray(String[]::new) - ))); - } - - } - verify(requestPatternBuilder); - } - public static JsonWiremockHelper builder(ObjectMapper mapper) { return new JsonWiremockHelper(mapper); } @@ -155,18 +113,18 @@ private MappingBuilder updateMappingBuilder(MappingBuilder mappingBuilder) { return mappingBuilder; } - private static String convertToRegexString(final String value, String... fieldToIgnore) { + private static String convertToRegexString(final String json, String... fieldToIgnore) { return ignoreFields( - value - .replace("\\{", "\\\\{") - .replace("\\}", "\\\\}"), + json + .replace("{", "\\{") + .replace("}", "\\}"), fieldToIgnore ); } - private static String ignoreFields(final String property, String... fieldToIgnore) { - String regex = property; - for (String ignored : fieldToIgnore) { + private static String ignoreFields(final String json, String... fieldsToIgnore) { + String regex = json; + for (String ignored : fieldsToIgnore) { regex = regex.replaceAll("\"" + ignored + "\":(\"([^\"]*)\"|null|true|false|\\d+)", "\"" + ignored + "\":\".*\""); } return regex; From 6a0c0bd100ddb497c31c31813030e5589fb08b20 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Mon, 23 Oct 2023 13:47:05 +0200 Subject: [PATCH 40/49] =?UTF-8?q?Fikset=20fors=C3=B8k=20p=C3=A5=20endring?= =?UTF-8?q?=20av=20immutable=20list.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../registre/sdforvalter/service/AaregService.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/service/AaregService.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/service/AaregService.java index 57c23c24876..93c801f9e98 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/service/AaregService.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/service/AaregService.java @@ -91,7 +91,7 @@ private List sendArbeidsforholdTilAareg( List arbeidsforhold ) { List aaregResponses = new ArrayList<>(arbeidsforhold.size()); - fyllInnArbeidsforholdMedSyntetiskeData(arbeidsforhold); + arbeidsforhold = fyllInnArbeidsforholdMedSyntetiskeData(arbeidsforhold); for (var forholdet : arbeidsforhold) { var opprettRequest = forholdet.getArbeidsforhold().toArbeidsforhold(); @@ -103,7 +103,7 @@ private List sendArbeidsforholdTilAareg( } - private void fyllInnArbeidsforholdMedSyntetiskeData (List arbeidsforhold){ + private List fyllInnArbeidsforholdMedSyntetiskeData(List arbeidsforhold) { if (!arbeidsforhold.isEmpty()) { List identer = arbeidsforhold.stream().map(x -> x.getArbeidsforhold().getArbeidstaker().getIdent()).toList(); @@ -120,7 +120,7 @@ private void fyllInnArbeidsforholdMedSyntetiskeData (List ugyldigeArbeidsforhold = new ArrayList<>(); - sjekkArbeidsforholdEtterArbeidsavtale(arbeidsforhold, ugyldigeArbeidsforhold); - if (!ugyldigeArbeidsforhold.isEmpty()) { - arbeidsforhold.removeAll(ugyldigeArbeidsforhold); + return arbeidsforhold + .stream() + .filter(ugyldigeArbeidsforhold::contains) + .toList(); } } + return arbeidsforhold; } private void sjekkArbeidsforholdEtterArbeidsavtale(List arbeidsforhold, List ugyldigeArbeidsforhold) { From 7cf26e9ff8bdd5f345e17edc3fa55b13a81ee86b Mon Sep 17 00:00:00 2001 From: stigus Date: Mon, 23 Oct 2023 14:19:16 +0200 Subject: [PATCH 41/49] Refaktorering av OppsummeringsdokumentAdapter #deploy-oppsummeringsdokument-service --- apps/oppsummeringsdokument-service/build.gradle | 1 + .../config/OpensearchConfig.java | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 10e2d66412f..7f193dcfcf1 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -80,6 +80,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' + implementation 'org.opensearch.client:spring-data-opensearch-starter:1.2.0' implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java index f770e465fcf..877dffb3077 100644 --- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java +++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java @@ -2,25 +2,31 @@ import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.oppsummeringsdokumentservice.config.credentials.ElasticSearchCredentials; +import org.opensearch.client.RestHighLevelClient; +import org.opensearch.data.client.orhlc.AbstractOpenSearchConfiguration; +import org.opensearch.data.client.orhlc.ClientConfiguration; +import org.opensearch.data.client.orhlc.RestClients; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.elasticsearch.client.ClientConfiguration; -import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration; import java.time.Duration; @Configuration @RequiredArgsConstructor -public class OpensearchConfig extends ElasticsearchConfiguration { +public class OpensearchConfig extends AbstractOpenSearchConfiguration { private final ElasticSearchCredentials elasticSearchCredentials; @Override - public ClientConfiguration clientConfiguration() { - return ClientConfiguration.builder() + @Bean + public RestHighLevelClient opensearchClient() { + ClientConfiguration clientConfiguration = ClientConfiguration.builder() .connectedTo(elasticSearchCredentials.getEndpoints().replace("https://", "")) .usingSsl() .withBasicAuth(elasticSearchCredentials.getUsername(), elasticSearchCredentials.getPassword()) .withConnectTimeout(Duration.ofSeconds(10)) .withSocketTimeout(Duration.ofSeconds(5)) .build(); + + return RestClients.create(clientConfiguration).rest(); } } From 1b0d0f8301e24f12299f5b5b970d572fac3eb611 Mon Sep 17 00:00:00 2001 From: stigus Date: Mon, 23 Oct 2023 14:20:01 +0200 Subject: [PATCH 42/49] Refaktorering av OppsummeringsdokumentAdapter #deploy-oppsummeringsdokument-service --- .../adapter/OppsummeringsdokumentAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java index 37e50555926..584b5277bad 100644 --- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java +++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java @@ -192,4 +192,4 @@ private List filterOnVersion(List Date: Mon, 23 Oct 2023 14:46:43 +0200 Subject: [PATCH 43/49] Endret fra NativeQuery til CriteriaQuery #deploy-oppsummeringsdokument-service --- .../adapter/OppsummeringsdokumentAdapter.java | 31 +++++++------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java index 584b5277bad..1db6d56ffdb 100644 --- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java +++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/adapter/OppsummeringsdokumentAdapter.java @@ -15,11 +15,10 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; -import org.springframework.data.elasticsearch.client.elc.NativeQueryBuilder; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.SearchHit; import org.springframework.data.elasticsearch.core.query.Criteria; -import org.springframework.data.elasticsearch.core.query.CriteriaQuery; +import org.springframework.data.elasticsearch.core.query.CriteriaQueryBuilder; import org.springframework.stereotype.Component; import java.time.LocalDate; @@ -70,27 +69,22 @@ public Oppsummeringsdokument get(String id) { } public List getAllCurrentDocumentsBy(String miljo) { - return getAllCurrentDocumentsBy(new NativeQueryBuilder() - .withQuery( - new CriteriaQuery(new Criteria(MILJO).is(miljo) - ) + return getAllCurrentDocumentsBy( + new CriteriaQueryBuilder(new Criteria(MILJO).is(miljo) )); } public Page getAllCurrentDocumentsBy(String miljo, Integer page) { var pageable = PageRequest.of(page, 1); - return getAllCurrentDocumentsBy(new NativeQueryBuilder() - .withQuery( - new CriteriaQuery(new Criteria(MILJO).is(miljo) - ) - ).withPageable(pageable), + return getAllCurrentDocumentsBy( + new CriteriaQueryBuilder(new Criteria(MILJO).is(miljo)) + .withPageable(pageable), pageable ); } public List getAllCurrentDocumentsBy(String miljo, String ident) { - return getAllCurrentDocumentsBy(new NativeQueryBuilder() - .withQuery(new CriteriaQuery(new Criteria(MILJO).is(miljo).and("virksomheter.personer.ident").is(ident))) + return getAllCurrentDocumentsBy(new CriteriaQueryBuilder(new Criteria(MILJO).is(miljo).and("virksomheter.personer.ident").is(ident)) ); } @@ -111,8 +105,7 @@ public Page getAllCurrentDocumentsBy( criteria = isNull(typeArbeidsforhold) ? criteria : criteria.and("virksomheter.personer.arbeidsforhold.typeArbeidsforhold").is(typeArbeidsforhold); return getAllCurrentDocumentsBy( - new NativeQueryBuilder() - .withQuery(new CriteriaQuery(criteria)) + new CriteriaQueryBuilder(criteria) .withPageable(pageable), pageable ); @@ -136,7 +129,7 @@ public Oppsummeringsdokument getCurrentDocumentBy(LocalDate kalendermaaned, Stri return list.stream().findFirst().orElse(null); } - private Page getAllCurrentDocumentsBy(NativeQueryBuilder builder, Pageable pageable) { + private Page getAllCurrentDocumentsBy(CriteriaQueryBuilder builder, Pageable pageable) { builder.withSort(Sort.by("lastModified").ascending()); var searchHist = operations.search( @@ -153,7 +146,7 @@ private Page getAllCurrentDocumentsBy(NativeQueryBuilder ); } - private List getAllCurrentDocumentsBy(NativeQueryBuilder builder) { + private List getAllCurrentDocumentsBy(CriteriaQueryBuilder builder) { builder.withSort(Sort.by("lastModified").ascending()); var list = operations.search( builder.build(), @@ -169,9 +162,7 @@ private List getAllCurrentDocumentsBy(String miljo, Strin criteria = isNull(fom) ? criteria : criteria.and("kalendermaaned").greaterThanEqual(fom.withDayOfMonth(1)); criteria = isNull(tom) ? criteria : criteria.and("kalendermaaned").lessThanEqual(tom.withDayOfMonth(tom.lengthOfMonth())); - return getAllCurrentDocumentsBy(new NativeQueryBuilder() - .withQuery(new CriteriaQuery(criteria)) - ); + return getAllCurrentDocumentsBy(new CriteriaQueryBuilder(criteria)); } /** From 34eab23dd51f1e5fcdacb68552f9d15e77b0394f Mon Sep 17 00:00:00 2001 From: stigus Date: Mon, 23 Oct 2023 17:20:42 +0200 Subject: [PATCH 44/49] Fix for nodesniff error og oppdateringer av diverse dependencies #deploy-oppsummeringsdokument-service --- apps/brreg-stub/build.gradle | 2 +- apps/hodejegeren/build.gradle | 2 +- apps/oppsummeringsdokument-service/build.gradle | 4 ++-- apps/organisasjon-service/build.gradle | 6 +++--- apps/pdl-forvalter/build.gradle | 6 +++--- apps/synt-vedtakshistorikk-service/build.gradle | 2 +- apps/testnorge-statisk-data-forvalter/build.gradle | 2 +- libs/slack/build.gradle | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index 0f0111cc9f7..e357714aa85 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -101,7 +101,7 @@ dependencies { implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' - implementation 'wsdl4j:wsdl4j:1.6.3' + implementation 'wsdl4j:wsdl4j' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-ui:1.6.15' diff --git a/apps/hodejegeren/build.gradle b/apps/hodejegeren/build.gradle index d705d72454e..8774220d899 100644 --- a/apps/hodejegeren/build.gradle +++ b/apps/hodejegeren/build.gradle @@ -78,7 +78,7 @@ dependencies { implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'no.nav.registre:testnorge-consumers:1.12.0-RELEASE' - implementation 'com.google.guava:guava:31.0.1-jre' + implementation 'com.google.guava:guava' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 7f193dcfcf1..31fca958395 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -74,13 +74,13 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'no.nav.testnav.xsd:arbeidsforhold-xsd' - implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.2' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.3' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.opensearch.client:spring-data-opensearch-starter:1.2.0' + implementation 'org.opensearch.client:spring-data-opensearch:1.2.0' implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index 9aab3c26cc7..6daae6b29fa 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -67,14 +67,14 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'no.nav.testnav.libs:testing' - testImplementation 'org.assertj:assertj-core:3.21.0' + testImplementation 'org.assertj:assertj-core:3.24.2' implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index 7c80558360b..6cc2c7280c1 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -82,9 +82,9 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'net.logstash.logback:logstash-logback-encoder:7.3' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' implementation 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index c09ea723944..0f2fe8c824e 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -75,7 +75,7 @@ dependencies { implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'com.google.guava:guava:31.0.1-jre' + implementation 'com.google.guava:guava' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index 5d8dcc6efd9..7ea74d8b07f 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -53,7 +53,7 @@ repositories { } dependencies { - implementation 'com.google.guava:guava:31.1-jre' + implementation 'com.google.guava:guava' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-security' diff --git a/libs/slack/build.gradle b/libs/slack/build.gradle index 39318aa9423..53d6657b294 100644 --- a/libs/slack/build.gradle +++ b/libs/slack/build.gradle @@ -49,7 +49,7 @@ java { dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework:spring-web:5.3.13' + implementation 'org.springframework:spring-web' implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' From fa396e117e11a9cc667058dd3b10d64f1ad6d579 Mon Sep 17 00:00:00 2001 From: stigus Date: Tue, 24 Oct 2023 08:49:04 +0200 Subject: [PATCH 45/49] Fikset guava imports --- apps/arbeidsforhold-service/build.gradle | 2 +- apps/hodejegeren/build.gradle | 2 +- apps/oppsummeringsdokument-service/build.gradle | 2 +- apps/synt-vedtakshistorikk-service/build.gradle | 2 +- apps/testnorge-statisk-data-forvalter/build.gradle | 2 +- apps/varslinger-service/build.gradle | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 88d5afaa511..49fda0e3af8 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -51,7 +51,7 @@ repositories { dependencies { - implementation('com.google.guava:guava') { + implementation('com.google.guava:guava:31.1-jre') { version { strictly '20.0' } diff --git a/apps/hodejegeren/build.gradle b/apps/hodejegeren/build.gradle index 8774220d899..3aaa58f08ed 100644 --- a/apps/hodejegeren/build.gradle +++ b/apps/hodejegeren/build.gradle @@ -78,7 +78,7 @@ dependencies { implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'no.nav.registre:testnorge-consumers:1.12.0-RELEASE' - implementation 'com.google.guava:guava' + implementation 'com.google.guava:guava:31.1-jre' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 31fca958395..6d0fd81238d 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -59,7 +59,7 @@ repositories { } dependencies { - implementation('com.google.guava:guava') { + implementation('com.google.guava:guava:31.1-jre') { version { strictly '20.0' } diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 0f2fe8c824e..3173bd9f44e 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -75,7 +75,7 @@ dependencies { implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'com.google.guava:guava' + implementation 'com.google.guava:guava:31.1-jre' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index 7ea74d8b07f..5d8dcc6efd9 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -53,7 +53,7 @@ repositories { } dependencies { - implementation 'com.google.guava:guava' + implementation 'com.google.guava:guava:31.1-jre' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-security' diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index cafa62cf711..1e186f7665d 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -52,7 +52,7 @@ repositories { dependencies { - implementation('com.google.guava:guava') { + implementation('com.google.guava:guava:31.1-jre') { version { strictly '20.0' } From c0fec11bca5af42b303cc27d42a38070ba618eee Mon Sep 17 00:00:00 2001 From: stigus Date: Tue, 24 Oct 2023 09:11:25 +0200 Subject: [PATCH 46/49] Guava implementation endring --- apps/arbeidsforhold-service/build.gradle | 7 +------ apps/oppsummeringsdokument-service/build.gradle | 6 +----- apps/varslinger-service/build.gradle | 9 ++------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 49fda0e3af8..79ca648e2b3 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -51,12 +51,7 @@ repositories { dependencies { - implementation('com.google.guava:guava:31.1-jre') { - version { - strictly '20.0' - } - } - + implementation 'com.google.guava:guava:31.1-jre' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' implementation 'javax.activation:activation:1.1.1' implementation 'org.glassfish.jaxb:jaxb-runtime' diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 6d0fd81238d..79ef0a07ef1 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -59,11 +59,7 @@ repositories { } dependencies { - implementation('com.google.guava:guava:31.1-jre') { - version { - strictly '20.0' - } - } + implementation 'com.google.guava:guava:31.1-jre' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' implementation 'javax.activation:activation:1.1.1' implementation 'org.glassfish.jaxb:jaxb-runtime' diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index 1e186f7665d..87ccfe70427 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -52,12 +52,7 @@ repositories { dependencies { - implementation('com.google.guava:guava:31.1-jre') { - version { - strictly '20.0' - } - } - + implementation 'com.google.guava:guava:31.1-jre' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:database' @@ -66,7 +61,7 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - + implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' implementation 'org.springframework.boot:spring-boot-starter-security' From 29ea95bd4358a83d735fe2174bb63a6ebf19665c Mon Sep 17 00:00:00 2001 From: stigus Date: Tue, 24 Oct 2023 10:32:18 +0200 Subject: [PATCH 47/49] Rettet opp etter kommentarer --- .../apps/adresseservice/config/VaultLocalConfig.java | 2 +- .../testnav/ameldingservice/config/DevConfig.java | 2 +- .../apps/apptilganganalyseservice/config/LocalConfig.java | 2 +- .../arbeidsforholdexportapi/config/DevVaultConfig.java | 2 +- .../domain/v2_0/Opplysningspliktig.java | 8 +++----- .../testnorge/arbeidsforholdservice/config/DevConfig.java | 2 +- .../batchbestillingservice/config/DevConfig.java | 2 +- apps/brreg-stub/build.gradle | 4 ---- .../main/java/no/nav/brregstub/config/DevVaultConfig.java | 2 +- .../testnav/apps/brukerservice/config/LocalConfig.java | 2 +- .../src/main/java/no/nav/dolly/config/LocalConfig.java | 2 +- .../java/no/nav/dolly/web/config/LocalVaultConfig.java | 2 +- .../apps/endringsmeldingfrontend/config/DevConfig.java | 2 +- .../testnav/endringsmeldingservice/config/DevConfig.java | 2 +- .../eregbatchstatusservice/config/DevConfig.java | 2 +- .../testnav/apps/fastedatafrontend/config/DevConfig.java | 2 +- .../config/DevConfig.java | 2 +- .../testnorge/generernavnservice/config/DevConfig.java | 2 +- .../config/DevConfig.java | 2 +- .../generersyntameldingservice/config/DevConfig.java | 2 +- .../geografiskekodeverkservice/config/DevConfig.java | 2 +- .../testnorge/helsepersonellservice/config/DevConfig.java | 2 +- .../nav/testnav/apps/hodejegeren/config/VaultConfig.java | 2 +- .../apps/importpersonservice/config/DevConfig.java | 2 +- .../inntektsmeldinggeneratorservice/config/DevConfig.java | 2 +- .../testnav/inntektsmeldingservice/config/DevConfig.java | 2 +- .../jenkinsbatchstatusservice/config/DevConfig.java | 2 +- .../testnav/joarkdokumentservice/config/DevConfig.java | 2 +- .../testnorge/miljoerservice/config/DevConfig.java | 2 +- .../mn/syntarbeidsforholdservice/config/VaultConfig.java | 2 +- .../oppsummeringsdokumentservice/config/DevConfig.java | 2 +- .../organisasjonbestillingservice/config/DevConfig.java | 2 +- .../organisasjonfastedataservice/config/DevConfig.java | 2 +- .../testnorge/organisasjonmottak/config/DevConfig.java | 2 +- .../testnorge/organisasjonservice/config/DevConfig.java | 2 +- .../config/LocalVaultConfig.java | 2 +- .../config/LocalVaultConfig.java | 2 +- .../no/nav/registre/orgnrservice/config/DevConfig.java | 2 +- .../testnav/apps/oversiktfrontend/config/DevConfig.java | 2 +- .../java/no/nav/pdl/forvalter/config/LocalConfig.java | 2 +- .../nav/pdl/forvalter/service/TelefonnummerService.java | 4 ++-- .../testnav/apps/personexportapi/config/VaultConfig.java | 2 +- .../testnav/personfastedataservice/config/DevConfig.java | 2 +- .../personsearchservice/config/DevVaultConfig.java | 2 +- .../nav/testnav/apps/personservice/config/DevConfig.java | 2 +- .../nav/registre/testnorge/profil/config/DevConfig.java | 2 +- .../registre/testnorge/sykemelding/config/DevConfig.java | 2 +- .../testnav/apps/syntsykemeldingapi/config/DevConfig.java | 2 +- .../syntvedtakshistorikkservice/config/DevConfig.java | 2 +- .../java/no/nav/testnav/identpool/config/LocalConfig.java | 2 +- .../no/nav/registre/sdforvalter/config/DevConfig.java | 2 +- .../java/no/nav/registre/tp/config/dev/VaultConfig.java | 2 +- .../testnorge/tilbakemeldingapi/config/DevConfig.java | 2 +- .../apps/tpsmessagingservice/config/VaultLocalConfig.java | 2 +- .../registre/varslingerservice/config/LocalConfig.java | 2 +- .../examples/reactiverestexample/config/LocalConfig.java | 2 +- .../nav/testnav/libs/reactiveproxy/config/DevConfig.java | 2 +- .../proxies/dokarkivproxy/config/LocalVaultConfig.java | 2 +- .../kontoregisterperson/config/LocalVaultConfig.java | 2 +- .../proxies/krrstubproxy/config/LocalVaultConfig.java | 2 +- .../proxies/medlproxy/config/LocalVaultConfig.java | 2 +- .../testnav/proxies/pdlproxy/config/DevVaultConfig.java | 2 +- .../config/LocalVaultConfig.java | 2 +- .../proxies/skjermingsregisterproxy/DevVaultConfig.java | 2 +- .../synthdatameldekortproxy/config/VaultConfig.java | 2 +- 65 files changed, 67 insertions(+), 73 deletions(-) diff --git a/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/VaultLocalConfig.java b/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/VaultLocalConfig.java index 655a3fbe046..7558f09e3f2 100644 --- a/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/VaultLocalConfig.java +++ b/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/VaultLocalConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/DevConfig.java b/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/DevConfig.java index c6e8cf67288..0faab5af908 100644 --- a/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/DevConfig.java +++ b/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/app-tilgang-analyse-service/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/LocalConfig.java b/apps/app-tilgang-analyse-service/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/LocalConfig.java index 07c4c2c8006..087e62cf15f 100644 --- a/apps/app-tilgang-analyse-service/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/LocalConfig.java +++ b/apps/app-tilgang-analyse-service/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/LocalConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/DevVaultConfig.java b/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/DevVaultConfig.java index f499d14ef92..fb6de4d57d6 100644 --- a/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/DevVaultConfig.java +++ b/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/DevVaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/domain/v2_0/Opplysningspliktig.java b/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/domain/v2_0/Opplysningspliktig.java index 441d5e39dfd..81359f42367 100644 --- a/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/domain/v2_0/Opplysningspliktig.java +++ b/apps/arbeidsforhold-export-api/src/main/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/domain/v2_0/Opplysningspliktig.java @@ -5,6 +5,7 @@ import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Unmarshaller; import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import no.nav.registre.testnorge.xsd.arbeidsforhold.v2_0.EDAGM; @@ -80,12 +81,9 @@ public List toInntekt() { .toList(); } + @SneakyThrows public static Opplysningspliktig from(String xml) { - try { - return new Opplysningspliktig(from(xml, unmarshaller)); - } catch (Exception e) { - throw new RuntimeException("Klarer ikke a konvertere xmlene til EDAGM", e); - } + return new Opplysningspliktig(from(xml, unmarshaller)); } private List getPermisjoner() { diff --git a/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/DevConfig.java b/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/DevConfig.java index fa7435b7d60..8f5689b3cc8 100644 --- a/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/DevConfig.java +++ b/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/DevConfig.java b/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/DevConfig.java index 6502c44e606..d5795d77967 100644 --- a/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/DevConfig.java +++ b/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/DevConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index e357714aa85..8d265ca275e 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -91,10 +91,6 @@ dependencies { implementation 'org.apache.cxf:cxf-rt-ws-security' implementation 'jakarta.servlet:jakarta.servlet-api' -// implementation 'javax.xml.ws:jaxws-api:2.3.1' -// implementation 'javax:javaee-api:8.0.1' -// implementation 'javax.jws:javax.jws-api:1.1' - implementation 'org.postgresql:postgresql' implementation 'com.zaxxer:HikariCP' diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java index fb4a67263c3..cdf1399bedd 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java @@ -24,7 +24,7 @@ public VaultEndpoint vaultEndpoint() { public ClientAuthentication clientAuthentication() { var token = System.getProperty("spring.cloud.vault.token"); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty("spring.cloud.vault.token")); } diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/LocalConfig.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/LocalConfig.java index d6d921e3f60..108989b0755 100644 --- a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/LocalConfig.java +++ b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/LocalConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/LocalConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/LocalConfig.java index caf19339a54..2f314f80ab3 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/LocalConfig.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/LocalConfig.java @@ -36,7 +36,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException(String.format("Påkrevd property '%s' er ikke satt.", TOKEN)); + throw new IllegalArgumentException(String.format("Påkrevet property '%s' er ikke satt.", TOKEN)); } return new TokenAuthentication(System.getProperty(TOKEN)); } diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/LocalVaultConfig.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/LocalVaultConfig.java index 83a459d8f77..db8513cfdb5 100644 --- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/LocalVaultConfig.java +++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/LocalVaultConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/config/DevConfig.java b/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/config/DevConfig.java index f415f49068d..9e70b2ca6a4 100644 --- a/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/config/DevConfig.java +++ b/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/DevConfig.java b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/DevConfig.java index 0d320e77063..ab63771de9f 100644 --- a/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/DevConfig.java +++ b/apps/endringsmelding-service/src/main/java/no/nav/testnav/endringsmeldingservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/DevConfig.java b/apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/DevConfig.java index 74dd873bb54..2fb05ce0a2a 100644 --- a/apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/DevConfig.java +++ b/apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/faste-data-frontend/src/main/java/no/nav/testnav/apps/fastedatafrontend/config/DevConfig.java b/apps/faste-data-frontend/src/main/java/no/nav/testnav/apps/fastedatafrontend/config/DevConfig.java index c672dc1e64c..aa61e831d7b 100644 --- a/apps/faste-data-frontend/src/main/java/no/nav/testnav/apps/fastedatafrontend/config/DevConfig.java +++ b/apps/faste-data-frontend/src/main/java/no/nav/testnav/apps/fastedatafrontend/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/DevConfig.java b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/DevConfig.java index 116bb99010c..760e5ebfca7 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/DevConfig.java +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/DevConfig.java b/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/DevConfig.java index f6e66ec6af2..bb204187a9f 100644 --- a/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/DevConfig.java +++ b/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/DevConfig.java b/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/DevConfig.java index 43b0705cc51..2003c646d5f 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/DevConfig.java +++ b/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/DevConfig.java b/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/DevConfig.java index 61efc55de57..52cf51fc286 100644 --- a/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/DevConfig.java +++ b/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/geografiske-kodeverk-service/src/main/java/no/nav/registre/testnav/geografiskekodeverkservice/config/DevConfig.java b/apps/geografiske-kodeverk-service/src/main/java/no/nav/registre/testnav/geografiskekodeverkservice/config/DevConfig.java index 32af165835f..3c8df18a1d7 100644 --- a/apps/geografiske-kodeverk-service/src/main/java/no/nav/registre/testnav/geografiskekodeverkservice/config/DevConfig.java +++ b/apps/geografiske-kodeverk-service/src/main/java/no/nav/registre/testnav/geografiskekodeverkservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/DevConfig.java b/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/DevConfig.java index 65cc4ffac61..a809dc7ff44 100644 --- a/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/DevConfig.java +++ b/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/VaultConfig.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/VaultConfig.java index 14443eb107e..b051e109861 100644 --- a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/VaultConfig.java +++ b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/VaultConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/DevConfig.java b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/DevConfig.java index c631b48bf49..14efd3b1eeb 100644 --- a/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/DevConfig.java +++ b/apps/import-person-service/src/main/java/no/nav/testnav/apps/importpersonservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/DevConfig.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/DevConfig.java index bc2aaca40e3..0aa8a63221a 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/DevConfig.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/DevConfig.java b/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/DevConfig.java index 6fe2819fa9e..b2122036136 100644 --- a/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/DevConfig.java +++ b/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/DevConfig.java b/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/DevConfig.java index bd823ec6376..6e4fb8571af 100644 --- a/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/DevConfig.java +++ b/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/DevConfig.java b/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/DevConfig.java index be4cd555011..a68d1cb1c37 100644 --- a/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/DevConfig.java +++ b/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/DevConfig.java b/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/DevConfig.java index 6551a127cf2..69c2518b831 100644 --- a/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/DevConfig.java +++ b/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/DevConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/VaultConfig.java b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/VaultConfig.java index c8c37deee55..81a27dc494b 100644 --- a/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/VaultConfig.java +++ b/apps/mn-synt-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/VaultConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/DevConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/DevConfig.java index 35ffc24bf0b..63d3ab126c4 100644 --- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/DevConfig.java +++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/DevConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/DevConfig.java b/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/DevConfig.java index 6735ead5f1e..c5faa0db80b 100644 --- a/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/DevConfig.java +++ b/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/DevConfig.java b/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/DevConfig.java index 0d877ac7c64..b43babe19d3 100644 --- a/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/DevConfig.java +++ b/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/DevConfig.java b/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/DevConfig.java index e9f08054e5a..1d957e5cc49 100644 --- a/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/DevConfig.java +++ b/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/DevConfig.java b/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/DevConfig.java index bcfe5880bb2..9ca233dcbb4 100644 --- a/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/DevConfig.java +++ b/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/organisasjon-tilgang-frontend/src/main/java/no/nav/testnav/apps/organisasjontilgangfrontend/config/LocalVaultConfig.java b/apps/organisasjon-tilgang-frontend/src/main/java/no/nav/testnav/apps/organisasjontilgangfrontend/config/LocalVaultConfig.java index 7f582a7da40..30f5665139e 100644 --- a/apps/organisasjon-tilgang-frontend/src/main/java/no/nav/testnav/apps/organisasjontilgangfrontend/config/LocalVaultConfig.java +++ b/apps/organisasjon-tilgang-frontend/src/main/java/no/nav/testnav/apps/organisasjontilgangfrontend/config/LocalVaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/LocalVaultConfig.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/LocalVaultConfig.java index 292ad4809c9..ae4e7dc88bf 100644 --- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/LocalVaultConfig.java +++ b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/LocalVaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/DevConfig.java b/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/DevConfig.java index e7e80722da7..d6c2e53e3da 100644 --- a/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/DevConfig.java +++ b/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/DevConfig.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/DevConfig.java index e57e93886dd..0a1c47022a5 100644 --- a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/DevConfig.java +++ b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/DevConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/LocalConfig.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/LocalConfig.java index 9d9e08e3cee..0ff4a1aa528 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/LocalConfig.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/LocalConfig.java @@ -36,7 +36,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java index 10e9962f2e4..8af055d754f 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java @@ -16,8 +16,8 @@ public class TelefonnummerService extends PdlArtifactService { private static final String VALIDATION_PRIORITET_ERROR = "Telefonnummerets prioritet må være 1 eller 2"; private static final String VALIDATION_PRIORITET_INVALID = "Telefonnummer: prioritet 1 må angis før 2 kan benyttes"; private static final String VALIDATION_PRIORITET_AMBIGUOUS = "Telefonnummer: prioritet 1 og prioritet 2 kan kun benyttes én gang hver"; - private static final String VALIDATION_NUMMER_REQUIRED = "Telefonnummer: nummer er påkrevd felt"; - private static final String VALIDATION_LANDSKODE_REQUIRED = "Telefonnummer: landskode er påkrevd felt"; + private static final String VALIDATION_NUMMER_REQUIRED = "Telefonnummer: nummer er påkrevet felt"; + private static final String VALIDATION_LANDSKODE_REQUIRED = "Telefonnummer: landskode er påkrevet felt"; private static final String VALIDATION_LANDKODE_INVALID_FORMAT = "Telefonnummer: Landkode består av ledende + " + "(plusstegn) fulgt av 1 til 5 sifre"; private static final String VALIDATION_NUMMER_INVALID_FORMAT = "Telefonnummer: nummer kan kun inneholde tallsifre"; diff --git a/apps/person-export-api/src/main/java/no/nav/testnav/apps/personexportapi/config/VaultConfig.java b/apps/person-export-api/src/main/java/no/nav/testnav/apps/personexportapi/config/VaultConfig.java index 0ffb01c09bd..bb32e83529f 100644 --- a/apps/person-export-api/src/main/java/no/nav/testnav/apps/personexportapi/config/VaultConfig.java +++ b/apps/person-export-api/src/main/java/no/nav/testnav/apps/personexportapi/config/VaultConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/DevConfig.java b/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/DevConfig.java index 5e91a6c938a..ef810156209 100644 --- a/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/DevConfig.java +++ b/apps/person-faste-data-service/src/main/java/no/nav/testnav/personfastedataservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/DevVaultConfig.java b/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/DevVaultConfig.java index a84522d2c07..18545f22d53 100644 --- a/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/DevVaultConfig.java +++ b/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/DevVaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/DevConfig.java b/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/DevConfig.java index 4ece9c2898d..43c451c2a73 100644 --- a/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/DevConfig.java +++ b/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/DevConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(TOKEN_PROPERTY); if (isBlank(token)) { - throw new IllegalArgumentException(format("påkrevd property '%s' er ikke satt.", TOKEN_PROPERTY)); + throw new IllegalArgumentException(format("Påkrevet property '%s' er ikke satt.", TOKEN_PROPERTY)); } return new TokenAuthentication(System.getProperty(TOKEN_PROPERTY)); } diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/DevConfig.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/DevConfig.java index ba4cdb12926..f0130a45055 100644 --- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/DevConfig.java +++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/DevConfig.java b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/DevConfig.java index 1343d98171b..ec5a5459157 100644 --- a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/DevConfig.java +++ b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/DevConfig.java b/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/DevConfig.java index 49eb9b2c2be..91d2828b5d0 100644 --- a/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/DevConfig.java +++ b/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/DevConfig.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/DevConfig.java index 92edf0b889f..b88e7345942 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/DevConfig.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/LocalConfig.java b/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/LocalConfig.java index bddd823e51b..988c0aa4ecd 100644 --- a/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/LocalConfig.java +++ b/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/LocalConfig.java @@ -36,7 +36,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/DevConfig.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/DevConfig.java index ca3f27ca4be..579ae804cf9 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/DevConfig.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/DevConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/testnorge-tp/src/main/java/no/nav/registre/tp/config/dev/VaultConfig.java b/apps/testnorge-tp/src/main/java/no/nav/registre/tp/config/dev/VaultConfig.java index be6d944a636..c26a619ad80 100644 --- a/apps/testnorge-tp/src/main/java/no/nav/registre/tp/config/dev/VaultConfig.java +++ b/apps/testnorge-tp/src/main/java/no/nav/registre/tp/config/dev/VaultConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/DevConfig.java b/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/DevConfig.java index 4bf8d5d5bb2..5e0d1a637a4 100644 --- a/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/DevConfig.java +++ b/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/DevConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/VaultLocalConfig.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/VaultLocalConfig.java index 87bc0194638..9608b43bcad 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/VaultLocalConfig.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/VaultLocalConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/LocalConfig.java b/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/LocalConfig.java index 8dc666533e4..a83d6e37cdc 100644 --- a/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/LocalConfig.java +++ b/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/LocalConfig.java @@ -31,7 +31,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(TOKEN_SYSTEM_PROPERTY); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(TOKEN_SYSTEM_PROPERTY)); } diff --git a/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/LocalConfig.java b/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/LocalConfig.java index 46dbfaecc98..d0527757e3d 100644 --- a/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/LocalConfig.java +++ b/examples/reactive-rest-example/src/main/java/no/nav/testnav/examples/reactiverestexample/config/LocalConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/DevConfig.java b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/DevConfig.java index a6e8c53ba59..d6b9e8fce29 100644 --- a/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/DevConfig.java +++ b/libs/reactive-proxy/src/main/java/no/nav/testnav/libs/reactiveproxy/config/DevConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/LocalVaultConfig.java b/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/LocalVaultConfig.java index 3923071c26f..dd58a39b988 100644 --- a/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/LocalVaultConfig.java +++ b/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/config/LocalVaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/config/LocalVaultConfig.java b/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/config/LocalVaultConfig.java index 502379dd5df..9b02b63e907 100644 --- a/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/config/LocalVaultConfig.java +++ b/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/config/LocalVaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/config/LocalVaultConfig.java b/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/config/LocalVaultConfig.java index b9774bba8c1..1ae7b6d7ca6 100644 --- a/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/config/LocalVaultConfig.java +++ b/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/config/LocalVaultConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/config/LocalVaultConfig.java b/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/config/LocalVaultConfig.java index f77b1269030..8c38a0a9479 100644 --- a/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/config/LocalVaultConfig.java +++ b/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/config/LocalVaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/config/DevVaultConfig.java b/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/config/DevVaultConfig.java index 97fc9feca3d..ad2f1fd3a12 100644 --- a/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/config/DevVaultConfig.java +++ b/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/config/DevVaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/LocalVaultConfig.java b/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/LocalVaultConfig.java index 8383d29d3f7..a516197c0f1 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/LocalVaultConfig.java +++ b/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/config/LocalVaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/DevVaultConfig.java b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/DevVaultConfig.java index e863c82d83d..1d1581d0038 100644 --- a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/DevVaultConfig.java +++ b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/DevVaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } diff --git a/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/config/VaultConfig.java b/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/config/VaultConfig.java index 25bff4f7e57..1061aecdd8f 100644 --- a/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/config/VaultConfig.java +++ b/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/config/VaultConfig.java @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_TOKEN); if (isBlank(token)) { - throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt."); + throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt."); } return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); } From fe36b4aab0fa4b8e1a111553b4cfbf4169faeb4c Mon Sep 17 00:00:00 2001 From: stigus Date: Tue, 24 Oct 2023 10:39:33 +0200 Subject: [PATCH 48/49] Fikset tester --- .../no/nav/pdl/forvalter/service/TelefonnummerService.java | 2 +- .../nav/pdl/forvalter/service/TelefonnummerServiceTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java index 8af055d754f..87dd012b78c 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/TelefonnummerService.java @@ -12,7 +12,7 @@ @Service public class TelefonnummerService extends PdlArtifactService { - private static final String VALIDATION_PRIORITET_REQUIRED = "Telefonnummer: prioritet er påkrevd"; + private static final String VALIDATION_PRIORITET_REQUIRED = "Telefonnummer: prioritet er påkrevet"; private static final String VALIDATION_PRIORITET_ERROR = "Telefonnummerets prioritet må være 1 eller 2"; private static final String VALIDATION_PRIORITET_INVALID = "Telefonnummer: prioritet 1 må angis før 2 kan benyttes"; private static final String VALIDATION_PRIORITET_AMBIGUOUS = "Telefonnummer: prioritet 1 og prioritet 2 kan kun benyttes én gang hver"; diff --git a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TelefonnummerServiceTest.java b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TelefonnummerServiceTest.java index 6b54e3eea57..7538e758edd 100644 --- a/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TelefonnummerServiceTest.java +++ b/apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/TelefonnummerServiceTest.java @@ -31,7 +31,7 @@ void whenTelefonnummerIsAbsent_thenThrowException() { var exception = assertThrows(HttpClientErrorException.class, () -> telefonnummerService.validate(request)); - assertThat(exception.getMessage(), containsString("Telefonnummer: nummer er påkrevd felt")); + assertThat(exception.getMessage(), containsString("Telefonnummer: nummer er påkrevet felt")); } @Test @@ -74,7 +74,7 @@ void whenLandskodeIsAbsent_thenThrowException() { var exception = assertThrows(HttpClientErrorException.class, () -> telefonnummerService.validate(request)); - assertThat(exception.getMessage(), containsString("Telefonnummer: landskode er påkrevd felt")); + assertThat(exception.getMessage(), containsString("Telefonnummer: landskode er påkrevet felt")); } @Test @@ -105,7 +105,7 @@ void whenPriorityIsMissing_thenThrowException() { var exception = assertThrows(HttpClientErrorException.class, () -> telefonnummerService.validate(request)); - assertThat(exception.getMessage(), containsString("Telefonnummer: prioritet er påkrevd")); + assertThat(exception.getMessage(), containsString("Telefonnummer: prioritet er påkrevet")); } @Test From 5f445cf3b048758b3ceccb03038f64ae0e9e1aea Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Tue, 24 Oct 2023 11:14:28 +0200 Subject: [PATCH 49/49] Bump FROM til temurin:21 fra 17. --- apps/budpro-service/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/budpro-service/Dockerfile b/apps/budpro-service/Dockerfile index 5a807766e00..c120cde561e 100644 --- a/apps/budpro-service/Dockerfile +++ b/apps/budpro-service/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/navikt/baseimages/temurin:17 +FROM ghcr.io/navikt/baseimages/temurin:21 LABEL maintainer="Team Dolly" ADD build/libs/app.jar /app/app.jar