From b7f9d21b54d51bf73ea8da4faf0fa1c9043421fb Mon Sep 17 00:00:00 2001 From: stigus Date: Mon, 10 Jun 2024 14:58:59 +0200 Subject: [PATCH] Fjernet inntektsmelding-generator controller v1, da den ikke er i bruk noe sted og refaktorering blir tidkrevende #deploy-inntektsmelding-generator-service --- .../README.md | 22 ++++++- .../build.gradle | 1 + .../provider/InntektsmeldingController.java | 59 ----------------- ...ktsmeldingGeneratorApplicationStarter.java | 2 +- .../MeldingsType.java | 2 +- .../binding}/Arbeidsforhold.java | 2 +- .../binding}/Arbeidsgiver.java | 2 +- .../binding}/ArbeidsgiverPrivat.java | 2 +- .../binding}/ArbeidsgiverperiodeListe.java | 2 +- .../binding}/Avsendersystem.java | 2 +- .../binding}/AvtaltFerieListe.java | 2 +- .../binding}/DelvisFravaer.java | 2 +- .../binding}/DelvisFravaersListe.java | 2 +- .../binding}/EndringIRefusjon.java | 2 +- .../binding}/EndringIRefusjonsListe.java | 2 +- .../binding}/FravaersPeriodeListe.java | 2 +- .../GjenopptakelseNaturalytelseListe.java | 2 +- .../binding}/GraderingIForeldrepenger.java | 2 +- .../GraderingIForeldrepengerListe.java | 2 +- .../binding}/Inntekt.java | 2 +- .../binding}/InntektsmeldingM.java | 2 +- .../binding}/Kontaktinformasjon.java | 2 +- .../binding}/NaturalytelseDetaljer.java | 2 +- .../binding}/Omsorgspenger.java | 2 +- .../binding}/OpphoerAvNaturalytelseListe.java | 2 +- .../binding}/Periode.java | 2 +- .../binding}/PleiepengerPeriodeListe.java | 2 +- .../binding}/Refusjon.java | 2 +- .../binding}/Skjemainnhold.java | 2 +- .../SykepengerIArbeidsgiverperioden.java | 2 +- .../binding}/UtsettelseAvForeldrepenger.java | 2 +- .../UtsettelseAvForeldrepengerListe.java | 2 +- .../config/AppConfig.java | 2 +- .../config/DevConfig.java | 2 +- .../config/OpenApiConfig.java | 2 +- .../config/SecurityConfig.java | 2 +- .../exception/JaxbToXmlException.java | 2 +- .../mapper/LocalDateCustomMapping.java | 2 +- .../mapper/MapperFacadeConfig.java | 2 +- .../mapper/MappingContextUtils.java | 2 +- .../mapper/MappingStrategy.java | 2 +- .../provider/Melding.java | 6 +- .../adapter/LocalDateTimeXmlAdapter.java | 2 +- .../adapter/LocalDateXmlAdapter.java | 2 +- .../provider}/adapter/ObjectFactory.java | 57 ++++++++--------- .../provider/dto}/ArbeidsforholdDTO.java | 12 ++-- .../provider/dto}/ArbeidsgiverDTO.java | 6 +- .../provider/dto}/ArbeidsgiverPrivatDTO.java | 6 +- .../provider/dto}/AvsendersystemDTO.java | 6 +- .../provider/dto}/DelvisFravearDTO.java | 6 +- .../provider/dto}/EndringIRefusjonDTO.java | 6 +- .../dto}/GraderingIForeldrepengerDTO.java | 6 +- .../provider/dto}/InntektDTO.java | 6 +- .../provider/dto}/InntektsmeldingDTO.java | 14 ++-- .../provider/dto}/KontaktinformasjonDTO.java | 6 +- .../dto}/NaturalYtelseDetaljerDTO.java | 6 +- .../provider/dto}/OmsorgspenegerDTO.java | 10 +-- .../provider/dto}/PeriodeDTO.java | 6 +- .../provider/dto}/RefusjonDTO.java | 8 +-- .../SykepengerIArbeidsgiverperiodenDTO.java | 8 +-- .../provider/dto}/ToXmlElement.java | 2 +- .../dto}/UtsettelseAvForeldrepengerDTO.java | 6 +- .../v2/InntektsmeldingV2Controller.java | 8 +-- .../validation/ValidationException.java | 2 +- .../validation/XML201809Validator.java | 2 +- .../util/XmlConverter.java | 8 +-- .../util/XmlInntektsmelding201812.java | 64 +++++++++---------- .../ApplicationContextTest.java | 2 +- .../v2/InntektsmeldingV2ControllerTest.java | 2 +- .../v1/rs/RsArbeidsforhold.java | 4 ++ 70 files changed, 200 insertions(+), 237 deletions(-) delete mode 100644 apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/InntektsmeldingController.java rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/InntektsmeldingGeneratorApplicationStarter.java (87%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/MeldingsType.java (53%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/Arbeidsforhold.java (97%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/Arbeidsgiver.java (95%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/ArbeidsgiverPrivat.java (95%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/ArbeidsgiverperiodeListe.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/Avsendersystem.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/AvtaltFerieListe.java (95%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/DelvisFravaer.java (95%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/DelvisFravaersListe.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/EndringIRefusjon.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/EndringIRefusjonsListe.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/FravaersPeriodeListe.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/GjenopptakelseNaturalytelseListe.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/GraderingIForeldrepenger.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/GraderingIForeldrepengerListe.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/Inntekt.java (95%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/InntektsmeldingM.java (95%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/Kontaktinformasjon.java (95%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/NaturalytelseDetaljer.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/Omsorgspenger.java (97%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/OpphoerAvNaturalytelseListe.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/Periode.java (95%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/PleiepengerPeriodeListe.java (95%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/Refusjon.java (97%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/Skjemainnhold.java (99%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/SykepengerIArbeidsgiverperioden.java (97%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/UtsettelseAvForeldrepenger.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/xml => testnav/inntektsmeldinggeneratorservice/binding}/UtsettelseAvForeldrepengerListe.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/config/AppConfig.java (90%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/config/DevConfig.java (95%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/config/OpenApiConfig.java (97%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/config/SecurityConfig.java (96%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/exception/JaxbToXmlException.java (71%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/mapper/LocalDateCustomMapping.java (92%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/mapper/MapperFacadeConfig.java (94%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/mapper/MappingContextUtils.java (97%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/mapper/MappingStrategy.java (87%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/provider/Melding.java (75%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211 => testnav/inntektsmeldinggeneratorservice/provider}/adapter/LocalDateTimeXmlAdapter.java (88%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211 => testnav/inntektsmeldinggeneratorservice/provider}/adapter/LocalDateXmlAdapter.java (87%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211 => testnav/inntektsmeldinggeneratorservice/provider}/adapter/ObjectFactory.java (91%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/ArbeidsforholdDTO.java (85%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/ArbeidsgiverDTO.java (78%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/ArbeidsgiverPrivatDTO.java (79%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/AvsendersystemDTO.java (79%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/DelvisFravearDTO.java (80%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/EndringIRefusjonDTO.java (82%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/GraderingIForeldrepengerDTO.java (83%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/InntektDTO.java (82%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/InntektsmeldingDTO.java (90%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/KontaktinformasjonDTO.java (77%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/NaturalYtelseDetaljerDTO.java (87%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/OmsorgspenegerDTO.java (79%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/PeriodeDTO.java (78%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/RefusjonDTO.java (82%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/SykepengerIArbeidsgiverperiodenDTO.java (87%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/ToXmlElement.java (52%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211/dto/v1 => testnav/inntektsmeldinggeneratorservice/provider/dto}/UtsettelseAvForeldrepengerDTO.java (83%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211 => testnav/inntektsmeldinggeneratorservice}/provider/v2/InntektsmeldingV2Controller.java (84%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/provider/validation/ValidationException.java (75%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/provider/validation/XML201809Validator.java (91%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/util/XmlConverter.java (89%) rename apps/inntektsmelding-generator-service/src/main/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/util/XmlInntektsmelding201812.java (86%) rename apps/inntektsmelding-generator-service/src/test/java/no/nav/{registre => testnav}/inntektsmeldinggeneratorservice/ApplicationContextTest.java (91%) rename apps/inntektsmelding-generator-service/src/test/java/no/nav/{registre/inntektsmeldinggeneratorservice/v20181211 => testnav/inntektsmeldinggeneratorservice}/provider/v2/InntektsmeldingV2ControllerTest.java (96%) diff --git a/apps/inntektsmelding-generator-service/README.md b/apps/inntektsmelding-generator-service/README.md index 8c16f38ad20..bbfb749009b 100644 --- a/apps/inntektsmelding-generator-service/README.md +++ b/apps/inntektsmelding-generator-service/README.md @@ -1,21 +1,39 @@ # Inntektsmelding generator -Microservice for å mappe inntektsmeldinger i JSON format til XML format basert på [kodeverk](https://github.com/navikt/tjenestespesifikasjoner/blob/master/nav-altinn-inntektsmelding/src/main/xsd/). +Microservice for å mappe inntektsmeldinger i JSON format til XML format basert +på [kodeverk](https://github.com/navikt/tjenestespesifikasjoner/blob/master/nav-altinn-inntektsmelding/src/main/xsd/). Foreløpig er bare 201812 format støttet. +Dette utdaterte biblioteket er brukt for å generere XML, men har blitt manuelt portet til jakarta for å støtte nyere +versjon av rammeverk: + +``` + implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.09.25-00.21-49b69f0625e0' +``` + ## Swagger -Swagger finnes under [/swagger](https://testnav-inntektsmelding-generator-service.intern.dev.nav.no/swagger) -endepunktet til applikasjonen. + +Swagger finnes under [/swagger](https://testnav-inntektsmelding-generator-service.intern.dev.nav.no/swagger) +-endepunktet til applikasjonen. ## Lokal kjøring + Ha naisdevice kjørende og kjør InntektsmeldingGeneratorApplicationStarter med følgende argumenter: + ``` + -Dspring.cloud.vault.token=[Copy token fra Vault] -Dspring.profiles.active=dev + ``` ### Utviklerimage + I utviklerimage brukes ikke naisdevice og du må legge til følgende ekstra argumenter: + ``` + -Djavax.net.ssl.trustStore=[path til lokal truststore] -Djavax.net.ssl.trustStorePassword=[passord til lokal truststore] + ``` diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 3c28dc88d5b..dda73849c21 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -67,6 +67,7 @@ dependencies { implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0' implementation 'org.apache.commons:commons-text:1.11.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/InntektsmeldingController.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/InntektsmeldingController.java deleted file mode 100644 index 23ab126fa86..00000000000 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/InntektsmeldingController.java +++ /dev/null @@ -1,59 +0,0 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.provider; - -import io.swagger.v3.core.util.Json; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Marshaller; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import no.nav.registre.inntektsmeldinggeneratorservice.exception.JaxbToXmlException; -import no.nav.registre.inntektsmeldinggeneratorservice.util.XmlInntektsmelding201812; -import no.nav.testnav.libs.dto.inntektsmeldinggeneratorservice.v1.rs.RsInntektsmelding; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.io.StringWriter; - -@RestController -@RequestMapping("/api/v1/inntektsmelding") -@RequiredArgsConstructor -@Slf4j -public class InntektsmeldingController { - - @PostMapping(value = "/map/2018/12", consumes = "application/json", produces = "application/xml") - public String mapInntektsmelding201812( - @RequestBody RsInntektsmelding melding - ) { - - return jaxbObjectToXML(XmlInntektsmelding201812.createInntektsmelding(melding)); - } - - private static String jaxbObjectToXML(Melding inntektsmelding) { - log.info("Konverterter inntektsmelding til xml: {}", Json.pretty(inntektsmelding)); - try { - //Create JAXB Context - JAXBContext jaxbContext = JAXBContext.newInstance(Melding.class); - - //Create Marshaller - Marshaller jaxbMarshaller = jaxbContext.createMarshaller(); - - //Required formatting?? - jaxbMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); - - //Print XML String to Console - StringWriter sw = new StringWriter(); - - //Write XML to StringWriter - jaxbMarshaller.marshal(inntektsmelding, sw); - - log.info("Generert xml: {}", sw); - //Return XML Content - return sw.toString(); - } catch (JAXBException e) { - throw new JaxbToXmlException("Klarte ikke å konvertere inntektsmelding til XML", e); - } - } - -} diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/InntektsmeldingGeneratorApplicationStarter.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/InntektsmeldingGeneratorApplicationStarter.java similarity index 87% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/InntektsmeldingGeneratorApplicationStarter.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/InntektsmeldingGeneratorApplicationStarter.java index 5f642d44188..67212dfa58f 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/InntektsmeldingGeneratorApplicationStarter.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/InntektsmeldingGeneratorApplicationStarter.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice; +package no.nav.testnav.inntektsmeldinggeneratorservice; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/MeldingsType.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/MeldingsType.java similarity index 53% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/MeldingsType.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/MeldingsType.java index d9c19012e40..ae034066ebb 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/MeldingsType.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/MeldingsType.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice; +package no.nav.testnav.inntektsmeldinggeneratorservice; public enum MeldingsType { TYPE_2018_09, diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Arbeidsforhold.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Arbeidsforhold.java similarity index 97% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Arbeidsforhold.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Arbeidsforhold.java index 860197b2171..61eed317d6d 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Arbeidsforhold.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Arbeidsforhold.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Arbeidsgiver.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Arbeidsgiver.java similarity index 95% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Arbeidsgiver.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Arbeidsgiver.java index 822be442b24..6a2eb8830c9 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Arbeidsgiver.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Arbeidsgiver.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/ArbeidsgiverPrivat.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/ArbeidsgiverPrivat.java similarity index 95% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/ArbeidsgiverPrivat.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/ArbeidsgiverPrivat.java index 69863c69f7c..66b9678437e 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/ArbeidsgiverPrivat.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/ArbeidsgiverPrivat.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/ArbeidsgiverperiodeListe.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/ArbeidsgiverperiodeListe.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/ArbeidsgiverperiodeListe.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/ArbeidsgiverperiodeListe.java index f75a8a6b420..a2c1b5a62da 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/ArbeidsgiverperiodeListe.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/ArbeidsgiverperiodeListe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Avsendersystem.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Avsendersystem.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Avsendersystem.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Avsendersystem.java index 4b6e6215117..2e2e9acd3fa 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Avsendersystem.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Avsendersystem.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/AvtaltFerieListe.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/AvtaltFerieListe.java similarity index 95% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/AvtaltFerieListe.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/AvtaltFerieListe.java index 297ff4cd219..89c604d38b8 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/AvtaltFerieListe.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/AvtaltFerieListe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/DelvisFravaer.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/DelvisFravaer.java similarity index 95% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/DelvisFravaer.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/DelvisFravaer.java index 06dbe884a31..ffc09bc2900 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/DelvisFravaer.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/DelvisFravaer.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/DelvisFravaersListe.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/DelvisFravaersListe.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/DelvisFravaersListe.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/DelvisFravaersListe.java index 4c856734ed8..22525565c75 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/DelvisFravaersListe.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/DelvisFravaersListe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/EndringIRefusjon.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/EndringIRefusjon.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/EndringIRefusjon.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/EndringIRefusjon.java index b6f0175c40f..fda835ca25d 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/EndringIRefusjon.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/EndringIRefusjon.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/EndringIRefusjonsListe.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/EndringIRefusjonsListe.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/EndringIRefusjonsListe.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/EndringIRefusjonsListe.java index 5754f17ac51..38c1fbe90da 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/EndringIRefusjonsListe.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/EndringIRefusjonsListe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/FravaersPeriodeListe.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/FravaersPeriodeListe.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/FravaersPeriodeListe.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/FravaersPeriodeListe.java index a9ae2910253..74019dcb29d 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/FravaersPeriodeListe.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/FravaersPeriodeListe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/GjenopptakelseNaturalytelseListe.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/GjenopptakelseNaturalytelseListe.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/GjenopptakelseNaturalytelseListe.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/GjenopptakelseNaturalytelseListe.java index 06a63d6d849..32b38cc9401 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/GjenopptakelseNaturalytelseListe.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/GjenopptakelseNaturalytelseListe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/GraderingIForeldrepenger.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/GraderingIForeldrepenger.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/GraderingIForeldrepenger.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/GraderingIForeldrepenger.java index ea382f42eaf..3c9d0bac4a4 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/GraderingIForeldrepenger.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/GraderingIForeldrepenger.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/GraderingIForeldrepengerListe.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/GraderingIForeldrepengerListe.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/GraderingIForeldrepengerListe.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/GraderingIForeldrepengerListe.java index 9ee590fdb34..6dfe07a026b 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/GraderingIForeldrepengerListe.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/GraderingIForeldrepengerListe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Inntekt.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Inntekt.java similarity index 95% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Inntekt.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Inntekt.java index 795f31d1e93..8c02229b2fa 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Inntekt.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Inntekt.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/InntektsmeldingM.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/InntektsmeldingM.java similarity index 95% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/InntektsmeldingM.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/InntektsmeldingM.java index 094c88b35f6..5004677c91b 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/InntektsmeldingM.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/InntektsmeldingM.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Kontaktinformasjon.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Kontaktinformasjon.java similarity index 95% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Kontaktinformasjon.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Kontaktinformasjon.java index 53372bb814e..34e8ceae07e 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Kontaktinformasjon.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Kontaktinformasjon.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/NaturalytelseDetaljer.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/NaturalytelseDetaljer.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/NaturalytelseDetaljer.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/NaturalytelseDetaljer.java index 35b47e3519d..371b14c5e61 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/NaturalytelseDetaljer.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/NaturalytelseDetaljer.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Omsorgspenger.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Omsorgspenger.java similarity index 97% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Omsorgspenger.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Omsorgspenger.java index 595d6ba7556..46d2d0f2711 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Omsorgspenger.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Omsorgspenger.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/OpphoerAvNaturalytelseListe.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/OpphoerAvNaturalytelseListe.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/OpphoerAvNaturalytelseListe.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/OpphoerAvNaturalytelseListe.java index ebb9ab54177..f8cb26f6d64 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/OpphoerAvNaturalytelseListe.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/OpphoerAvNaturalytelseListe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Periode.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Periode.java similarity index 95% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Periode.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Periode.java index 726429ef28b..1b2421244d9 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Periode.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Periode.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/PleiepengerPeriodeListe.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/PleiepengerPeriodeListe.java similarity index 95% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/PleiepengerPeriodeListe.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/PleiepengerPeriodeListe.java index 3d62fe155fb..5de64116024 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/PleiepengerPeriodeListe.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/PleiepengerPeriodeListe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Refusjon.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Refusjon.java similarity index 97% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Refusjon.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Refusjon.java index b2c2c912b42..2c88c9a37d5 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Refusjon.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Refusjon.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Skjemainnhold.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Skjemainnhold.java similarity index 99% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Skjemainnhold.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Skjemainnhold.java index 30c820794a9..bb5c79d328e 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/Skjemainnhold.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/Skjemainnhold.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/SykepengerIArbeidsgiverperioden.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/SykepengerIArbeidsgiverperioden.java similarity index 97% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/SykepengerIArbeidsgiverperioden.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/SykepengerIArbeidsgiverperioden.java index 737e5cc9050..b8d37729f76 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/SykepengerIArbeidsgiverperioden.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/SykepengerIArbeidsgiverperioden.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/UtsettelseAvForeldrepenger.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/UtsettelseAvForeldrepenger.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/UtsettelseAvForeldrepenger.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/UtsettelseAvForeldrepenger.java index 97913e9d247..320097249e0 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/UtsettelseAvForeldrepenger.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/UtsettelseAvForeldrepenger.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/UtsettelseAvForeldrepengerListe.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/UtsettelseAvForeldrepengerListe.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/UtsettelseAvForeldrepengerListe.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/UtsettelseAvForeldrepengerListe.java index 65e30cad5c6..33c7fa5c987 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/xml/UtsettelseAvForeldrepengerListe.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/binding/UtsettelseAvForeldrepengerListe.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.xml; +package no.nav.testnav.inntektsmeldinggeneratorservice.binding; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/AppConfig.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/AppConfig.java similarity index 90% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/AppConfig.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/AppConfig.java index 963f0c1d5cf..dfaf45bdbf3 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/AppConfig.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/AppConfig.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.config; +package no.nav.testnav.inntektsmeldinggeneratorservice.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/DevConfig.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/DevConfig.java similarity index 95% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/DevConfig.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/DevConfig.java index 0aa8a63221a..63cd14425e4 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/DevConfig.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/DevConfig.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.config; +package no.nav.testnav.inntektsmeldinggeneratorservice.config; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/OpenApiConfig.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/OpenApiConfig.java similarity index 97% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/OpenApiConfig.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/OpenApiConfig.java index 12774f4102d..e71c95ace11 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/OpenApiConfig.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/OpenApiConfig.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.config; +package no.nav.testnav.inntektsmeldinggeneratorservice.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/SecurityConfig.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/SecurityConfig.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/SecurityConfig.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/SecurityConfig.java index 741ed3d5b58..b5aca612346 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/SecurityConfig.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.config; +package no.nav.testnav.inntektsmeldinggeneratorservice.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/exception/JaxbToXmlException.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/exception/JaxbToXmlException.java similarity index 71% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/exception/JaxbToXmlException.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/exception/JaxbToXmlException.java index b882cbf4cf8..92d376d97e4 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/exception/JaxbToXmlException.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/exception/JaxbToXmlException.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.exception; +package no.nav.testnav.inntektsmeldinggeneratorservice.exception; public class JaxbToXmlException extends RuntimeException { diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/LocalDateCustomMapping.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/LocalDateCustomMapping.java similarity index 92% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/LocalDateCustomMapping.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/LocalDateCustomMapping.java index 0961f87743e..52e8df0c843 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/LocalDateCustomMapping.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/LocalDateCustomMapping.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.mapper; +package no.nav.testnav.inntektsmeldinggeneratorservice.mapper; import lombok.extern.slf4j.Slf4j; import ma.glasnost.orika.MappingContext; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/MapperFacadeConfig.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/MapperFacadeConfig.java similarity index 94% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/MapperFacadeConfig.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/MapperFacadeConfig.java index e319e91403d..94a77dd5135 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/MapperFacadeConfig.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/MapperFacadeConfig.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.mapper; +package no.nav.testnav.inntektsmeldinggeneratorservice.mapper; import ma.glasnost.orika.CustomConverter; import ma.glasnost.orika.MapperFacade; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/MappingContextUtils.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/MappingContextUtils.java similarity index 97% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/MappingContextUtils.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/MappingContextUtils.java index 69ed01b2499..07405388242 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/MappingContextUtils.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/MappingContextUtils.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.mapper; +package no.nav.testnav.inntektsmeldinggeneratorservice.mapper; import lombok.experimental.UtilityClass; import ma.glasnost.orika.MappingContext; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/MappingStrategy.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/MappingStrategy.java similarity index 87% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/MappingStrategy.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/MappingStrategy.java index c25e31d383b..e6d8c0613cb 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/mapper/MappingStrategy.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/mapper/MappingStrategy.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.mapper; +package no.nav.testnav.inntektsmeldinggeneratorservice.mapper; import ma.glasnost.orika.MapperFactory; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/Melding.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/Melding.java similarity index 75% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/Melding.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/Melding.java index 0e7116380c9..8b5ec3c509a 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/Melding.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/Melding.java @@ -1,11 +1,11 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.provider; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSeeAlso; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.InntektsmeldingM; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Skjemainnhold; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.InntektsmeldingM; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Skjemainnhold; import javax.xml.namespace.QName; import java.time.LocalDate; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/adapter/LocalDateTimeXmlAdapter.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/adapter/LocalDateTimeXmlAdapter.java similarity index 88% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/adapter/LocalDateTimeXmlAdapter.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/adapter/LocalDateTimeXmlAdapter.java index f631ab49169..c00f2f51f52 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/adapter/LocalDateTimeXmlAdapter.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/adapter/LocalDateTimeXmlAdapter.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter; import jakarta.xml.bind.annotation.adapters.XmlAdapter; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/adapter/LocalDateXmlAdapter.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/adapter/LocalDateXmlAdapter.java similarity index 87% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/adapter/LocalDateXmlAdapter.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/adapter/LocalDateXmlAdapter.java index 0b0339cdeee..e0a41ddc65c 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/adapter/LocalDateXmlAdapter.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/adapter/LocalDateXmlAdapter.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter; import jakarta.xml.bind.annotation.adapters.XmlAdapter; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/adapter/ObjectFactory.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/adapter/ObjectFactory.java similarity index 91% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/adapter/ObjectFactory.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/adapter/ObjectFactory.java index 72ac6455601..37179162352 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/adapter/ObjectFactory.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/adapter/ObjectFactory.java @@ -3,39 +3,39 @@ // (powered by FernFlower decompiler) // -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlElementDecl; import jakarta.xml.bind.annotation.XmlRegistry; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Arbeidsforhold; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Arbeidsgiver; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.ArbeidsgiverPrivat; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.ArbeidsgiverperiodeListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Avsendersystem; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.AvtaltFerieListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.DelvisFravaer; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.DelvisFravaersListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.EndringIRefusjon; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.EndringIRefusjonsListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.FravaersPeriodeListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.GjenopptakelseNaturalytelseListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.GraderingIForeldrepenger; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.GraderingIForeldrepengerListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Inntekt; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.InntektsmeldingM; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Kontaktinformasjon; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.NaturalytelseDetaljer; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Omsorgspenger; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.OpphoerAvNaturalytelseListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Periode; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.PleiepengerPeriodeListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Refusjon; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Skjemainnhold; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.SykepengerIArbeidsgiverperioden; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.UtsettelseAvForeldrepenger; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.UtsettelseAvForeldrepengerListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Arbeidsforhold; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Arbeidsgiver; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.ArbeidsgiverPrivat; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.ArbeidsgiverperiodeListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Avsendersystem; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.AvtaltFerieListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.DelvisFravaer; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.DelvisFravaersListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.EndringIRefusjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.EndringIRefusjonsListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.FravaersPeriodeListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.GjenopptakelseNaturalytelseListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.GraderingIForeldrepenger; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.GraderingIForeldrepengerListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Inntekt; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.InntektsmeldingM; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Kontaktinformasjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.NaturalytelseDetaljer; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Omsorgspenger; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.OpphoerAvNaturalytelseListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Periode; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.PleiepengerPeriodeListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Refusjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Skjemainnhold; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.SykepengerIArbeidsgiverperioden; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.UtsettelseAvForeldrepenger; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.UtsettelseAvForeldrepengerListe; import javax.xml.namespace.QName; import java.math.BigDecimal; @@ -58,7 +58,6 @@ public class ObjectFactory { private static final QName _SkjemainnholdSykepengerIArbeidsgiverperioden_QNAME = new QName(NAMESPACE_URI, "sykepengerIArbeidsgiverperioden"); private static final QName _SkjemainnholdGjenopptakelseNaturalytelseListe_QNAME = new QName(NAMESPACE_URI, "gjenopptakelseNaturalytelseListe"); private static final QName _SkjemainnholdOmsorgspenger_QNAME = new QName(NAMESPACE_URI, "omsorgspenger"); - private static final QName _SkjemainnholdArbeidsgiver_QNAME = new QName(NAMESPACE_URI, "arbeidsgiver"); private static final QName _SkjemainnholdStartdatoForeldrepengeperiode_QNAME = new QName(NAMESPACE_URI, "startdatoForeldrepengeperiode"); private static final QName _SkjemainnholdOpphoerAvNaturalytelseListe_QNAME = new QName(NAMESPACE_URI, "opphoerAvNaturalytelseListe"); private static final QName _SkjemainnholdPleiepengerPerioder_QNAME = new QName(NAMESPACE_URI, "pleiepengerPerioder"); diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ArbeidsforholdDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ArbeidsforholdDTO.java similarity index 85% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ArbeidsforholdDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ArbeidsforholdDTO.java index c21c901943b..512e2003b4b 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ArbeidsforholdDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ArbeidsforholdDTO.java @@ -1,14 +1,14 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Arbeidsforhold; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.AvtaltFerieListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.GraderingIForeldrepengerListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.UtsettelseAvForeldrepengerListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Arbeidsforhold; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.AvtaltFerieListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.GraderingIForeldrepengerListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.UtsettelseAvForeldrepengerListe; import org.apache.logging.log4j.util.Strings; import java.time.LocalDate; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ArbeidsgiverDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ArbeidsgiverDTO.java similarity index 78% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ArbeidsgiverDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ArbeidsgiverDTO.java index 80ba856d4a3..49a6f97a151 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ArbeidsgiverDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ArbeidsgiverDTO.java @@ -1,11 +1,11 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Arbeidsgiver; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Arbeidsgiver; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; @Data diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ArbeidsgiverPrivatDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ArbeidsgiverPrivatDTO.java similarity index 79% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ArbeidsgiverPrivatDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ArbeidsgiverPrivatDTO.java index 769532c37e7..c59ddbbc277 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ArbeidsgiverPrivatDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ArbeidsgiverPrivatDTO.java @@ -1,11 +1,11 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.ArbeidsgiverPrivat; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.ArbeidsgiverPrivat; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; @Data @NoArgsConstructor(force = true) diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/AvsendersystemDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/AvsendersystemDTO.java similarity index 79% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/AvsendersystemDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/AvsendersystemDTO.java index ef1cf431b54..5dc3693cadd 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/AvsendersystemDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/AvsendersystemDTO.java @@ -1,10 +1,10 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Avsendersystem; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Avsendersystem; import java.time.LocalDateTime; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/DelvisFravearDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/DelvisFravearDTO.java similarity index 80% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/DelvisFravearDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/DelvisFravearDTO.java index 58e85f9fe19..b4879d78002 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/DelvisFravearDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/DelvisFravearDTO.java @@ -1,10 +1,10 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.DelvisFravaer; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.DelvisFravaer; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/EndringIRefusjonDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/EndringIRefusjonDTO.java similarity index 82% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/EndringIRefusjonDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/EndringIRefusjonDTO.java index 77e26c90697..63bcc8a8f81 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/EndringIRefusjonDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/EndringIRefusjonDTO.java @@ -1,10 +1,10 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.EndringIRefusjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.EndringIRefusjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/GraderingIForeldrepengerDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/GraderingIForeldrepengerDTO.java similarity index 83% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/GraderingIForeldrepengerDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/GraderingIForeldrepengerDTO.java index ea6f71d884b..b57b392acc1 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/GraderingIForeldrepengerDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/GraderingIForeldrepengerDTO.java @@ -1,10 +1,10 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.GraderingIForeldrepenger; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.GraderingIForeldrepenger; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; import java.math.BigInteger; import java.util.List; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/InntektDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/InntektDTO.java similarity index 82% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/InntektDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/InntektDTO.java index 99d0a2f2708..25a29a2f643 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/InntektDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/InntektDTO.java @@ -1,11 +1,11 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Inntekt; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Inntekt; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; import org.apache.commons.text.CaseUtils; import java.math.BigDecimal; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/InntektsmeldingDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/InntektsmeldingDTO.java similarity index 90% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/InntektsmeldingDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/InntektsmeldingDTO.java index 081b0aaae1d..d95d703bfe9 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/InntektsmeldingDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/InntektsmeldingDTO.java @@ -1,15 +1,15 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.xml.bind.JAXBElement; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.GjenopptakelseNaturalytelseListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.InntektsmeldingM; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.OpphoerAvNaturalytelseListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.PleiepengerPeriodeListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Skjemainnhold; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.GjenopptakelseNaturalytelseListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.OpphoerAvNaturalytelseListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Skjemainnhold; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.InntektsmeldingM; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.PleiepengerPeriodeListe; import org.apache.commons.text.CaseUtils; import java.time.LocalDate; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/KontaktinformasjonDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/KontaktinformasjonDTO.java similarity index 77% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/KontaktinformasjonDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/KontaktinformasjonDTO.java index 57694d5ebda..92c186c969d 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/KontaktinformasjonDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/KontaktinformasjonDTO.java @@ -1,11 +1,11 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Kontaktinformasjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Kontaktinformasjon; @Data @NoArgsConstructor(force = true) diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/NaturalYtelseDetaljerDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/NaturalYtelseDetaljerDTO.java similarity index 87% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/NaturalYtelseDetaljerDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/NaturalYtelseDetaljerDTO.java index 6bf05b36b76..298e4ec49cd 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/NaturalYtelseDetaljerDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/NaturalYtelseDetaljerDTO.java @@ -1,10 +1,10 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.NaturalytelseDetaljer; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.NaturalytelseDetaljer; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; import org.apache.commons.text.CaseUtils; import java.math.BigDecimal; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/OmsorgspenegerDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/OmsorgspenegerDTO.java similarity index 79% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/OmsorgspenegerDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/OmsorgspenegerDTO.java index b77394112c1..42b3930641b 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/OmsorgspenegerDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/OmsorgspenegerDTO.java @@ -1,12 +1,12 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.DelvisFravaersListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.FravaersPeriodeListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Omsorgspenger; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Omsorgspenger; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.DelvisFravaersListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.FravaersPeriodeListe; import java.util.List; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/PeriodeDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/PeriodeDTO.java similarity index 78% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/PeriodeDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/PeriodeDTO.java index 7d010d334ce..bf1602098c4 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/PeriodeDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/PeriodeDTO.java @@ -1,10 +1,10 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Periode; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Periode; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; import java.time.LocalDate; import java.util.List; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/RefusjonDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/RefusjonDTO.java similarity index 82% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/RefusjonDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/RefusjonDTO.java index 2fe6fc6cbfe..07e7c45deca 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/RefusjonDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/RefusjonDTO.java @@ -1,11 +1,11 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.EndringIRefusjonsListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Refusjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.EndringIRefusjonsListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Refusjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/SykepengerIArbeidsgiverperiodenDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/SykepengerIArbeidsgiverperiodenDTO.java similarity index 87% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/SykepengerIArbeidsgiverperiodenDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/SykepengerIArbeidsgiverperiodenDTO.java index 4084f4c4f67..a3b4bfad021 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/SykepengerIArbeidsgiverperiodenDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/SykepengerIArbeidsgiverperiodenDTO.java @@ -1,11 +1,11 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.ArbeidsgiverperiodeListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.SykepengerIArbeidsgiverperioden; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.ArbeidsgiverperiodeListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.SykepengerIArbeidsgiverperioden; import org.apache.commons.text.CaseUtils; import java.math.BigDecimal; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ToXmlElement.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ToXmlElement.java similarity index 52% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ToXmlElement.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ToXmlElement.java index 4955aa8281b..355d7c09c5b 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/ToXmlElement.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/ToXmlElement.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; @FunctionalInterface public interface ToXmlElement { diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/UtsettelseAvForeldrepengerDTO.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/UtsettelseAvForeldrepengerDTO.java similarity index 83% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/UtsettelseAvForeldrepengerDTO.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/UtsettelseAvForeldrepengerDTO.java index 42c88452b15..807bdbb284b 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/dto/v1/UtsettelseAvForeldrepengerDTO.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/dto/UtsettelseAvForeldrepengerDTO.java @@ -1,11 +1,11 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter.ObjectFactory; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.UtsettelseAvForeldrepenger; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter.ObjectFactory; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.UtsettelseAvForeldrepenger; import java.util.List; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/provider/v2/InntektsmeldingV2Controller.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/v2/InntektsmeldingV2Controller.java similarity index 84% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/provider/v2/InntektsmeldingV2Controller.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/v2/InntektsmeldingV2Controller.java index 444b33444da..2475593e4ad 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/provider/v2/InntektsmeldingV2Controller.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/v2/InntektsmeldingV2Controller.java @@ -1,13 +1,13 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.provider.v2; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.v2; import io.swagger.v3.core.util.Json; import jakarta.xml.bind.JAXBElement; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import ma.glasnost.orika.MapperFacade; -import no.nav.registre.inntektsmeldinggeneratorservice.util.XmlConverter; -import no.nav.registre.inntektsmeldinggeneratorservice.v20181211.dto.v1.InntektsmeldingDTO; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.InntektsmeldingM; +import no.nav.testnav.inntektsmeldinggeneratorservice.util.XmlConverter; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.dto.InntektsmeldingDTO; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.InntektsmeldingM; import no.nav.testnav.libs.dto.inntektsmeldinggeneratorservice.v1.rs.RsInntektsmelding; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/validation/ValidationException.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/validation/ValidationException.java similarity index 75% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/validation/ValidationException.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/validation/ValidationException.java index 06bbae540de..74a9b331fb0 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/validation/ValidationException.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/validation/ValidationException.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.provider.validation; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.validation; import lombok.Getter; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/validation/XML201809Validator.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/validation/XML201809Validator.java similarity index 91% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/validation/XML201809Validator.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/validation/XML201809Validator.java index 3be1a186ccc..52ba9d5b7d0 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/provider/validation/XML201809Validator.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/validation/XML201809Validator.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.provider.validation; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.validation; import no.nav.testnav.libs.dto.inntektsmeldinggeneratorservice.v1.rs.RsInntektsmelding; import org.springframework.stereotype.Component; diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/util/XmlConverter.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/util/XmlConverter.java similarity index 89% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/util/XmlConverter.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/util/XmlConverter.java index f5c84137278..279a66a88ae 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/util/XmlConverter.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/util/XmlConverter.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.util; +package no.nav.testnav.inntektsmeldinggeneratorservice.util; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBElement; @@ -6,7 +6,7 @@ import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; import lombok.extern.slf4j.Slf4j; -import no.nav.registre.inntektsmeldinggeneratorservice.exception.JaxbToXmlException; +import no.nav.testnav.inntektsmeldinggeneratorservice.exception.JaxbToXmlException; import org.apache.commons.text.CaseUtils; import java.io.StringReader; @@ -27,7 +27,7 @@ private XmlConverter() { public static String toXml(JAXBElement value, Class clazz) { try { - JAXBContext jaxbContext = JAXBContext.newInstance("no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter", clazz.getClassLoader()); + JAXBContext jaxbContext = JAXBContext.newInstance("no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter", clazz.getClassLoader()); Marshaller jaxbMarshaller = jaxbContext.createMarshaller(); @@ -79,7 +79,7 @@ public static LocalDate toLocalDate(LocalDateTime localDateTime) { @SuppressWarnings("unchecked") private static void toObject(String xml, Class clazz) { try { - JAXBContext jaxbContext = JAXBContext.newInstance("no.nav.registre.inntektsmeldinggeneratorservice.v20181211.adapter"); + JAXBContext jaxbContext = JAXBContext.newInstance("no.nav.testnav.inntektsmeldinggeneratorservice.provider.adapter"); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/util/XmlInntektsmelding201812.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/util/XmlInntektsmelding201812.java similarity index 86% rename from apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/util/XmlInntektsmelding201812.java rename to apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/util/XmlInntektsmelding201812.java index aa388ebcc49..438585d075b 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/util/XmlInntektsmelding201812.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/util/XmlInntektsmelding201812.java @@ -1,35 +1,35 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.util; +package no.nav.testnav.inntektsmeldinggeneratorservice.util; import io.swagger.v3.core.util.Json; import jakarta.xml.bind.JAXBElement; import lombok.extern.slf4j.Slf4j; -import no.nav.registre.inntektsmeldinggeneratorservice.provider.Melding; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Arbeidsforhold; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Arbeidsgiver; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.ArbeidsgiverPrivat; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.ArbeidsgiverperiodeListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Avsendersystem; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.AvtaltFerieListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.DelvisFravaer; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.DelvisFravaersListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.EndringIRefusjon; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.EndringIRefusjonsListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.FravaersPeriodeListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.GjenopptakelseNaturalytelseListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.GraderingIForeldrepenger; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.GraderingIForeldrepengerListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Inntekt; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Kontaktinformasjon; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.NaturalytelseDetaljer; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Omsorgspenger; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.OpphoerAvNaturalytelseListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Periode; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.PleiepengerPeriodeListe; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Refusjon; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.Skjemainnhold; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.SykepengerIArbeidsgiverperioden; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.UtsettelseAvForeldrepenger; -import no.nav.registre.inntektsmeldinggeneratorservice.xml.UtsettelseAvForeldrepengerListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Arbeidsforhold; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Arbeidsgiver; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.ArbeidsgiverPrivat; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.ArbeidsgiverperiodeListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Avsendersystem; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.AvtaltFerieListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.DelvisFravaer; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.DelvisFravaersListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.EndringIRefusjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.EndringIRefusjonsListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.GjenopptakelseNaturalytelseListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.GraderingIForeldrepenger; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.GraderingIForeldrepengerListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Inntekt; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.NaturalytelseDetaljer; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Omsorgspenger; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.OpphoerAvNaturalytelseListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Periode; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Refusjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Skjemainnhold; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.SykepengerIArbeidsgiverperioden; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.UtsettelseAvForeldrepengerListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.provider.Melding; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.FravaersPeriodeListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.Kontaktinformasjon; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.PleiepengerPeriodeListe; +import no.nav.testnav.inntektsmeldinggeneratorservice.binding.UtsettelseAvForeldrepenger; import no.nav.testnav.libs.dto.inntektsmeldinggeneratorservice.v1.rs.RsArbeidsforhold; import no.nav.testnav.libs.dto.inntektsmeldinggeneratorservice.v1.rs.RsArbeidsgiver; import no.nav.testnav.libs.dto.inntektsmeldinggeneratorservice.v1.rs.RsArbeidsgiverPrivat; @@ -56,10 +56,10 @@ import java.util.stream.Collectors; import static java.util.Objects.isNull; -import static no.nav.registre.inntektsmeldinggeneratorservice.util.XmlConverter.toBigDecimal; -import static no.nav.registre.inntektsmeldinggeneratorservice.util.XmlConverter.toBigInteger; -import static no.nav.registre.inntektsmeldinggeneratorservice.util.XmlConverter.toCamelCase; -import static no.nav.registre.inntektsmeldinggeneratorservice.util.XmlConverter.toLocalDate; +import static no.nav.testnav.inntektsmeldinggeneratorservice.util.XmlConverter.toBigDecimal; +import static no.nav.testnav.inntektsmeldinggeneratorservice.util.XmlConverter.toBigInteger; +import static no.nav.testnav.inntektsmeldinggeneratorservice.util.XmlConverter.toCamelCase; +import static no.nav.testnav.inntektsmeldinggeneratorservice.util.XmlConverter.toLocalDate; @Slf4j public class XmlInntektsmelding201812 { diff --git a/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java b/apps/inntektsmelding-generator-service/src/test/java/no/nav/testnav/inntektsmeldinggeneratorservice/ApplicationContextTest.java similarity index 91% rename from apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java rename to apps/inntektsmelding-generator-service/src/test/java/no/nav/testnav/inntektsmeldinggeneratorservice/ApplicationContextTest.java index 29b0d23a6a1..3281df17537 100644 --- a/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java +++ b/apps/inntektsmelding-generator-service/src/test/java/no/nav/testnav/inntektsmeldinggeneratorservice/ApplicationContextTest.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice; +package no.nav.testnav.inntektsmeldinggeneratorservice; import ma.glasnost.orika.MapperFacade; import org.junit.jupiter.api.Test; diff --git a/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/provider/v2/InntektsmeldingV2ControllerTest.java b/apps/inntektsmelding-generator-service/src/test/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/v2/InntektsmeldingV2ControllerTest.java similarity index 96% rename from apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/provider/v2/InntektsmeldingV2ControllerTest.java rename to apps/inntektsmelding-generator-service/src/test/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/v2/InntektsmeldingV2ControllerTest.java index f48ed1418e2..502aa74a9fe 100644 --- a/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/v20181211/provider/v2/InntektsmeldingV2ControllerTest.java +++ b/apps/inntektsmelding-generator-service/src/test/java/no/nav/testnav/inntektsmeldinggeneratorservice/provider/v2/InntektsmeldingV2ControllerTest.java @@ -1,4 +1,4 @@ -package no.nav.registre.inntektsmeldinggeneratorservice.v20181211.provider.v2; +package no.nav.testnav.inntektsmeldinggeneratorservice.provider.v2; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/inntektsmeldinggeneratorservice/v1/rs/RsArbeidsforhold.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/inntektsmeldinggeneratorservice/v1/rs/RsArbeidsforhold.java index 2e3024a5839..c6658d31a68 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/inntektsmeldinggeneratorservice/v1/rs/RsArbeidsforhold.java +++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/inntektsmeldinggeneratorservice/v1/rs/RsArbeidsforhold.java @@ -1,5 +1,7 @@ package no.nav.testnav.libs.dto.inntektsmeldinggeneratorservice.v1.rs; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,7 +11,9 @@ import java.util.Objects; @Data +@Builder @NoArgsConstructor +@AllArgsConstructor public class RsArbeidsforhold { private String arbeidsforholdId;