Skip to content

Commit 83c1d88

Browse files
christofferlohnechristofferlohne
authored
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
1 parent 37c4add commit 83c1d88

File tree

15 files changed

+214
-185
lines changed

15 files changed

+214
-185
lines changed

‎soknad/src/main/java/no/nav/k9/søknad/felles/personopplysninger/Bosteder.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package no.nav.k9.søknad.felles.personopplysninger;
22

3-
import static java.util.Collections.emptyMap;
43
import static java.util.Collections.unmodifiableMap;
54
import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPeriode;
65
import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPerioder;

‎soknad/src/main/java/no/nav/k9/søknad/felles/personopplysninger/Utenlandsopphold.java‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
package no.nav.k9.søknad.felles.personopplysninger;
22

3-
import com.fasterxml.jackson.annotation.*;
4-
import com.fasterxml.jackson.annotation.JsonInclude.Include;
5-
import no.nav.k9.søknad.felles.type.Landkode;
6-
import no.nav.k9.søknad.felles.type.Periode;
3+
import static java.util.Collections.unmodifiableMap;
4+
import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPeriode;
5+
import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPerioder;
76

87
import java.util.HashMap;
98
import java.util.Map;
109
import java.util.Objects;
1110
import java.util.TreeMap;
1211

13-
import static java.util.Collections.emptyMap;
14-
import static java.util.Collections.unmodifiableMap;
15-
import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPeriode;
16-
import static no.nav.k9.søknad.felles.type.Periode.Utils.leggTilPerioder;
17-
18-
import javax.validation.Valid;
1912
import javax.validation.constraints.NotNull;
2013

14+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
15+
import com.fasterxml.jackson.annotation.JsonCreator;
16+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
17+
import com.fasterxml.jackson.annotation.JsonInclude;
18+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
19+
import com.fasterxml.jackson.annotation.JsonProperty;
20+
import com.fasterxml.jackson.annotation.JsonValue;
21+
22+
import no.nav.k9.søknad.felles.type.Landkode;
23+
import no.nav.k9.søknad.felles.type.Periode;
24+
2125
@JsonIgnoreProperties(ignoreUnknown = true)
2226
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)
2327
public class Utenlandsopphold {

‎soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/Beredskap.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package no.nav.k9.søknad.ytelse.psb.v1;
22

3-
import com.fasterxml.jackson.annotation.JsonAutoDetect;
4-
import com.fasterxml.jackson.annotation.JsonCreator;
5-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
6-
import com.fasterxml.jackson.annotation.JsonProperty;
7-
import no.nav.k9.søknad.felles.type.Periode;
3+
import static java.util.Collections.unmodifiableMap;
84

9-
import javax.validation.Valid;
10-
import javax.validation.constraints.NotEmpty;
11-
import javax.validation.constraints.NotNull;
125
import java.util.Map;
136
import java.util.Objects;
147
import java.util.TreeMap;
158

16-
import static java.util.Collections.unmodifiableMap;
9+
import javax.validation.Valid;
10+
import javax.validation.constraints.NotNull;
11+
12+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
13+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
14+
import com.fasterxml.jackson.annotation.JsonProperty;
15+
16+
import no.nav.k9.søknad.felles.type.Periode;
1717

1818
@JsonIgnoreProperties(ignoreUnknown = true)
1919
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)

‎soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/LovbestemtFerie.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
import static java.util.Collections.unmodifiableMap;
44

5+
import java.util.Map;
6+
import java.util.TreeMap;
7+
8+
import javax.validation.Valid;
9+
510
import com.fasterxml.jackson.annotation.JsonAutoDetect;
6-
import com.fasterxml.jackson.annotation.JsonCreator;
711
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
812
import com.fasterxml.jackson.annotation.JsonProperty;
9-
import no.nav.k9.søknad.felles.type.Periode;
1013

