Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Flyttet jetty over til 12. Obs på endring i jetty pakker. #1213

Merged
merged 3 commits into from
Sep 10, 2023
Merged

Flyttet jetty over til 12. Obs på endring i jetty pakker. #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44e7f1c
Flyttet jetty over til 12. Obs på endring i jetty pakker.
mrsladek Sep 10, 2023
138f91c
sonar
mrsladek Sep 10, 2023
87bf5a5
Merge branch 'master' into ee10
mrsladek Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...l/src/main/java/no/nav/foreldrepenger/vtp/testmodell/identer/FoedselsnummerGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Objects;
import java.util.Random;


import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
15 changes: 14 additions & 1 deletion ...rc/main/java/no/nav/foreldrepenger/vtp/testmodell/personopplysning/GateadresseModell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.time.LocalDate;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

public class GateadresseModell extends AdresseModell {
private String gatenavn;
Expand All @@ -18,7 +19,19 @@ public GateadresseModell(GateadresseModell g) {
}

@JsonCreator
public GateadresseModell(LocalDate fom, LocalDate tom, Endringstype endringstype, LocalDate endringstidspunkt, AdresseType adresseType, Landkode land, String matrikkelId, String gatenavn, Integer gatenummer, String husbokstav, Integer husnummer, String postnummer, String kommunenummer) {
public GateadresseModell(@JsonProperty("fom") LocalDate fom,
@JsonProperty("tom") LocalDate tom,
@JsonProperty("endringstype") Endringstype endringstype,
@JsonProperty("endringstidspunkt") LocalDate endringstidspunkt,
@JsonProperty("adresseType") AdresseType adresseType,
@JsonProperty("land") Landkode land,
@JsonProperty("matrikkelId") String matrikkelId,
@JsonProperty("gatenavn") String gatenavn,
@JsonProperty("gatenummer") Integer gatenummer,
@JsonProperty("husbokstav") String husbokstav,
@JsonProperty("husnummer") Integer husnummer,
@JsonProperty("postnummer") String postnummer,
@JsonProperty("kommunenummer") String kommunenummer) {
super(fom, tom, endringstype, endringstidspunkt, adresseType, land, matrikkelId);
this.gatenavn = gatenavn;
this.gatenummer = gatenummer;
Expand Down
3 changes: 3 additions & 0 deletions ...c/main/java/no/nav/foreldrepenger/vtp/testmodell/personopplysning/Personopplysninger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public class Personopplysninger {
@JacksonInject
private VariabelContainer vars;

public Personopplysninger() {
}

public Personopplysninger(SøkerModell søker,
AnnenPartModell annenPart,
List<FamilierelasjonModell> familierelasjoner,
Expand Down
13 changes: 11 additions & 2 deletions ...ain/java/no/nav/foreldrepenger/vtp/testmodell/personopplysning/PostboksadresseModell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.time.LocalDate;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

public class PostboksadresseModell extends AdresseModell {
private String postboksnummer;
Expand All @@ -15,8 +16,16 @@ public PostboksadresseModell(PostboksadresseModell p) {
}

@JsonCreator
public PostboksadresseModell(LocalDate fom, LocalDate tom, Endringstype endringstype, LocalDate endringstidspunkt, AdresseType adresseType, Landkode land, String matrikkelId,
String postboksnummer, String poststed, String postboksanlegg) {
public PostboksadresseModell(@JsonProperty("fom") LocalDate fom,
@JsonProperty("tom") LocalDate tom,
@JsonProperty("endringstype") Endringstype endringstype,
@JsonProperty("endringstidspunkt") LocalDate endringstidspunkt,
@JsonProperty("adresseType") AdresseType adresseType,
@JsonProperty("land") Landkode land,
@JsonProperty("matrikkelId") String matrikkelId,
@JsonProperty("postboksnummer") String postboksnummer,
@JsonProperty("poststed") String poststed,
@JsonProperty("postboksanlegg") String postboksanlegg) {
super(fom, tom, endringstype, endringstidspunkt, adresseType, land, matrikkelId);
this.postboksnummer = postboksnummer;
this.poststed = poststed;
Expand Down
15 changes: 14 additions & 1 deletion ...java/no/nav/foreldrepenger/vtp/testmodell/personopplysning/UstrukturertAdresseModell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.time.LocalDate;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

public class UstrukturertAdresseModell extends AdresseModell {
private String adresseLinje1;
Expand All @@ -18,7 +19,19 @@ public UstrukturertAdresseModell(UstrukturertAdresseModell u) {
}

@JsonCreator
public UstrukturertAdresseModell(LocalDate fom, LocalDate tom, Endringstype endringstype, LocalDate endringstidspunkt, AdresseType adresseType, Landkode land, String matrikkelId, String adresseLinje1, String adresseLinje2, String adresseLinje3, String adresseLinje4, String postNr, String poststed) {
public UstrukturertAdresseModell(@JsonProperty("fom") LocalDate fom,
@JsonProperty("tom") LocalDate tom,
@JsonProperty("endringstype") Endringstype endringstype,
@JsonProperty("endringstidspunkt") LocalDate endringstidspunkt,
@JsonProperty("adresseType") AdresseType adresseType,
@JsonProperty("land") Landkode land,
@JsonProperty("matrikkelId") String matrikkelId,
@JsonProperty("adresseLinje1") String adresseLinje1,
@JsonProperty("adresseLinje2") String adresseLinje2,
@JsonProperty("adresseLinje3") String adresseLinje3,
@JsonProperty("adresseLinje4") String adresseLinje4,
@JsonProperty("postNr") String postNr,
@JsonProperty("poststed") String poststed) {
super(fom, tom, endringstype, endringstidspunkt, adresseType, land, matrikkelId);
this.adresseLinje1 = adresseLinje1;
this.adresseLinje2 = adresseLinje2;
Expand Down
Loading