From cba90b6993754d01513831c7fb97657f1fa68f15 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 12 Sep 2024 16:03:55 +0200 Subject: [PATCH 1/7] Fjernet MaxDepthPerThrowable i logback --- apps/adresse-service/src/main/resources/logback-spring.xml | 2 +- apps/amelding-service/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/brreg-stub/src/main/resources/logback-spring.xml | 2 +- apps/bruker-service/src/main/resources/logback-spring.xml | 4 ++-- apps/budpro-service/src/main/resources/logback-spring.xml | 2 +- apps/dolly-backend/src/main/resources/logback-spring.xml | 2 +- apps/dolly-frontend/src/main/resources/logback-spring.xml | 1 - apps/dollystatus/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../faste-data-frontend/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/kodeverk-service/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/miljoer-service/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 4 ++-- .../src/main/resources/logback-spring.xml | 2 +- apps/orgnummer-service/src/main/resources/logback-spring.xml | 2 +- apps/oversikt-frontend/src/main/resources/logback-spring.xml | 2 +- apps/pdl-forvalter/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/person-service/src/main/resources/logback-spring.xml | 2 +- apps/profil-api/src/main/resources/logback-spring.xml | 2 +- apps/skattekort-service/src/main/resources/logback-spring.xml | 2 +- apps/sykemelding-api/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/testnav-ident-pool/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/tilbakemelding-api/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- apps/udi-stub/src/main/resources/logback-spring.xml | 2 +- apps/varslinger-service/src/main/resources/logback-spring.xml | 4 ++-- .../src/main/resources/logback-spring.xml | 2 +- proxies/aareg-proxy/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../batch-adeo-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/brregstub-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/ereg-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/histark-proxy/src/main/resources/logback-spring.xml | 2 +- .../inntektstub-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/inst-proxy/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- proxies/krrstub-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/medl-proxy/src/main/resources/logback-spring.xml | 2 +- .../modapp-ereg-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/norg2-proxy/src/main/resources/logback-spring.xml | 2 +- proxies/pdl-proxy/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- proxies/saf-proxy/src/main/resources/logback-spring.xml | 2 +- .../sigrunstub-proxy/src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- proxies/udistub-proxy/src/main/resources/logback-spring.xml | 2 +- 80 files changed, 82 insertions(+), 83 deletions(-) diff --git a/apps/adresse-service/src/main/resources/logback-spring.xml b/apps/adresse-service/src/main/resources/logback-spring.xml index 548416b37c9..82665807d91 100644 --- a/apps/adresse-service/src/main/resources/logback-spring.xml +++ b/apps/adresse-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/apps/amelding-service/src/main/resources/logback-spring.xml +++ b/apps/amelding-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml index 4832f349e0c..a7b6dd3a3e6 100644 --- a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml +++ b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml index 5c9a2412e45..6e928942d90 100644 --- a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml +++ b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml +++ b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/brreg-stub/src/main/resources/logback-spring.xml b/apps/brreg-stub/src/main/resources/logback-spring.xml index f6f874fb95b..2b8e3e07012 100644 --- a/apps/brreg-stub/src/main/resources/logback-spring.xml +++ b/apps/brreg-stub/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/bruker-service/src/main/resources/logback-spring.xml b/apps/bruker-service/src/main/resources/logback-spring.xml index a8f4e1102e4..bde386c86b7 100644 --- a/apps/bruker-service/src/main/resources/logback-spring.xml +++ b/apps/bruker-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke @@ -27,7 +27,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml index 45629711bde..8d108ba7157 100644 --- a/apps/budpro-service/src/main/resources/logback-spring.xml +++ b/apps/budpro-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml index fafc976c451..6c4bba7270e 100644 --- a/apps/dolly-backend/src/main/resources/logback-spring.xml +++ b/apps/dolly-backend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/dolly-frontend/src/main/resources/logback-spring.xml b/apps/dolly-frontend/src/main/resources/logback-spring.xml index 328c3cbd84c..966dbc796b2 100644 --- a/apps/dolly-frontend/src/main/resources/logback-spring.xml +++ b/apps/dolly-frontend/src/main/resources/logback-spring.xml @@ -5,7 +5,6 @@ true - 256 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/dollystatus/src/main/resources/logback-spring.xml b/apps/dollystatus/src/main/resources/logback-spring.xml index 9ebcb909c3d..bda6e2fe01e 100644 --- a/apps/dollystatus/src/main/resources/logback-spring.xml +++ b/apps/dollystatus/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml index 07f5248d65f..567d9f139e0 100644 --- a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml +++ b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/endringsmelding-service/src/main/resources/logback-spring.xml b/apps/endringsmelding-service/src/main/resources/logback-spring.xml index 8150ec6c2fb..0b85920eee1 100644 --- a/apps/endringsmelding-service/src/main/resources/logback-spring.xml +++ b/apps/endringsmelding-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml b/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml index 1aaf291d4ab..7b0b3b1cca1 100644 --- a/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml +++ b/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/faste-data-frontend/src/main/resources/logback-spring.xml b/apps/faste-data-frontend/src/main/resources/logback-spring.xml index e08948487ac..b2989b19b94 100644 --- a/apps/faste-data-frontend/src/main/resources/logback-spring.xml +++ b/apps/faste-data-frontend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml index 97622fc1eaf..3d7fef3768d 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/generer-navn-service/src/main/resources/logback-spring.xml b/apps/generer-navn-service/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/generer-navn-service/src/main/resources/logback-spring.xml +++ b/apps/generer-navn-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml index 97622fc1eaf..3d7fef3768d 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml +++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml index 1aaf291d4ab..7b0b3b1cca1 100644 --- a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml +++ b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/helsepersonell-service/src/main/resources/logback-spring.xml b/apps/helsepersonell-service/src/main/resources/logback-spring.xml index eeb685bda41..c2304354f25 100644 --- a/apps/helsepersonell-service/src/main/resources/logback-spring.xml +++ b/apps/helsepersonell-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml index 97622fc1eaf..3d7fef3768d 100644 --- a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml +++ b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml index 97622fc1eaf..3d7fef3768d 100644 --- a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml +++ b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml index a4ab0d66c2f..e7a32604657 100644 --- a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml +++ b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/joark-dokument-service/src/main/resources/logback-spring.xml b/apps/joark-dokument-service/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/joark-dokument-service/src/main/resources/logback-spring.xml +++ b/apps/joark-dokument-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/kodeverk-service/src/main/resources/logback-spring.xml b/apps/kodeverk-service/src/main/resources/logback-spring.xml index 1aaf291d4ab..7b0b3b1cca1 100644 --- a/apps/kodeverk-service/src/main/resources/logback-spring.xml +++ b/apps/kodeverk-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml index be77e0e7a98..5f39b7c7b9b 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml +++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml index be77e0e7a98..5f39b7c7b9b 100644 --- a/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml +++ b/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml index be77e0e7a98..5f39b7c7b9b 100644 --- a/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml +++ b/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/miljoer-service/src/main/resources/logback-spring.xml b/apps/miljoer-service/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/miljoer-service/src/main/resources/logback-spring.xml +++ b/apps/miljoer-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml index c95235c42b4..2b9ec4cb86b 100644 --- a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml +++ b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml index a4ab0d66c2f..e7a32604657 100644 --- a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml index a4ab0d66c2f..e7a32604657 100644 --- a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml index f6f874fb95b..2b8e3e07012 100644 --- a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml index 5c9a2412e45..6e928942d90 100644 --- a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-service/src/main/resources/logback-spring.xml b/apps/organisasjon-service/src/main/resources/logback-spring.xml index 97622fc1eaf..3d7fef3768d 100644 --- a/apps/organisasjon-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml index d679d46ee18..77af0d8bc7d 100644 --- a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke @@ -27,7 +27,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml index 4b79380bec5..379a17ddc3e 100644 --- a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/orgnummer-service/src/main/resources/logback-spring.xml b/apps/orgnummer-service/src/main/resources/logback-spring.xml index 1aaf291d4ab..7b0b3b1cca1 100644 --- a/apps/orgnummer-service/src/main/resources/logback-spring.xml +++ b/apps/orgnummer-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/oversikt-frontend/src/main/resources/logback-spring.xml b/apps/oversikt-frontend/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/apps/oversikt-frontend/src/main/resources/logback-spring.xml +++ b/apps/oversikt-frontend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/pdl-forvalter/src/main/resources/logback-spring.xml b/apps/pdl-forvalter/src/main/resources/logback-spring.xml index bc227892463..ecb23009d03 100644 --- a/apps/pdl-forvalter/src/main/resources/logback-spring.xml +++ b/apps/pdl-forvalter/src/main/resources/logback-spring.xml @@ -6,7 +6,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/person-faste-data-service/src/main/resources/logback-spring.xml b/apps/person-faste-data-service/src/main/resources/logback-spring.xml index e08948487ac..b2989b19b94 100644 --- a/apps/person-faste-data-service/src/main/resources/logback-spring.xml +++ b/apps/person-faste-data-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml index df515f6fe70..4e4897ae999 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml +++ b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/person-search-service/src/main/resources/logback-spring.xml b/apps/person-search-service/src/main/resources/logback-spring.xml index 10912516977..bde1862f2bc 100644 --- a/apps/person-search-service/src/main/resources/logback-spring.xml +++ b/apps/person-search-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/person-service/src/main/resources/logback-spring.xml b/apps/person-service/src/main/resources/logback-spring.xml index 479b8bdf7a7..80126b63465 100644 --- a/apps/person-service/src/main/resources/logback-spring.xml +++ b/apps/person-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/profil-api/src/main/resources/logback-spring.xml b/apps/profil-api/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/profil-api/src/main/resources/logback-spring.xml +++ b/apps/profil-api/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/skattekort-service/src/main/resources/logback-spring.xml b/apps/skattekort-service/src/main/resources/logback-spring.xml index ca13d7d7df4..0fe593266ce 100644 --- a/apps/skattekort-service/src/main/resources/logback-spring.xml +++ b/apps/skattekort-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/sykemelding-api/src/main/resources/logback-spring.xml b/apps/sykemelding-api/src/main/resources/logback-spring.xml index c5ffedd557b..87916258c05 100644 --- a/apps/sykemelding-api/src/main/resources/logback-spring.xml +++ b/apps/sykemelding-api/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml +++ b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml index e6189bbd745..cb801609c61 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml +++ b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/tenor-search-service/src/main/resources/logback-spring.xml b/apps/tenor-search-service/src/main/resources/logback-spring.xml index 691fda0f20c..9aed9d5f0bc 100644 --- a/apps/tenor-search-service/src/main/resources/logback-spring.xml +++ b/apps/tenor-search-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml index f6f874fb95b..2b8e3e07012 100644 --- a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml +++ b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml b/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml index f6f874fb95b..2b8e3e07012 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml +++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml index 9583ff2d427..7309420d4fd 100644 --- a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml +++ b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/tps-messaging-service/src/main/resources/logback-spring.xml b/apps/tps-messaging-service/src/main/resources/logback-spring.xml index f6f874fb95b..2b8e3e07012 100644 --- a/apps/tps-messaging-service/src/main/resources/logback-spring.xml +++ b/apps/tps-messaging-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/udi-stub/src/main/resources/logback-spring.xml b/apps/udi-stub/src/main/resources/logback-spring.xml index 8dcb3d51248..f49b192e253 100644 --- a/apps/udi-stub/src/main/resources/logback-spring.xml +++ b/apps/udi-stub/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/apps/varslinger-service/src/main/resources/logback-spring.xml b/apps/varslinger-service/src/main/resources/logback-spring.xml index 9f8bf6cf184..395508d0604 100644 --- a/apps/varslinger-service/src/main/resources/logback-spring.xml +++ b/apps/varslinger-service/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke @@ -27,7 +27,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/examples/reactive-rest-example/src/main/resources/logback-spring.xml b/examples/reactive-rest-example/src/main/resources/logback-spring.xml index 16f5e9c7567..a189fa69b53 100644 --- a/examples/reactive-rest-example/src/main/resources/logback-spring.xml +++ b/examples/reactive-rest-example/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/aareg-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-proxy/src/main/resources/logback-spring.xml index 86a43aa5b33..ae836bf1b11 100644 --- a/proxies/aareg-proxy/src/main/resources/logback-spring.xml +++ b/proxies/aareg-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml +++ b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml index 670bb2e190d..3196c68e393 100644 --- a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml +++ b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml +++ b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml +++ b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml +++ b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/ereg-proxy/src/main/resources/logback-spring.xml b/proxies/ereg-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/ereg-proxy/src/main/resources/logback-spring.xml +++ b/proxies/ereg-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/histark-proxy/src/main/resources/logback-spring.xml b/proxies/histark-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/histark-proxy/src/main/resources/logback-spring.xml +++ b/proxies/histark-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml index e08948487ac..b2989b19b94 100644 --- a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/inst-proxy/src/main/resources/logback-spring.xml b/proxies/inst-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/inst-proxy/src/main/resources/logback-spring.xml +++ b/proxies/inst-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml index ca618d7da3b..ecf519e83b1 100644 --- a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml +++ b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/medl-proxy/src/main/resources/logback-spring.xml b/proxies/medl-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/medl-proxy/src/main/resources/logback-spring.xml +++ b/proxies/medl-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml +++ b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/norg2-proxy/src/main/resources/logback-spring.xml b/proxies/norg2-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/norg2-proxy/src/main/resources/logback-spring.xml +++ b/proxies/norg2-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/pdl-proxy/src/main/resources/logback-spring.xml b/proxies/pdl-proxy/src/main/resources/logback-spring.xml index 37ffd7e0d09..fa34559da64 100644 --- a/proxies/pdl-proxy/src/main/resources/logback-spring.xml +++ b/proxies/pdl-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml index bf12737c752..67da608456f 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml +++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/saf-proxy/src/main/resources/logback-spring.xml b/proxies/saf-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/saf-proxy/src/main/resources/logback-spring.xml +++ b/proxies/saf-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml index 3b591204bab..f874dcc44c1 100644 --- a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml index f48486bb3ab..2b55a41c62f 100644 --- a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml +++ b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml index 8150ec6c2fb..0b85920eee1 100644 --- a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml +++ b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke diff --git a/proxies/udistub-proxy/src/main/resources/logback-spring.xml b/proxies/udistub-proxy/src/main/resources/logback-spring.xml index e08948487ac..b2989b19b94 100644 --- a/proxies/udistub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/udistub-proxy/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ true - 256 + 10280 20 ^sun\.reflect\..*\.invoke From 4874348e86a17c8ae026ff8c0ad8b25bf23ecefa Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Fri, 13 Sep 2024 09:20:11 +0200 Subject: [PATCH 2/7] Omskrivning aldersvalidering popp --- .../fagsystem/aareg/form/initialValues.tsx | 4 +- .../fagsystem/pensjon/form/Form.tsx | 50 +++++++++---------- .../pensjon/form/FyllInnInntektForm.tsx | 14 ++++-- .../pensjon/form/GenerertInntektForm.tsx | 4 +- .../fagsystem/pensjon/form/validation.tsx | 35 ++++++++----- 5 files changed, 61 insertions(+), 46 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/initialValues.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/initialValues.tsx index ef8c1e677be..e33c6fbd2a8 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/initialValues.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/initialValues.tsx @@ -90,7 +90,7 @@ export const initialPeriode = { } export const initialPensjonInntekt = { - fomAar: new Date().getFullYear() - 10, + fomAar: runningE2ETest() ? new Date().getFullYear() - 10 : null, tomAar: runningE2ETest() ? new Date().getFullYear() : null, belop: runningE2ETest() ? '12345' : '', redusertMedGrunnbelop: true, @@ -98,7 +98,7 @@ export const initialPensjonInntekt = { export const initialPensjonGenerertInntekt = { generer: { - fomAar: new Date().getFullYear() - 10, + fomAar: null, averageG: 1.5, tillatInntektUnder1G: false, }, diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx index 0342088df59..e00dbfbcd68 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx @@ -1,7 +1,7 @@ import { Vis } from '@/components/bestillingsveileder/VisAttributt' import Panel from '@/components/ui/panel/Panel' import { erForsteEllerTest, panelError } from '@/components/ui/form/formUtils' -import { validation } from '@/components/fagsystem/pensjon/form/validation' +import { getAlder, validation } from '@/components/fagsystem/pensjon/form/validation' import React, { useContext, useState } from 'react' import StyledAlert from '@/components/ui/alert/StyledAlert' import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext' @@ -33,24 +33,22 @@ export const PensjonForm = () => { ) const { nyBestilling, nyBestillingFraMal } = opts?.is - function kalkulerIdentFyltSyttenAar() { - const curDate = new Date() - const alder = - formMethods.watch('pdldata.opprettNyPerson.foedtFoer') && - formMethods.watch('pdldata.opprettNyPerson.foedtFoer') !== null - ? curDate.getFullYear() - - // @ts-ignore - new Date(formMethods.watch('pdldata.opprettNyPerson.foedtFoer')).getFullYear() - : formMethods.watch('pdldata.opprettNyPerson.alder') - return alder && curDate.getFullYear() - alder + 17 + const curDate = new Date() + + const alder = + formMethods.watch('pdldata.opprettNyPerson.foedtFoer') && + formMethods.watch('pdldata.opprettNyPerson.foedtFoer') !== null + ? curDate.getFullYear() - + // @ts-ignore + new Date(formMethods.watch('pdldata.opprettNyPerson.foedtFoer')).getFullYear() + : getAlder(formMethods.watch(), opts?.personFoerLeggTil, opts?.importPersoner) + + function kalkulerIdentGyldigAlder() { + const minAlder = alder && (curDate.getFullYear() - alder < 1997 ? 17 : 13) + return alder && curDate.getFullYear() - alder + minAlder } - const syttenFraOgMedAar = kalkulerIdentFyltSyttenAar() - const minAar = new Date().getFullYear() - 17 - const valgtAar = - inputType === inputValg.fyllInnInntekt - ? formMethods.watch(`${pensjonPath}.fomAar`) - : formMethods.watch(`${pensjonGenererPath}.generer.fomAar`) + const gyldigFraOgMedAar = kalkulerIdentGyldigAlder() return ( @@ -61,14 +59,12 @@ export const PensjonForm = () => { startOpen={erForsteEllerTest(formMethods.getValues(), [pensjonPath, pensjonGenererPath])} informasjonstekst={hjelpetekst} > - {!formMethods.getValues('pdldata.opprettNyPerson.alder') && - valgtAar < minAar && - (nyBestilling || nyBestillingFraMal) && ( - - Pensjonsgivende inntekt kan settes fra året personen fyller 17 år. For å sikre at - personen får gyldig alder kan denne settes ved å huke av for "Alder" på forrige side. - - )} + {!alder && (nyBestilling || nyBestillingFraMal) && ( + + Pensjonsgivende inntekt kan settes tidligst fra året personen fyller 13 år. For å sikre + at personen får gyldig alder kan denne settes ved å huke av for "Alder" på forrige side. + + )} { {inputType === inputValg.fyllInnInntekt && ( - + )} {inputType === inputValg.generertInntekt && ( - + )} diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/FyllInnInntektForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/FyllInnInntektForm.tsx index 8ebd35c9202..12f59aad214 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/FyllInnInntektForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/FyllInnInntektForm.tsx @@ -6,14 +6,22 @@ import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox' import React from 'react' import { pensjonPath } from '@/components/fagsystem/pensjon/form/Form' -export const FyllInnInntektForm = ({ syttenFraOgMedAar }) => { +export const FyllInnInntektForm = ({ gyldigFraOgMedAar, formMethods }) => { + const visFomAar = formMethods.watch(`${pensjonPath}.tomAar`) + const visTomAar = formMethods.watch(`${pensjonPath}.fomAar`) + return (
@@ -21,7 +29,7 @@ export const FyllInnInntektForm = ({ syttenFraOgMedAar }) => { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx index 4744ad91790..de7eae9011a 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx @@ -27,7 +27,7 @@ const StyledPanel = styled.div` width: 790px; ` -export const GenerertInntektForm = ({ syttenFraOgMedAar, formMethods }) => { +export const GenerertInntektForm = ({ gyldigFraOgMedAar, formMethods }) => { const formInntekter = formMethods.watch(`${pensjonGenererPath}.inntekter`) const genererTOM = formMethods.watch(`${pensjonGenererPath}.generer.tomAar`) const genererFOM = formMethods.watch(`${pensjonGenererPath}.generer.fomAar`) @@ -78,7 +78,7 @@ export const GenerertInntektForm = ({ syttenFraOgMedAar, formMethods }) => { name={`${pensjonGenererPath}.generer.fomAar`} label="Fra og med år" options={getYearRangeOptions( - syttenFraOgMedAar || 1968, + gyldigFraOgMedAar || 1968, (genererTOM && genererTOM - 1) || new Date().getFullYear() - 1, )} size={'xsmall'} diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx index 7eb2d94482a..4f193be772d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx @@ -5,6 +5,7 @@ import { TjenestepensjonForm } from '@/components/fagsystem/tjenestepensjon/form import { AlderspensjonForm } from '@/components/fagsystem/alderspensjon/form/Form' import { UforetrygdForm } from '@/components/fagsystem/uforetrygd/form/Form' import { PensjonsavtaleForm } from '@/components/fagsystem/pensjonsavtale/form/Form' +import { getYear } from 'date-fns' function calculate_age(dob) { const diff_ms = Date.now() - dob.getTime() @@ -13,7 +14,7 @@ function calculate_age(dob) { return Math.abs(age_dt.getUTCFullYear() - 1970) } -const getAlder = (values, personFoerLeggTil, importPersoner) => { +export const getAlder = (values, personFoerLeggTil, importPersoner) => { let alder = _.get(values, 'pdldata.opprettNyPerson.alder') if (_.isNil(alder)) { let foedselsdato = null @@ -21,6 +22,10 @@ const getAlder = (values, personFoerLeggTil, importPersoner) => { foedselsdato = values.pdldata.person.foedselsdato[0].foedselsdato } else if (values?.pdldata?.person?.foedsel?.[0]?.foedselsdato) { foedselsdato = values.pdldata.person.foedsel[0].foedselsdato + } else if (values?.pdldata?.person?.foedselsdato?.[0]?.foedselsaar) { + foedselsdato = new Date().setFullYear(values.pdldata.person.foedselsdato[0].foedselsaar) + } else if (values?.pdldata?.opprettNyPerson?.foedtFoer) { + foedselsdato = values.pdldata.opprettNyPerson.foedtFoer } else if (personFoerLeggTil?.pdlforvalter?.person?.foedselsdato) { const foedselsdatoer = personFoerLeggTil.pdlforvalter.person.foedselsdato .map((foedsel) => foedsel.foedselsdato) @@ -50,7 +55,7 @@ const getAlder = (values, personFoerLeggTil, importPersoner) => { return alder } -const invalidAlderFom = (inntektFom, values, personFoerLeggTil) => { +const invalidAlderFom = (inntektFom, values, personFoerLeggTil, minAlder) => { const importPersoner = values.importPersoner const alder = getAlder(values, personFoerLeggTil, importPersoner) @@ -58,7 +63,7 @@ const invalidAlderFom = (inntektFom, values, personFoerLeggTil) => { const foedtEtter = _.get(values, 'pdldata.opprettNyPerson.foedtEtter') if (!_.isNil(alder) && alder !== '') { - if (new Date().getFullYear() - alder + 17 > inntektFom) { + if (new Date().getFullYear() - alder + minAlder > inntektFom) { return true } } else if (!_.isNil(foedtFoer)) { @@ -68,12 +73,12 @@ const invalidAlderFom = (inntektFom, values, personFoerLeggTil) => { let year = foedtFoerDate.getFullYear() year = day === 1 && month === 0 ? year - 1 : year - if (year + 17 > inntektFom) { + if (year + minAlder || 13 > inntektFom) { return true } } else if (!_.isNil(foedtEtter) && _.isNil(foedtFoer)) { const foedtEtterDate = new Date(foedtEtter) - if (foedtEtterDate.getFullYear() + 17 > inntektFom) { + if (foedtEtterDate.getFullYear() + minAlder || 13 > inntektFom) { return true } } @@ -136,15 +141,21 @@ const validFomDateTest = (val: Yup.NumberSchema) => { return val.test('gyldig-fom-aar', 'Feil', (value, context) => { if (!value) return true const inntektFom = value - - const values = context.parent + const values = context.from?.[context.from.length - 1]?.value const personFoerLeggTil = context?.options?.context?.personFoerLeggTil - if (invalidAlderFom(inntektFom, values, personFoerLeggTil)) { - return context.createError({ message: 'F.o.m kan tidligst være året personen fyller 17 år' }) + const alder = getAlder(values, personFoerLeggTil, values.importPersoner) + const foedselsAar = alder && getYear(new Date()) - alder + + const minAlder = foedselsAar && foedselsAar < 1997 ? 17 : 13 + + if (invalidAlderFom(inntektFom, values, personFoerLeggTil, minAlder)) { + return context.createError({ + message: `F.o.m kan tidligst være året personen fyller ${minAlder.toString()} år`, + }) } - let inntektTom = values?.tomAar + let inntektTom = context.options.parent.tomAar if (!_.isNil(inntektTom) && inntektFom > inntektTom) { return context.createError({ message: 'F.o.m. dato må være før t.o.m. dato' }) } @@ -158,7 +169,7 @@ const validTomDateTest = (val: Yup.NumberSchema) => { if (!value) return true let inntektTom = value - const values = context.parent + const values = context.from?.[context.from.length - 1]?.value const personFoerLeggTil = context?.options?.context?.personFoerLeggTil if (invalidAlderTom(inntektTom, values, personFoerLeggTil)) { @@ -171,7 +182,7 @@ const validTomDateTest = (val: Yup.NumberSchema) => { return context.createError({ message: 'T.o.m kan ikke være etter at person har dødd' }) } - const inntektFom = values?.fomAar + const inntektFom = context.options.parent.fomAar if (!_.isNil(inntektFom) && inntektTom < inntektFom) { return context.createError({ message: 'T.o.m. dato må være etter f.o.m. dato' }) } From bcb114ec43569f240834bd83799fdbe204ee0626 Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Fri, 13 Sep 2024 09:24:25 +0200 Subject: [PATCH 3/7] Deploy test #deploy-test-frontend --- .../main/js/src/components/fagsystem/pensjon/form/validation.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx index 4f193be772d..a91cc5abfe6 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx @@ -57,7 +57,6 @@ export const getAlder = (values, personFoerLeggTil, importPersoner) => { const invalidAlderFom = (inntektFom, values, personFoerLeggTil, minAlder) => { const importPersoner = values.importPersoner - const alder = getAlder(values, personFoerLeggTil, importPersoner) const foedtFoer = _.get(values, 'pdldata.opprettNyPerson.foedtFoer') const foedtEtter = _.get(values, 'pdldata.opprettNyPerson.foedtEtter') From a97ceeec76aa72b6fde6775822aeba6dcf135885 Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Fri, 13 Sep 2024 10:16:48 +0200 Subject: [PATCH 4/7] Fix --- .../src/components/fagsystem/pensjon/form/Form.tsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx index e00dbfbcd68..12312590936 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx @@ -35,13 +35,11 @@ export const PensjonForm = () => { const curDate = new Date() - const alder = - formMethods.watch('pdldata.opprettNyPerson.foedtFoer') && - formMethods.watch('pdldata.opprettNyPerson.foedtFoer') !== null - ? curDate.getFullYear() - - // @ts-ignore - new Date(formMethods.watch('pdldata.opprettNyPerson.foedtFoer')).getFullYear() - : getAlder(formMethods.watch(), opts?.personFoerLeggTil, opts?.importPersoner) + const alder = formMethods.watch('pdldata.opprettNyPerson.foedtFoer') + ? curDate.getFullYear() - + // @ts-ignore + new Date(formMethods.watch('pdldata.opprettNyPerson.foedtFoer')).getFullYear() + : getAlder(formMethods.watch(), opts?.personFoerLeggTil, opts?.importPersoner) function kalkulerIdentGyldigAlder() { const minAlder = alder && (curDate.getFullYear() - alder < 1997 ? 17 : 13) From 45b5696a0b15aeeb93cfa8c896ae1c2d78fdb13a Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Fri, 13 Sep 2024 10:40:57 +0200 Subject: [PATCH 5/7] Bytt org-bestilling-icon --- .../js/src/pages/organisasjoner/OrganisasjonBestilling.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx index aee01185eef..2cf3e771375 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx @@ -1,7 +1,7 @@ import _ from 'lodash' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { DollyTable } from '@/components/ui/dollyTable/DollyTable' -import { OrganisasjonItem } from '@/components/ui/icon/IconItem' +import { BestillingIconItem } from '@/components/ui/icon/IconItem' import Icon from '@/components/ui/icon/Icon' import BestillingDetaljer from '@/components/bestilling/detaljer/BestillingDetaljer' import { OrgStatus } from '@/components/fagsystem/organisasjoner/types' @@ -92,7 +92,7 @@ export default function OrganisasjonBestilling({ data={bestillingStatuser} columns={columns} pagination - iconItem={} + iconItem={} onExpand={(bestilling: OrgStatus) => { return ( Date: Mon, 16 Sep 2024 10:33:53 +0200 Subject: [PATCH 6/7] Fix visning av vedtaksstatus paa AP og UT --- .../visning/AlderspensjonVisning.tsx | 5 ++-- .../uforetrygd/visning/UforetrygdVisning.tsx | 25 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/visning/AlderspensjonVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/visning/AlderspensjonVisning.tsx index 6573c74b218..4955c871789 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/visning/AlderspensjonVisning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/visning/AlderspensjonVisning.tsx @@ -21,6 +21,7 @@ const DataVisning = ({ data, miljo }) => { )?.label const { vedtakData } = usePensjonVedtak(data?.fnr, miljo) + const vedtakAP = vedtakData?.find((vedtak) => vedtak?.sakType === 'AP') return ( <> @@ -28,9 +29,9 @@ const DataVisning = ({ data, miljo }) => { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/visning/UforetrygdVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/visning/UforetrygdVisning.tsx index f4daca96ee2..d1c67bb357d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/visning/UforetrygdVisning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/uforetrygd/visning/UforetrygdVisning.tsx @@ -57,21 +57,24 @@ const DataVisning = ({ data, miljo }) => { )?.label const { vedtakData } = usePensjonVedtak(data?.fnr, miljo) + const vedtakUT = vedtakData?.find((vedtak) => vedtak?.sakType === 'UT') + + const getSisteOppdatering = (sisteOppdatering: string) => { + if (sisteOppdatering?.includes('opprettet')) { + return 'Iverksatt' + } else if (sisteOppdatering?.indexOf('<') > 0) { + return sisteOppdatering?.substring(0, sisteOppdatering?.indexOf('<')) + } else if (sisteOppdatering?.indexOf('{') > 0) { + return sisteOppdatering?.substring(0, sisteOppdatering?.indexOf('{')) + } else { + return sisteOppdatering + } + } return ( <>
- + From 5e39264ddd9d86303e8030f43a565a1f405f381e Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Mon, 16 Sep 2024 11:00:46 +0200 Subject: [PATCH 7/7] =?UTF-8?q?Bruker=20n=C3=A5=20convention=20plugin=20do?= =?UTF-8?q?lly-apps.=20(#3616)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../build.gradle | 87 ++++--------------- .../build.gradle | 85 ++++-------------- 2 files changed, 34 insertions(+), 138 deletions(-) diff --git a/apps/levende-arbeidsforhold-scheduler/build.gradle b/apps/levende-arbeidsforhold-scheduler/build.gradle index 816d6d2667a..f0cc5802adc 100644 --- a/apps/levende-arbeidsforhold-scheduler/build.gradle +++ b/apps/levende-arbeidsforhold-scheduler/build.gradle @@ -1,87 +1,34 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } sonarqube { properties { - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.token", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-levende-arbeidsforhold-scheduler" property "sonar.projectName", "testnav-levende-arbeidsforhold-scheduler" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') } } dependencies { - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:servlet-core' - implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'no.nav.testnav.libs:servlet-security' - implementation 'no.nav.testnav.libs:servlet-insecure-security' - - - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-quartz' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.springframework.boot:spring-boot-starter-security' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation "no.nav.testnav.libs:security-core" + implementation "no.nav.testnav.libs:servlet-core" + implementation "no.nav.testnav.libs:data-transfer-objects" + implementation "no.nav.testnav.libs:servlet-security" + implementation "no.nav.testnav.libs:servlet-insecure-security" - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-quartz" + implementation "org.springframework.boot:spring-boot-starter-oauth2-client" + implementation "org.springframework.boot:spring-boot-starter-security" - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" - 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' + testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock" //Dependencies av dependencies som må ha spesifisert versjon for å ikke forårsake sikkerthets-sårbarheter - implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.25' - implementation 'org.bouncycastle:bcprov-jdk18on:1.78' - implementation 'com.nimbusds:nimbus-jose-jwt:9.37.2' + implementation "org.apache.tomcat.embed:tomcat-embed-core:10.1.25" + implementation "org.bouncycastle:bcprov-jdk18on:$versions.bouncyCastle" + implementation "com.nimbusds:nimbus-jose-jwt:9.37.2" -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} +} \ No newline at end of file diff --git a/apps/levende-arbeidsforhold-service/build.gradle b/apps/levende-arbeidsforhold-service/build.gradle index 42454499acc..1ff86f414b6 100644 --- a/apps/levende-arbeidsforhold-service/build.gradle +++ b/apps/levende-arbeidsforhold-service/build.gradle @@ -1,85 +1,34 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } sonarqube { properties { - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.token", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-levende-arbeidsforhold-service" property "sonar.projectName", "testnav-levende-arbeidsforhold-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') } } dependencies { - implementation 'no.nav.testnav.libs:avro-schema' - implementation 'no.nav.testnav.libs:kafka-config' - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:servlet-insecure-security' - implementation 'no.nav.testnav.libs:servlet-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.springframework.boot:spring-boot-starter-security' + implementation "io.confluent:kafka-avro-serializer:$versions.avro" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation "no.nav.testnav.libs:avro-schema" + implementation "no.nav.testnav.libs:data-transfer-objects" + implementation "no.nav.testnav.libs:kafka-config" + implementation "no.nav.testnav.libs:reactive-core" + implementation "no.nav.testnav.libs:security-core" + implementation "no.nav.testnav.libs:servlet-core" + implementation "no.nav.testnav.libs:servlet-insecure-security" - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' + implementation "org.springframework.boot:spring-boot-starter-oauth2-client" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.boot:spring-boot-starter-web" - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' + implementation "org.springframework.kafka:spring-kafka" - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - implementation 'org.apache.kafka:kafka-clients:3.7.0' - implementation 'io.confluent:kafka-avro-serializer:7.6.0' - implementation 'org.springframework.kafka:spring-kafka' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock" }