Skip to content

Commit

Permalink
Gjør nødvendige endringer i kontrakt for å støtte jackson 2.15 (#1166)
Browse files Browse the repository at this point in the history
  • Loading branch information
espenwaaga authored Jun 22, 2023
1 parent 8e5de76 commit dab26cf
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Optional;

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

public record ArbeidsforholdModell(List<Arbeidsforhold> arbeidsforhold) {

Expand All @@ -12,7 +13,7 @@ public ArbeidsforholdModell() {
}

@JsonCreator
public ArbeidsforholdModell(List<Arbeidsforhold> arbeidsforhold) {
public ArbeidsforholdModell(@JsonProperty("arbeidsforhold") List<Arbeidsforhold> arbeidsforhold) {
this.arbeidsforhold = Optional.ofNullable(arbeidsforhold).orElse(List.of());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Optional;

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

public record SigrunModell(List<Inntektsår> inntektsår) {

Expand All @@ -12,7 +13,7 @@ public SigrunModell() {
}

@JsonCreator
public SigrunModell(List<Inntektsår> inntektsår) {
public SigrunModell(@JsonProperty("inntektsår") List<Inntektsår> inntektsår) {
this.inntektsår = Optional.ofNullable(inntektsår).orElse(List.of());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,4 @@ public record Orgnummer(@JsonValue String orgnummer) {
@JsonCreator(mode = JsonCreator.Mode.DELEGATING)
public Orgnummer {
}

@Override
public String orgnummer() {
return orgnummer;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,4 @@ public record Prosent(@JsonValue Integer prosent) {
@JsonCreator(mode = JsonCreator.Mode.DELEGATING)
public Prosent {
}

@Override
public Integer prosent() {
return prosent;
}
}

0 comments on commit dab26cf

Please sign in to comment.