Alt kompilerer ...

apps/dolly-backend/README.md

@@ -44,5 +44,5 @@ TESTCONTAINERS_RYUK_DISABLED=true
 For å kjøre lokalt med elastic search:
 
 ```
-docker run -d --name es762 -p 9200:9200 -e "discovery.type=single-node" elasticsearch:7.6.2 
+docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" -e "plugins.security.disabled=true" --name opensearch-node -d opensearchproject/opensearch:latest
 ```

apps/dolly-backend/build.gradle

@@ -73,6 +73,7 @@ dependencies {
     implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:database'
     implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation 'no.nav.testnav.libs:data-transfer-search-objects'
     implementation 'no.nav.testnav.libs:reactive-core'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
@@ -109,14 +110,18 @@ dependencies {
     implementation 'org.apache.poi:poi-ooxml:5.2.3'
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testImplementation 'org.opensearch:opensearch-testcontainers:2.0.0'
+    testImplementation 'org.springframework.boot:spring-boot-testcontainers'
+    testImplementation 'org.testcontainers:elasticsearch'
+
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'com.h2database:h2'
     testImplementation 'io.projectreactor:reactor-test:3.5.3'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.bitbucket.b_c:jose4j:0.9.3'
-    testImplementation 'org.opensearch.client:spring-data-opensearch-test-autoconfigure:1.2.0'
+
     implementation 'net.java.dev.jna:jna:5.13.0'
 
     implementation 'org.projectlombok:lombok'

apps/dolly-backend/settings.gradle

@@ -11,6 +11,7 @@ includeBuild '../../libs/servlet-insecure-security'
 includeBuild '../../libs/security-core'
 includeBuild '../../libs/database'
 includeBuild '../../libs/data-transfer-objects'
+includeBuild '../../libs/data-transfer-search-objects'
 includeBuild '../../.github/workflows'
 
 gradleEnterprise {

apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java

@@ -1,15 +1,13 @@
 package no.nav.dolly;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
 
-@Slf4j
 @SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class})
 public class DollyBackendApplicationStarter {
     public static void main(String[] args) {
 
         SpringApplication.run(DollyBackendApplicationStarter.class, args);
     }
-}
+}

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/ArbeidsplassenCVClient.java

@@ -12,7 +12,7 @@
 import no.nav.dolly.errorhandling.ErrorStatusDecoder;
 import no.nav.dolly.util.CallIdUtil;
 import no.nav.dolly.util.TransactionHelperService;
-import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
+import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/dto/PAMCVDTO.java

@@ -6,7 +6,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
+import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
 
 import java.time.ZonedDateTime;
 import java.util.ArrayList;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/mapper/ArbeidsplassenCVRequestMappingStrategy.java

@@ -7,7 +7,7 @@
 import no.nav.dolly.bestilling.arbeidsplassencv.dto.PAMCVDTO;
 import no.nav.dolly.exceptions.DollyFunctionalException;
 import no.nav.dolly.mapper.MappingStrategy;
-import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
+import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ReflectionUtils;
 

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterClient.java

@@ -11,9 +11,9 @@
 import no.nav.dolly.domain.resultset.dolly.DollyPerson;
 import no.nav.dolly.errorhandling.ErrorStatusDecoder;
 import no.nav.dolly.util.TransactionHelperService;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumer.java

@@ -8,10 +8,10 @@
 import no.nav.dolly.bestilling.kontoregisterservice.command.KontoregisterPostCommand;
 import no.nav.dolly.config.credentials.KontoregisterConsumerProperties;
 import no.nav.dolly.metrics.Timed;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoRequestDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoResponseDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoregisterResponseDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.HentKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.HentKontoResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.KontoregisterResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterDeleteCommand.java

@@ -2,8 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoregisterResponseDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.SlettKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.KontoregisterResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.SlettKontoRequestDTO;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.client.WebClient;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterGetCommand.java

@@ -2,9 +2,9 @@
 
 import lombok.RequiredArgsConstructor;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoRequestDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoResponseDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.HentKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.HentKontoResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.KontoDTO;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterPostCommand.java

@@ -2,8 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoregisterResponseDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.KontoregisterResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrNorskMappingStrategy.java

@@ -5,8 +5,8 @@
 import ma.glasnost.orika.MappingContext;
 import no.nav.dolly.bestilling.kontoregisterservice.util.BankkontoGenerator;
 import no.nav.dolly.mapper.MappingStrategy;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.stereotype.Component;
 

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrUtlandskMappingStrategy.java

