Skip to content

Commit 978e1fd

Browse files
jolarsenjolarsen
authored
Serialiser kodeverdi som string, fase 2 (#1986)
* Serialiser kodeverdi som string, fase 2 * Mer bumps
1 parent a9f53b0 commit 978e1fd

29 files changed

+70
-287
lines changed

‎kodeverk/src/main/java/no/nav/abakus/iaygrunnlag/kodeverk/ArbeidType.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,9 @@
2323
import com.fasterxml.jackson.annotation.JsonAutoDetect;
2424
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
2525
import com.fasterxml.jackson.annotation.JsonCreator;
26-
import com.fasterxml.jackson.annotation.JsonFormat;
27-
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
28-
import com.fasterxml.jackson.annotation.JsonIgnore;
2926
import com.fasterxml.jackson.annotation.JsonProperty;
27+
import com.fasterxml.jackson.annotation.JsonValue;
3028

31-
@JsonFormat(shape = Shape.OBJECT)
3229
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
3330
public enum ArbeidType implements Kodeverdi {
3431

@@ -76,13 +73,11 @@ public enum ArbeidType implements Kodeverdi {
7673
}
7774
}
7875

79-
@JsonProperty(value="kode")
76+
@JsonValue
8077
private String kode;
8178

82-
@JsonIgnore
8379
private String navn;
8480

85-
@JsonIgnore
8681
private String offisiellKode;
8782

8883
private boolean visGui;
@@ -136,7 +131,6 @@ public String getKode() {
136131
return kode;
137132
}
138133

139-
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
140134
@Override
141135
public String getKodeverk() {
142136
return KODEVERK;

‎kodeverk/src/main/java/no/nav/abakus/iaygrunnlag/kodeverk/ArbeidsforholdHandlingType.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@
55
* Definerer typer av handlinger en saksbehandler kan gjøre vedrørende et arbeidsforhold
66
* <p>
77
*/
8+
89
import java.util.Collections;
910
import java.util.LinkedHashMap;
1011
import java.util.Map;
1112

1213
import com.fasterxml.jackson.annotation.JsonAutoDetect;
1314
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
1415
import com.fasterxml.jackson.annotation.JsonCreator;
15-
import com.fasterxml.jackson.annotation.JsonFormat;
16-
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
17-
import com.fasterxml.jackson.annotation.JsonIgnore;
1816
import com.fasterxml.jackson.annotation.JsonProperty;
17+
import com.fasterxml.jackson.annotation.JsonValue;
1918

20-
@JsonFormat(shape = Shape.OBJECT)
2119
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
2220
public enum ArbeidsforholdHandlingType implements Kodeverdi {
2321

@@ -45,9 +43,9 @@ public enum ArbeidsforholdHandlingType implements Kodeverdi {
4543
}
4644
}
4745

48-
@JsonIgnore
4946
private String navn;
5047

48+
@JsonValue
5149
private String kode;
5250

5351
private ArbeidsforholdHandlingType(String kode) {
@@ -81,13 +79,11 @@ public String getNavn() {
8179
return navn;
8280
}
8381

84-
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
8582
@Override
8683
public String getKodeverk() {
8784
return KODEVERK;
8885
}
8986

90-
@JsonProperty
9187
@Override
9288
public String getKode() {
9389
return kode;

‎kodeverk/src/main/java/no/nav/abakus/iaygrunnlag/kodeverk/Arbeidskategori.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@
77
import com.fasterxml.jackson.annotation.JsonAutoDetect;
88
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
99
import com.fasterxml.jackson.annotation.JsonCreator;
10-
import com.fasterxml.jackson.annotation.JsonFormat;
11-
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
12-
import com.fasterxml.jackson.annotation.JsonIgnore;
1310
import com.fasterxml.jackson.annotation.JsonProperty;
11+
import com.fasterxml.jackson.annotation.JsonValue;
1412

15-
@JsonFormat(shape = Shape.OBJECT)
1613
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
1714
public enum Arbeidskategori implements Kodeverdi {
1815

@@ -47,9 +44,10 @@ public enum Arbeidskategori implements Kodeverdi {
4744
}
4845
}
4946

50-
@JsonIgnore
47+
5148
private String navn;
5249

50+
@JsonValue
5351
private String kode;
5452

5553
private Arbeidskategori(String kode) {
@@ -82,13 +80,11 @@ public String getNavn() {
8280
return navn;
8381
}
8482

85-
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
8683
@Override
8784
public String getKodeverk() {
8885
return KODEVERK;
8986
}
9087

91-
@JsonProperty
9288
@Override
9389
public String getKode() {
9490
return kode;

‎kodeverk/src/main/java/no/nav/abakus/iaygrunnlag/kodeverk/BekreftetPermisjonStatus.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@
55
* Definerer statuser for bekreftet permisjoner
66
* </p>
77
*/
8+
89
import java.util.Collections;
910
import java.util.LinkedHashMap;
1011
import java.util.Map;
1112

1213
import com.fasterxml.jackson.annotation.JsonAutoDetect;
1314
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
1415
import com.fasterxml.jackson.annotation.JsonCreator;
15-
import com.fasterxml.jackson.annotation.JsonFormat;
16-
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
17-
import com.fasterxml.jackson.annotation.JsonIgnore;
1816
import com.fasterxml.jackson.annotation.JsonProperty;
17+
import com.fasterxml.jackson.annotation.JsonValue;
1918

20-
@JsonFormat(shape = Shape.OBJECT)
2119
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
2220
public enum BekreftetPermisjonStatus implements Kodeverdi {
2321

@@ -39,10 +37,9 @@ public enum BekreftetPermisjonStatus implements Kodeverdi {
3937
}
4038
}
4139

42-
@JsonIgnore
4340
private String navn;
4441

45-
@JsonProperty(value="kode")
42+
@JsonValue
4643
private String kode;
4744

4845
private BekreftetPermisjonStatus(String kode) {
@@ -76,7 +73,6 @@ public String getNavn() {
7673
return navn;
7774
}
7875

79-
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
8076
@Override
8177
public String getKodeverk() {
8278
return KODEVERK;

‎kodeverk/src/main/java/no/nav/abakus/iaygrunnlag/kodeverk/Fagsystem.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@
77
import com.fasterxml.jackson.annotation.JsonAutoDetect;
88
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
99
import com.fasterxml.jackson.annotation.JsonCreator;
10-
import com.fasterxml.jackson.annotation.JsonFormat;
11-
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
12-
import com.fasterxml.jackson.annotation.JsonIgnore;
1310
import com.fasterxml.jackson.annotation.JsonProperty;
14-
import com.fasterxml.jackson.annotation.JsonProperty.Access;
11+
import com.fasterxml.jackson.annotation.JsonValue;
1512

16-
@JsonFormat(shape = Shape.OBJECT)
1713
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
1814
public enum Fagsystem implements Kodeverdi {
1915

@@ -52,12 +48,11 @@ public enum Fagsystem implements Kodeverdi {
5248

5349
private static final Map<String, Fagsystem> KODER = new LinkedHashMap<>();
5450

55-
@JsonIgnore
5651
private String navn;
5752

58-
@JsonIgnore
5953
private String offisiellKode;
6054

55+
@JsonValue
6156
private String kode;
6257

6358
Fagsystem() {
@@ -101,13 +96,11 @@ public String getOffisiellKode() {
10196
return offisiellKode;
10297
}
10398

104-
@JsonProperty(value = "kodeverk", access = Access.READ_ONLY)
10599
@Override
106100
public String getKodeverk() {
107101
return KODEVERK;
108102
}
109103

110-
@JsonProperty(value = "kode")
111104
@Override
112105
public String getKode() {
113106
return kode;

‎kodeverk/src/main/java/no/nav/abakus/iaygrunnlag/kodeverk/InntektPeriodeType.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88
import com.fasterxml.jackson.annotation.JsonAutoDetect;
99
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
1010
import com.fasterxml.jackson.annotation.JsonCreator;
11-
import com.fasterxml.jackson.annotation.JsonFormat;
12-
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
13-
import com.fasterxml.jackson.annotation.JsonIgnore;
1411
import com.fasterxml.jackson.annotation.JsonProperty;
12+
import com.fasterxml.jackson.annotation.JsonValue;
1513

16-
@JsonFormat(shape = Shape.OBJECT)
1714
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
1815
public enum InntektPeriodeType implements Kodeverdi {
1916

@@ -61,13 +58,13 @@ public enum InntektPeriodeType implements Kodeverdi {
6158
}
6259
}
6360

64-
@JsonIgnore
6561
private String navn;
6662

63+
@JsonValue
6764
private String kode;
68-
@JsonIgnore
65+
6966
private String offisiellKode;
70-
@JsonIgnore
67+
7168
private Period periode;
7269

7370
private InntektPeriodeType(String kode) {
@@ -103,13 +100,11 @@ public String getNavn() {
103100
return navn;
104101
}
105102

106-
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
107103
@Override
108104
public String getKodeverk() {
109105
return KODEVERK;
110106
}
111107

112-
@JsonProperty
113108
@Override
114109
public String getKode() {
115110
return kode;

‎kodeverk/src/main/java/no/nav/abakus/iaygrunnlag/kodeverk/Inntektskategori.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
import com.fasterxml.jackson.annotation.JsonAutoDetect;
88
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
99
import com.fasterxml.jackson.annotation.JsonCreator;
10-
import com.fasterxml.jackson.annotation.JsonFormat;
11-
import com.fasterxml.jackson.annotation.JsonIgnore;
1210
import com.fasterxml.jackson.annotation.JsonProperty;
11+
import com.fasterxml.jackson.annotation.JsonValue;
1312

14-
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
1513
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
1614
public enum Inntektskategori implements Kodeverdi {
1715

@@ -40,9 +38,9 @@ public enum Inntektskategori implements Kodeverdi {
4038
}
4139
}
4240

43-
@JsonIgnore
4441
private String navn;
4542

43+
@JsonValue
4644
private String kode;
4745

4846
Inntektskategori(String kode, String navn) {
@@ -72,13 +70,11 @@ public String getNavn() {
7270
return navn;
7371
}
7472

75-
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
7673
@Override
7774
public String getKodeverk() {
7875
return KODEVERK;
7976
}
8077

81-
@JsonProperty
8278
@Override
8379
public String getKode() {
8480
return kode;

‎kodeverk/src/main/java/no/nav/abakus/iaygrunnlag/kodeverk/InntektskildeType.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@
77
import com.fasterxml.jackson.annotation.JsonAutoDetect;
88
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
99
import com.fasterxml.jackson.annotation.JsonCreator;
10-
import com.fasterxml.jackson.annotation.JsonFormat;
11-
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
12-
import com.fasterxml.jackson.annotation.JsonIgnore;
1310
import com.fasterxml.jackson.annotation.JsonProperty;
11+
import com.fasterxml.jackson.annotation.JsonValue;
1412

15-
@JsonFormat(shape = Shape.OBJECT)
1613
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
1714
public enum InntektskildeType implements Kodeverdi {
1815

@@ -36,9 +33,9 @@ public enum InntektskildeType implements Kodeverdi {
3633
}
3734
}
3835

39-
@JsonIgnore
4036
private String navn;
4137

38+
@JsonValue
4239
private String kode;
4340

4441
private InntektskildeType(String kode) {
@@ -72,13 +69,11 @@ public String getNavn() {
7269
return navn;
7370
}
7471

75-
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
7672
@Override
7773
public String getKodeverk() {
7874
return KODEVERK;
7975
}
8076

81-
@JsonProperty
8277
@Override
8378
public String getKode() {
8479
return kode;

‎kodeverk/src/main/java/no/nav/abakus/iaygrunnlag/kodeverk/InntektsmeldingInnsendingsårsakType.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@
77
import com.fasterxml.jackson.annotation.JsonAutoDetect;
88
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
99
import com.fasterxml.jackson.annotation.JsonCreator;
10-
import com.fasterxml.jackson.annotation.JsonFormat;
11-
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
12-
import com.fasterxml.jackson.annotation.JsonIgnore;
1310
import com.fasterxml.jackson.annotation.JsonProperty;
11+
import com.fasterxml.jackson.annotation.JsonValue;
1412

15-
@JsonFormat(shape = Shape.OBJECT)
1613
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
1714
public enum InntektsmeldingInnsendingsårsakType implements Kodeverdi {
1815

@@ -33,9 +30,9 @@ public enum InntektsmeldingInnsendingsårsakType implements Kodeverdi {
3330
}
3431
}
3532

36-
@JsonIgnore
3733
private String navn;
3834

35+
@JsonValue
3936
private String kode;
4037

4138
private InntektsmeldingInnsendingsårsakType(String kode, String navn) {
@@ -65,13 +62,11 @@ public String getNavn() {
6562
return navn;
6663
}
6764

68-
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
6965
@Override
7066
public String getKodeverk() {
7167
return KODEVERK;
7268
}
7369

74-
@JsonProperty
7570
@Override
7671
public String getKode() {
7772
return kode;

0 commit comments

Comments
 (0)