cleanup/deprecated_sm (#4229)

rfc3092 · web-flow · commit 8596ceefec0b · 2026-05-20T10:01:51.000+02:00
Changed configuration from using deprecated sm:// to sm@.

Also, in data-transfer-objects:
* Added @Builder.Default to avoid warnings.
* Changed deprecated use of getText() with getString().
* Fixed some warnings related to raw use of parametrized type.
diff --git a/apps/adresse-service/src/main/resources/application-local.yml b/apps/adresse-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   security:
     oauth2:
       resourceserver:
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
@@ -1,20 +1,20 @@
-ALTINN_URL: ${sm\://altinn-url}
+ALTINN_URL: ${sm@altinn-url}
 MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
 MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
 
 spring:
   cache:
     type: none
   config:
-    import: "sm://"
+    import: "sm@"
   flyway:
     enabled: true
     locations: classpath:db/migration
     baseline-on-migrate: true
     url: jdbc:postgresql://localhost:5432/testnav-altinn3-tilgang-local
     user: testnav-altinn3-tilgang-local
-    password: ${sm\://testnav-altinn3-tilgang-local}
+    password: ${sm@testnav-altinn3-tilgang-local}
   r2dbc:
     url: r2dbc:postgresql://localhost:5432/testnav-altinn3-tilgang-local
     username: testnav-altinn3-tilgang-local
-    password: ${sm\://testnav-altinn3-tilgang-local}
+    password: ${sm@testnav-altinn3-tilgang-local}
diff --git a/apps/api-oversikt-service/src/main/resources/application-local.yml b/apps/api-oversikt-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   security:
     oauth2:
       resourceserver:
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml b/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml
@@ -2,7 +2,7 @@ DOLLY_READER_TOKEN: dummy
 
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   flyway:
     url: jdbc:h2:mem:testdb
     username: sa
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml b/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml
@@ -2,7 +2,7 @@ DOLLY_READER_TOKEN: dummy
 
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   flyway:
     url: jdbc:postgresql://localhost:3306/testnav-app-tilgang-analyse-service-db
     user: testnav-app-tilgang-analyse-service
diff --git a/apps/batch-bestilling-service/src/main/resources/application-local.yml b/apps/batch-bestilling-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   dolly-backend:
diff --git a/apps/bruker-service/src/main/resources/application-local.yml b/apps/bruker-service/src/main/resources/application-local.yml
@@ -3,7 +3,7 @@ TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
 
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   flyway:
     url: jdbc:h2:mem:testdb
     username: sa
diff --git a/apps/budpro-service/src/main/resources/application-local.yml b/apps/budpro-service/src/main/resources/application-local.yml
@@ -7,4 +7,4 @@ dolly:
 
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
diff --git a/apps/dolly-backend/src/main/resources/application-local.yml b/apps/dolly-backend/src/main/resources/application-local.yml
@@ -7,15 +7,15 @@ spring:
   cache:
     type: none
   config:
-    import: "sm://"
+    import: "sm@"
   flyway:
     url: jdbc:postgresql://localhost:5432/testnav-dolly-backend-local
     user: testnav-dolly-backend-local
-    password: ${sm\://testnav-dolly-backend-local}
+    password: ${sm@testnav-dolly-backend-local}
   r2dbc:
     url: r2dbc:postgresql://localhost:5432/testnav-dolly-backend-local
     username: testnav-dolly-backend-local
-    password: ${sm\://testnav-dolly-backend-local}
+    password: ${sm@testnav-dolly-backend-local}
   devtools:
     restart:
       enabled: false
diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml
@@ -10,7 +10,7 @@ management:
 
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   data:
     redis:
       host: localhost
diff --git a/apps/dolly-search-service/src/main/resources/application-local.yml b/apps/dolly-search-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 open:
   search:
diff --git a/apps/endringsmelding-frontend/src/main/resources/application-local.yml b/apps/endringsmelding-frontend/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   endringsmelding-service:
diff --git a/apps/endringsmelding-service/src/main/resources/application-local.yml b/apps/endringsmelding-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   adresse-service:
diff --git a/apps/faste-data-frontend/src/main/resources/application-local.yml b/apps/faste-data-frontend/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   testnorge-profil-api:
diff --git a/apps/generer-navn-service/src/main/resources/application-local.yml b/apps/generer-navn-service/src/main/resources/application-local.yml
@@ -1,3 +1,3 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
diff --git a/apps/helsepersonell-service/src/main/resources/application-local.yml b/apps/helsepersonell-service/src/main/resources/application-local.yml
@@ -1,3 +1,3 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml b/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml
@@ -1,3 +1,3 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
diff --git a/apps/inntektsmelding-service/src/main/resources/application-local.yml b/apps/inntektsmelding-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   h2:
     console:
       enabled: true
diff --git a/apps/jenkins-batch-status-service/src/main/resources/application-local.yml b/apps/jenkins-batch-status-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   organisasjon-bestilling-service:
diff --git a/apps/joark-dokument-service/src/main/resources/application-local.yml b/apps/joark-dokument-service/src/main/resources/application-local.yml
@@ -1,3 +1,3 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
diff --git a/apps/kodeverk-service/src/main/resources/application-local.yml b/apps/kodeverk-service/src/main/resources/application-local.yml
@@ -1,3 +1,3 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   datasource:
     url: jdbc:postgresql://localhost:5432/testnav-levende-arbeidsforhold
     username: postgres
diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   levende-arbeidsforhold-ansettelse:
diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml b/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 kafka:
   group-id: testnav-levende-arbeidsforhold-service
diff --git a/apps/miljoer-service/src/main/resources/application-local.yml b/apps/miljoer-service/src/main/resources/application-local.yml
@@ -1,3 +1,3 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml b/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   h2:
     console:
       enabled: true
diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml b/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   h2:
     console:
       enabled: true
diff --git a/apps/organisasjon-forvalter/src/main/resources/application-local.yml b/apps/organisasjon-forvalter/src/main/resources/application-local.yml
@@ -1,10 +1,10 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   datasource:
     url: jdbc:postgresql://localhost:5432/testnav-organisasjon-forvalter-local
     username: testnav-organisasjon-forvalter-local
-    password: ${sm\://testnav-organisasjon-forvalter-local}
+    password: ${sm@testnav-organisasjon-forvalter-local}
 
 consumers:
   generer-navn-service:
diff --git a/apps/organisasjon-mottak-service/src/main/resources/application-local.yml b/apps/organisasjon-mottak-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   jenkins-batch-status-service:
diff --git a/apps/organisasjon-service/src/main/resources/application-local.yml b/apps/organisasjon-service/src/main/resources/application-local.yml
@@ -1,3 +1,3 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
diff --git a/apps/orgnummer-service/src/main/resources/application-local.yml b/apps/orgnummer-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   h2:
     console:
       enabled: true
diff --git a/apps/oversikt-frontend/src/main/resources/application-local.yml b/apps/oversikt-frontend/src/main/resources/application-local.yml
@@ -3,7 +3,7 @@ server:
 
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   testnorge-profil-api:
diff --git a/apps/pdl-forvalter/src/main/resources/application-local.yml b/apps/pdl-forvalter/src/main/resources/application-local.yml
@@ -1,14 +1,14 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   datasource:
     url: jdbc:postgresql://localhost:5432/testnav-pdl-forvalter-local
     username: testnav-pdl-forvalter-local
-    password: ${sm\://testnav-pdl-forvalter-local}
+    password: ${sm@testnav-pdl-forvalter-local}
   r2dbc:
     url: r2dbc:postgresql://localhost:5432/testnav-pdl-forvalter-local
     username: testnav-pdl-forvalter-local
-    password: ${sm\://testnav-pdl-forvalter-local}
+    password: ${sm@testnav-pdl-forvalter-local}
 
 consumers:
   adresse-service:
diff --git a/apps/pdl-lagre-service/src/main/resources/application-local.yml b/apps/pdl-lagre-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 OPEN_SEARCH_URI: http://localhost:9200
 OPEN_SEARCH_USERNAME: tada
diff --git a/apps/person-faste-data-service/src/main/resources/application-local.yml b/apps/person-faste-data-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   h2:
     console:
       enabled: true
diff --git a/apps/person-service/src/main/resources/application-local.yml b/apps/person-service/src/main/resources/application-local.yml
@@ -1,3 +1,3 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
diff --git a/apps/profil-api/src/main/resources/application-local.yml b/apps/profil-api/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   security:
     oauth2:
       resourceserver:
diff --git a/apps/sykemelding-api/src/main/resources/application-local.yml b/apps/sykemelding-api/src/main/resources/application-local.yml
@@ -17,7 +17,7 @@ consumers:
 
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   security:
     oauth2:
       resourceserver:
diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml b/apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 batch:
   miljoe: q2
diff --git a/apps/tenor-search-service/src/main/resources/application-local.yml b/apps/tenor-search-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   dolly-backend:
diff --git a/apps/testnav-ident-pool/src/main/resources/application-local.yml b/apps/testnav-ident-pool/src/main/resources/application-local.yml
@@ -1,17 +1,17 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   flyway:
     enabled: true
     locations: classpath:db/migration
     baseline-on-migrate: true
     url: jdbc:postgresql://localhost:5432/testnav-identpool-local
     user: testnav-identpool-local
-    password: ${sm\://testnav-identpool-local}
+    password: ${sm@testnav-identpool-local}
   r2dbc:
     url: r2dbc:postgres://localhost:5432/testnav-identpool-local
     username: testnav-identpool-local
-    password: ${sm\://testnav-identpool-local}
+    password: ${sm@testnav-identpool-local}
 
 consumers:
   tps-messaging-service:
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   cloud:
     vault:
       enabled: false
diff --git a/apps/tps-messaging-frontend/src/main/resources/application-local.yml b/apps/tps-messaging-frontend/src/main/resources/application-local.yml
@@ -5,7 +5,7 @@ server:
 
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   tps-messaging-service:
diff --git a/apps/tps-messaging-service/src/main/resources/application-local.yml b/apps/tps-messaging-service/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 config:
   mq:
diff --git a/apps/udi-stub/src/main/resources/application-local.yml b/apps/udi-stub/src/main/resources/application-local.yml
diff --git a/apps/varslinger-service/src/main/resources/application-local.yml b/apps/varslinger-service/src/main/resources/application-local.yml
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/ereg/v1/NAVSpesifikkInformasjon.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/ereg/v1/NAVSpesifikkInformasjon.java
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/jackson/v1/CaseInsensitiveEnumDeserializer.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/jackson/v1/CaseInsensitiveEnumDeserializer.java
diff --git a/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
diff --git a/libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java b/libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java
diff --git a/proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml b/proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml
diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml b/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml
diff --git a/proxies/arbeidssoekerregisteret-proxy/src/main/resources/application-local.yml b/proxies/arbeidssoekerregisteret-proxy/src/main/resources/application-local.yml
diff --git a/proxies/brregstub-reverse-proxy/src/main/resources/application-local.yml b/proxies/brregstub-reverse-proxy/src/main/resources/application-local.yml
diff --git a/proxies/dolly-proxy/src/main/resources/application-local.yml b/proxies/dolly-proxy/src/main/resources/application-local.yml
diff --git a/proxies/nom-proxy/src/main/resources/application-local.yml b/proxies/nom-proxy/src/main/resources/application-local.yml
diff --git a/proxies/pdl-proxy/src/main/resources/application-local.yml b/proxies/pdl-proxy/src/main/resources/application-local.yml
diff --git a/proxies/sykemelding-proxy/src/main/resources/application-local.yml b/proxies/sykemelding-proxy/src/main/resources/application-local.yml
diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml b/proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml
diff --git a/proxies/texas-proxy/src/main/resources/application-local.yml b/proxies/texas-proxy/src/main/resources/application-local.yml
diff --git a/proxies/yrkesskade-proxy/src/main/resources/application-local.yml b/proxies/yrkesskade-proxy/src/main/resources/application-local.yml