@@ -6,9 +6,9 @@
 import no.nav.dolly.bestilling.kontoregisterservice.util.BankkontoGenerator;
 import no.nav.dolly.bestilling.kontoregisterservice.util.KontoregisterLandkode;
 import no.nav.dolly.mapper.MappingStrategy;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.UtenlandskKontoDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.UtenlandskKontoDTO;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/PdlDataConsumer.java

@@ -16,10 +16,10 @@
 import no.nav.dolly.config.credentials.PdlDataForvalterProperties;
 import no.nav.dolly.metrics.Timed;
 import no.nav.dolly.util.JacksonExchangeStrategyUtil;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.AvailibilityResponseDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.AvailibilityResponseDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO;
 import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.stereotype.Service;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataCheckIdentCommand.java

@@ -4,7 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.AvailibilityResponseDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.AvailibilityResponseDTO;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataHentCommand.java

@@ -4,7 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOppdateringCommand.java

@@ -5,7 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.pdldata.dto.PdlResponse;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOpprettingCommand.java

@@ -5,7 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.pdldata.dto.PdlResponse;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java

@@ -34,10 +34,10 @@
 import no.nav.dolly.service.TransaksjonMappingService;
 import no.nav.dolly.util.IdentTypeUtil;
 import no.nav.dolly.util.TransactionHelperService;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/domain/PensjonSivilstandWrapper.java

@@ -4,7 +4,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO;
 
 import java.util.ArrayList;
 import java.util.List;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonSamboerMappingStrategy.java

@@ -6,7 +6,7 @@
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonSamboerRequest;
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonSivilstandWrapper;
 import no.nav.dolly.mapper.MappingStrategy;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/personservice/PersonServiceClient.java

@@ -15,7 +15,7 @@
 import no.nav.dolly.errorhandling.ErrorStatusDecoder;
 import no.nav.dolly.exceptions.DollyFunctionalException;
 import no.nav.dolly.util.TransactionHelperService;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.util.StringUtil;
 import org.springframework.stereotype.Service;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/LeggTilPaaGruppeService.java

@@ -21,7 +21,7 @@
 import no.nav.dolly.util.ThreadLocalContextLifter;
 import no.nav.dolly.util.TransactionHelperService;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.MDC;
 import org.springframework.scheduling.annotation.Async;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OppdaterPersonService.java

@@ -20,7 +20,7 @@
 import no.nav.dolly.service.IdentService;
 import no.nav.dolly.util.TransactionHelperService;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.MDC;
 import org.springframework.scheduling.annotation.Async;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OriginatorUtility.java

@@ -12,7 +12,7 @@
 import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling;
 import no.nav.dolly.domain.resultset.pdldata.PdlPersondata;
 import no.nav.dolly.mapper.MappingContextUtils;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/mapper/SykemeldingMappingStrategy.java

@@ -14,7 +14,7 @@
 import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding;
 import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding.RsDetaljertSykemelding;
 import no.nav.dolly.mapper.MappingStrategy;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.BostedadresseDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tagshendelseslager/TagsHendelseslagerClient.java

@@ -14,9 +14,9 @@
 import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling;
 import no.nav.dolly.domain.resultset.Tags;
 import no.nav.dolly.domain.resultset.dolly.DollyPerson;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.ForeldreansvarDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.ForeldreansvarDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.KontaktinformasjonForDoedsboDTO;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingClient.java

@@ -13,10 +13,10 @@
 import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling;
 import no.nav.dolly.domain.resultset.dolly.DollyPerson;
 import no.nav.dolly.util.TransactionHelperService;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.SikkerhetstiltakDTO;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SpraakDTO;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TelefonTypeNummerDTO;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.SikkerhetstiltakDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java

@@ -12,11 +12,11 @@
 import no.nav.dolly.bestilling.tpsmessagingservice.command.TpsMessagingPostCommand;
 import no.nav.dolly.config.credentials.TpsMessagingServiceProperties;
 import no.nav.dolly.metrics.Timed;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonMiljoeDTO;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.SpraakDTO;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/EgenansattDeleteCommand.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/EgenansattPostCommand.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.client.WebClient;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.PersonMiljoeDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/SikkerhetstiltakDeleteCommand.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/TelefonnummerDeleteCommand.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.tpsmessagingservice.v1.TpsMeldingResponseDTO;
+import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;