11-
import javax.validation.Valid;
12-
13-
import java.util.Collections;
14-
import java.util.Map;
15-
import java.util.Objects;
16-
import java.util.TreeMap;
14+
import no.nav.k9.søknad.felles.type.Periode;
1715

1816
@JsonIgnoreProperties(ignoreUnknown = true)
1917
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)

‎soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/Nattevåk.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package no.nav.k9.søknad.ytelse.psb.v1;
22

3-
import com.fasterxml.jackson.annotation.JsonAutoDetect;
4-
import com.fasterxml.jackson.annotation.JsonCreator;
5-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
6-
import com.fasterxml.jackson.annotation.JsonProperty;
7-
import no.nav.k9.søknad.felles.type.Periode;
8-
9-
import javax.validation.Valid;
10-
import javax.validation.constraints.NotEmpty;
11-
import javax.validation.constraints.NotNull;
123
import java.util.Collections;
134
import java.util.Map;
145
import java.util.Objects;
156
import java.util.TreeMap;
167

8+
import javax.validation.Valid;
9+
import javax.validation.constraints.NotNull;
10+
11+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
12+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
13+
import com.fasterxml.jackson.annotation.JsonProperty;
14+
15+
import no.nav.k9.søknad.felles.type.Periode;
16+
1717
@JsonIgnoreProperties(ignoreUnknown = true)
1818
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)
1919
public class Nattevåk {

‎soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/Omsorg.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package no.nav.k9.søknad.ytelse.psb.v1;
22

3-
import java.util.Objects;
43
import java.util.Optional;
54

5+
import javax.validation.Valid;
6+
67
import com.fasterxml.jackson.annotation.JsonAutoDetect;
7-
import com.fasterxml.jackson.annotation.JsonCreator;
88
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
99
import com.fasterxml.jackson.annotation.JsonProperty;
10-
import com.fasterxml.jackson.annotation.JsonValue;
11-
12-
import javax.validation.Valid;
13-
import javax.validation.constraints.NotEmpty;
1410

1511
@JsonIgnoreProperties(ignoreUnknown = true)
1612
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)

‎soknad/src/main/java/no/nav/k9/søknad/ytelse/psb/v1/PleiepengerSyktBarn.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@
99

1010
import javax.validation.Valid;
1111
import javax.validation.constraints.NotNull;
12-
import javax.validation.constraints.Size;
1312

1413
import com.fasterxml.jackson.annotation.JsonAutoDetect;
1514
import com.fasterxml.jackson.annotation.JsonFormat;
1615
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1716
import com.fasterxml.jackson.annotation.JsonProperty;
1817
import com.fasterxml.jackson.annotation.JsonTypeName;
1918

20-
import no.nav.k9.søknad.PeriodeValidator;
21-
import no.nav.k9.søknad.felles.Feil;
2219
import no.nav.k9.søknad.felles.opptjening.OpptjeningAktivitet;
2320
import no.nav.k9.søknad.felles.personopplysninger.Barn;
2421
import no.nav.k9.søknad.felles.personopplysninger.Bosteder;
@@ -294,18 +291,4 @@ public YtelseValidator getValidator() {
294291
return new PleiepengerSyktBarnValidator();
295292
}
296293

297-
@Size(max=0, message="${validatedValue}")
298-
private List<Feil> getValiderAngittUtenlandsopphold() {
299-
return utenlandsopphold.getPerioder().isEmpty()
300-
? List.of()
301-
: new PeriodeValidator().validerIkkeTillattOverlapp(utenlandsopphold.getPerioder(), "utenlandsopphold.perioder");
302-
}
303-
304-
@Size(max=0, message="${validatedValue}")
305-
private List<Feil> getValiderAngittBosteder() {
306-
return bosteder.getPerioder().isEmpty()
307-
? List.of()
308-
: new PeriodeValidator().validerIkkeTillattOverlapp(bosteder.getPerioder(), "bosteder.perioder");
309-
}
310-
311294
}

0 commit comments

Comments
 (0)