Fix/psb validering fom tom felt info (#164)

* lagt på validering av fom>tom med felt info * fikset validering * endret uønsket endring * tatt bort unødvendig empty sjekk * forsøk på å validere nullpointer i perioder map * fikset indeksering for valideringsfeil * tart bort utkommentert kode
navikt · Jul 1, 2021 · 83c1d88 · 83c1d88
1 parent 37c4add
commit 83c1d88
Show file tree

Hide file tree

Showing 15 changed files with 214 additions and 185 deletions.
diff --git a/soknad/src/main/java/no/nav/k9/søknad/felles/personopplysninger/Bosteder.java b/soknad/src/main/java/no/nav/k9/søknad/felles/personopplysninger/Bosteder.java
@@ -1,6 +1,5 @@
 package no.nav.k9.søknad.felles.personopplysninger;
 
-import static java.util.Collections.emptyMap;
 import static java.util.Collections.unmodifiableMap;
 import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPeriode;
 import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPerioder;

diff --git a/soknad/src/main/java/no/nav/k9/søknad/felles/personopplysninger/Utenlandsopphold.java b/soknad/src/main/java/no/nav/k9/søknad/felles/personopplysninger/Utenlandsopphold.java
@@ -1,23 +1,27 @@
 package no.nav.k9.søknad.felles.personopplysninger;
 
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import no.nav.k9.søknad.felles.type.Landkode;
-import no.nav.k9.søknad.felles.type.Periode;
+import static java.util.Collections.unmodifiableMap;
+import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPeriode;
+import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPerioder;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
 
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.unmodifiableMap;
-import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPeriode;
-import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPerioder;
-
-import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import no.nav.k9.søknad.felles.type.Landkode;
+import no.nav.k9.søknad.felles.type.Periode;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)
 public class Utenlandsopphold {

diff --git a/soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/Beredskap.java b/soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/Beredskap.java
@@ -1,19 +1,19 @@
 package no.nav.k9.søknad.ytelse.psb.v1;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import no.nav.k9.søknad.felles.type.Periode;
+import static java.util.Collections.unmodifiableMap;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
 
-import static java.util.Collections.unmodifiableMap;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import no.nav.k9.søknad.felles.type.Periode;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)

diff --git a/soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/LovbestemtFerie.java b/soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/LovbestemtFerie.java
@@ -2,18 +2,16 @@
 
 import static java.util.Collections.unmodifiableMap;
 
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.validation.Valid;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import no.nav.k9.søknad.felles.type.Periode;
 
-import javax.validation.Valid;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.TreeMap;
+import no.nav.k9.søknad.felles.type.Periode;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)

diff --git a/soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/Nattevåk.java b/soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/Nattevåk.java
@@ -1,19 +1,19 @@
 package no.nav.k9.søknad.ytelse.psb.v1;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import no.nav.k9.søknad.felles.type.Periode;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import no.nav.k9.søknad.felles.type.Periode;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)
 public class Nattevåk {

diff --git a/soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/Omsorg.java b/soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/Omsorg.java
@@ -1,16 +1,12 @@
 package no.nav.k9.søknad.ytelse.psb.v1;
 
-import java.util.Objects;
 import java.util.Optional;
 
+import javax.validation.Valid;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)

diff --git a/soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/PleiepengerSyktBarn.java b/soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/PleiepengerSyktBarn.java
@@ -9,16 +9,13 @@
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
-import no.nav.k9.søknad.PeriodeValidator;
-import no.nav.k9.søknad.felles.Feil;
 import no.nav.k9.søknad.felles.opptjening.OpptjeningAktivitet;
 import no.nav.k9.søknad.felles.personopplysninger.Barn;
 import no.nav.k9.søknad.felles.personopplysninger.Bosteder;
@@ -294,18 +291,4 @@ public YtelseValidator getValidator() {
         return new PleiepengerSyktBarnValidator();
     }
 
-    @Size(max=0, message="${validatedValue}")
-    private List<Feil> getValiderAngittUtenlandsopphold() {
-        return utenlandsopphold.getPerioder().isEmpty()
-            ? List.of()
-            : new PeriodeValidator().validerIkkeTillattOverlapp(utenlandsopphold.getPerioder(), "utenlandsopphold.perioder");
-    }
-
-    @Size(max=0, message="${validatedValue}")
-    private List<Feil> getValiderAngittBosteder() {
-        return bosteder.getPerioder().isEmpty()
-            ? List.of()
-            : new PeriodeValidator().validerIkkeTillattOverlapp(bosteder.getPerioder(), "bosteder.perioder");
-    }
-
 }