Fjernet inntektsmelding-generator controller v1, da den ikke er i bru…

…k noe sted og refaktorering blir tidkrevende #deploy-inntektsmelding-generator-service
navikt · Jun 10, 2024 · b7f9d21 · b7f9d21
1 parent 70331a8
commit b7f9d21
Show file tree

Hide file tree

Showing 70 changed files with 200 additions and 237 deletions.
diff --git 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
@@ -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/...a/no/nav/registre/inntektsmeldinggeneratorservice/provider/InntektsmeldingController.java b/...a/no/nav/registre/inntektsmeldinggeneratorservice/provider/InntektsmeldingController.java
diff --git a/...tsmeldingGeneratorApplicationStarter.java → ...tsmeldingGeneratorApplicationStarter.java b/...tsmeldingGeneratorApplicationStarter.java → ...tsmeldingGeneratorApplicationStarter.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/...meldinggeneratorservice/MeldingsType.java → ...meldinggeneratorservice/MeldingsType.java b/...meldinggeneratorservice/MeldingsType.java → ...meldinggeneratorservice/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/...ggeneratorservice/xml/Arbeidsforhold.java → ...eratorservice/binding/Arbeidsforhold.java b/...ggeneratorservice/xml/Arbeidsforhold.java → ...eratorservice/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/...inggeneratorservice/xml/Arbeidsgiver.java → ...eneratorservice/binding/Arbeidsgiver.java b/...inggeneratorservice/xml/Arbeidsgiver.java → ...eneratorservice/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/...eratorservice/xml/ArbeidsgiverPrivat.java → ...orservice/binding/ArbeidsgiverPrivat.java b/...eratorservice/xml/ArbeidsgiverPrivat.java → ...orservice/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/...service/xml/ArbeidsgiverperiodeListe.java → ...ice/binding/ArbeidsgiverperiodeListe.java b/...service/xml/ArbeidsgiverperiodeListe.java → ...ice/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/...ggeneratorservice/xml/Avsendersystem.java → ...eratorservice/binding/Avsendersystem.java b/...ggeneratorservice/xml/Avsendersystem.java → ...eratorservice/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/...eneratorservice/xml/AvtaltFerieListe.java → ...atorservice/binding/AvtaltFerieListe.java b/...eneratorservice/xml/AvtaltFerieListe.java → ...atorservice/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/...nggeneratorservice/xml/DelvisFravaer.java → ...neratorservice/binding/DelvisFravaer.java b/...nggeneratorservice/xml/DelvisFravaer.java → ...neratorservice/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/...ratorservice/xml/DelvisFravaersListe.java → ...rservice/binding/DelvisFravaersListe.java b/...ratorservice/xml/DelvisFravaersListe.java → ...rservice/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/...eneratorservice/xml/EndringIRefusjon.java → ...atorservice/binding/EndringIRefusjon.java b/...eneratorservice/xml/EndringIRefusjon.java → ...atorservice/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/...orservice/xml/EndringIRefusjonsListe.java → ...rvice/binding/EndringIRefusjonsListe.java b/...orservice/xml/EndringIRefusjonsListe.java → ...rvice/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/...atorservice/xml/FravaersPeriodeListe.java → ...service/binding/FravaersPeriodeListe.java b/...atorservice/xml/FravaersPeriodeListe.java → ...service/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/...xml/GjenopptakelseNaturalytelseListe.java → ...ing/GjenopptakelseNaturalytelseListe.java b/...xml/GjenopptakelseNaturalytelseListe.java → ...ing/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/...service/xml/GraderingIForeldrepenger.java → ...ice/binding/GraderingIForeldrepenger.java b/...service/xml/GraderingIForeldrepenger.java → ...ice/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/...ce/xml/GraderingIForeldrepengerListe.java → ...inding/GraderingIForeldrepengerListe.java b/...ce/xml/GraderingIForeldrepengerListe.java → ...inding/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/...smeldinggeneratorservice/xml/Inntekt.java → ...dinggeneratorservice/binding/Inntekt.java b/...smeldinggeneratorservice/xml/Inntekt.java → ...dinggeneratorservice/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/...eneratorservice/xml/InntektsmeldingM.java → ...atorservice/binding/InntektsmeldingM.java b/...eneratorservice/xml/InntektsmeldingM.java → ...atorservice/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/...eratorservice/xml/Kontaktinformasjon.java → ...orservice/binding/Kontaktinformasjon.java b/...eratorservice/xml/Kontaktinformasjon.java → ...orservice/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/...torservice/xml/NaturalytelseDetaljer.java → ...ervice/binding/NaturalytelseDetaljer.java b/...torservice/xml/NaturalytelseDetaljer.java → ...ervice/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/...nggeneratorservice/xml/Omsorgspenger.java → ...neratorservice/binding/Omsorgspenger.java b/...nggeneratorservice/xml/Omsorgspenger.java → ...neratorservice/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/...vice/xml/OpphoerAvNaturalytelseListe.java → .../binding/OpphoerAvNaturalytelseListe.java b/...vice/xml/OpphoerAvNaturalytelseListe.java → .../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/...smeldinggeneratorservice/xml/Periode.java → ...dinggeneratorservice/binding/Periode.java b/...smeldinggeneratorservice/xml/Periode.java → ...dinggeneratorservice/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/...rservice/xml/PleiepengerPeriodeListe.java → ...vice/binding/PleiepengerPeriodeListe.java b/...rservice/xml/PleiepengerPeriodeListe.java → ...vice/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/...meldinggeneratorservice/xml/Refusjon.java → ...inggeneratorservice/binding/Refusjon.java b/...meldinggeneratorservice/xml/Refusjon.java → ...inggeneratorservice/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/...nggeneratorservice/xml/Skjemainnhold.java → ...neratorservice/binding/Skjemainnhold.java b/...nggeneratorservice/xml/Skjemainnhold.java → ...neratorservice/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/.../xml/SykepengerIArbeidsgiverperioden.java → ...ding/SykepengerIArbeidsgiverperioden.java b/.../xml/SykepengerIArbeidsgiverperioden.java → ...ding/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/...rvice/xml/UtsettelseAvForeldrepenger.java → ...e/binding/UtsettelseAvForeldrepenger.java b/...rvice/xml/UtsettelseAvForeldrepenger.java → ...e/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/.../xml/UtsettelseAvForeldrepengerListe.java → ...ding/UtsettelseAvForeldrepengerListe.java b/.../xml/UtsettelseAvForeldrepengerListe.java → ...ding/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/...inggeneratorservice/config/AppConfig.java → ...inggeneratorservice/config/AppConfig.java b/...inggeneratorservice/config/AppConfig.java → ...inggeneratorservice/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/...inggeneratorservice/config/DevConfig.java → ...inggeneratorservice/config/DevConfig.java b/...inggeneratorservice/config/DevConfig.java → ...inggeneratorservice/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/...eneratorservice/config/OpenApiConfig.java → ...eneratorservice/config/OpenApiConfig.java b/...eneratorservice/config/OpenApiConfig.java → ...eneratorservice/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/...neratorservice/config/SecurityConfig.java → ...neratorservice/config/SecurityConfig.java b/...neratorservice/config/SecurityConfig.java → ...neratorservice/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/...service/exception/JaxbToXmlException.java → ...service/exception/JaxbToXmlException.java b/...service/exception/JaxbToXmlException.java → ...service/exception/JaxbToXmlException.java
@@ -1,4 +1,4 @@
-package no.nav.registre.inntektsmeldinggeneratorservice.exception;
+package no.nav.testnav.inntektsmeldinggeneratorservice.exception;
 
 public class JaxbToXmlException extends RuntimeException {