Merge branch 'master' into feature/synt_dagpenger

Author: rfc3092

apps/adresse-service/src/main/resources/application-local.yml

@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   security:
     oauth2:
       resourceserver:

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}

apps/api-oversikt-service/src/main/resources/application-local.yml

@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
   security:
     oauth2:
       resourceserver:

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

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

apps/batch-bestilling-service/src/main/resources/application-local.yml

@@ -1,6 +1,6 @@
 spring:
   config:
-    import: "sm://"
+    import: "sm@"
 
 consumers:
   dolly-backend:

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

apps/budpro-service/src/main/resources/application-local.yml

@@ -7,4 +7,4 @@ dolly:
 
 spring:
   config:
-    import: "sm://"
+    import: "sm@"

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/mapper/DokarkivMappingStrategy.java

@@ -30,7 +30,6 @@ public class DokarkivMappingStrategy implements MappingStrategy {
     private static final String KANAL = "SKAN_IM";
     private static final String PDFA = "PDFA";
     private static final String ARKIV = "ARKIV";
-    private static final String MASKINELL_ENHET = "9999";
 
     @Override
     public void register(MapperFactory factory) {
@@ -44,7 +43,7 @@ public void mapAtoB(RsDokarkiv rsDokarkiv, DokarkivRequest dokarkivRequest, Mapp
 
                         dokarkivRequest.setEksternReferanseId(UUID.randomUUID().toString());
                         dokarkivRequest.setTittel(rsDokarkiv.getTittel());
-                        dokarkivRequest.setJournalfoerendeEnhet(isBlank(rsDokarkiv.getJournalfoerendeEnhet()) ? MASKINELL_ENHET : rsDokarkiv.getJournalfoerendeEnhet());
+                        dokarkivRequest.setJournalfoerendeEnhet(isBlank(rsDokarkiv.getJournalfoerendeEnhet()) ? null : rsDokarkiv.getJournalfoerendeEnhet());
                         dokarkivRequest.setTema(rsDokarkiv.getTema());
 
                         dokarkivRequest.setKanal(isBlank(rsDokarkiv.getKanal()) ? KANAL : rsDokarkiv.getKanal());

apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/SystemTyper.java

@@ -24,7 +24,7 @@ public enum SystemTyper {
     INNTK("Inntektstub (INNTK)"),
     INNTKMELD("Inntektsmelding (ALTINN/JOARK)"),
     INST2("Institusjonsopphold (INST2)"),
-    KELVIN_AAP("AAP-ytelse"),
+    KELVIN_AAP("Kelvin AAP-ytelse"),
     KONTOREGISTER("Bankkontoregister"),
     KRRSTUB("Digital kontaktinformasjon (DKIF)"),
     MEDL("Medlemskap (MEDL)"),